home/ssh | upstream changes

home/common/ssh.nix

@@ -2,11 +2,7 @@
   programs = {
     ssh = {
       enable = true;
-      compression = true;
+      enableDefaultConfig = false;
-      addKeysToAgent = "yes";
-      serverAliveCountMax = 2;
-      serverAliveInterval = 10;
-      hashKnownHosts = true;
       matchBlocks = {
         "git" = {
           port = 2020;
@@ -20,9 +16,20 @@
           user = "duck";
           hostname = "wise.dreamhost.com";
         };
+        "*" = {user = "don";};
       };
       extraConfig = ''
         ConnectTimeout 5
+        AddKeysToAgent yes
+        Compression yes
+        ControlMaster no
+        ControlPath "~/.ssh/master-%r@%n:%p"
+        ControlPersist no
+        ForwardAgent no
+        HashKnownHosts yes
+        ServerAliveCountMax 2
+        ServerAliveInterval 10
+        UserKnownHostsFile "~/.ssh/known_hosts"
       '';
     };
   };