Commit ef61248cf6dd

@@ -4,17 +4,34 @@
   programs.ssh = {
     enable = true;
 
-    controlMaster = "auto";
-    controlPath = "/tmp/ssh-%u-%l-%r@%h:%p";
-    controlPersist = "360";
-
-    forwardAgent = true;
     serverAliveInterval = 60;
-    
     hashKnownHosts = true;
     userKnownHostsFile = "~/.config/ssh/known_hosts";
-
+    controlPath = "~/.ssh/sockets/%u-%l-%r@%h:%p";
+    
     matchBlocks = rec {
+      "github.com" = {
+        hostname = "github.com";
+        user = "git";
+        extraOptions = {
+          controlMaster = "auto";
+          controlPersist = "360";
+        };
+      };
+      "gitlab.com" = {
+        hostname = "gitlab.com";
+        user = "git";
+        extraOptions = {
+          controlMaster = "auto";
+          controlPersist = "360";
+        };
+      };
+      "*.local" = {
+        extraOptions = {
+          controlMaster = "auto";
+          controlPersist = "360";
+        };
+      };
       hokkaido-remote = {
         proxyCommand = "${pkgs.openssh}/bin/ssh -q p.sbr.pm nc localhost 2223";
         user = "vincent";