diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index e067835..87a5c3a 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -72,11 +72,25 @@
 
     ssh = {
       enable = true;
-      addKeysToAgent = "yes";
+      enableDefaultConfig = false;
+      matchBlocks."*" = {
+        forwardAgent = false;
+        addKeysToAgent = "yes";
+        compression = false;
+        serverAliveInterval = 0;
+        serverAliveCountMax = 3;
+        hashKnownHosts = false;
+        userKnownHostsFile = "~/.ssh/known_hosts";
+        controlMaster = "no";
+        controlPath = "~/.ssh/master-%r@%n:%p";
+        controlPersist = "no";
+        identityFile = [ "~/.ssh/id_ed25519" ];
+        setEnv = {
+          TERM = "xterm-256color";
+        };
+      };
       extraConfig = ''
         UseKeychain yes
-        IdentityFile ~/.ssh/id_ed25519
-        SetEnv TERM=xterm-256color
       '';
     };