diff --git a/modules/home/ghostty.nix b/modules/home/ghostty.nix
index 3b8bfe3..534450d 100644
--- a/modules/home/ghostty.nix
+++ b/modules/home/ghostty.nix
@@ -1,9 +1,13 @@
 { pkgs, lib, ... }:
 
+let
+  ghosttyStub = (pkgs.runCommand "ghostty-stub" { } "mkdir -p $out/bin")
+    // { meta.mainProgram = "ghostty"; };
+in
 {
   programs.ghostty = {
     enable = true;
-    package = lib.mkForce (pkgs.runCommand "ghostty-stub" { } "mkdir -p $out");
+    package = lib.mkForce ghosttyStub;
 
     enableZshIntegration = true;
 
diff --git a/modules/home/git.nix b/modules/home/git.nix
index f8ea802..0b9a03e 100644
--- a/modules/home/git.nix
+++ b/modules/home/git.nix
@@ -4,13 +4,17 @@
   programs.git = {
     enable = true;
 
-    userName = "Atridad Lahiji";
-    userEmail = "me@atri.dad";
-
     signing = {
       key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILKb+pDgkHEKI7LDWvZbhoLJ11uJMaCmVyAqotDxNOI7 me@atri.dad";
       signByDefault = true;
       format = "ssh";
     };
+
+    settings = {
+      user = {
+        name = "Atridad Lahiji";
+        email = "me@atri.dad";
+      };
+    };
   };
 }
diff --git a/modules/home/ssh.nix b/modules/home/ssh.nix
index b46fcd5..3416024 100644
--- a/modules/home/ssh.nix
+++ b/modules/home/ssh.nix
@@ -3,6 +3,7 @@
 {
   programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
 
     extraConfig = ''
       IdentityAgent /Users/atridad/.bitwarden-ssh-agent.sock
diff --git a/modules/homebrew.nix b/modules/homebrew.nix
index cf00dce..09addb7 100644
--- a/modules/homebrew.nix
+++ b/modules/homebrew.nix
@@ -24,7 +24,6 @@
       "ngrok"
       "pearcleaner"
       "zed"
-      "zulu@17"
     ];
   };
 }