Fix deprecated ssh options

home/ssh/config.nix

@@ -18,27 +18,32 @@ in
 {
   programs.ssh = {
     enable = true;
-    controlMaster = "auto";
-    serverAliveInterval = 30;
+    enableDefaultConfig = false;
 
     matchBlocks = {
       "bmo.uio.no-on-eduroam" = (
         lib.mkIf (osConfig.system.name == "magicman") (
-          lib.hm.dag.entryBefore [ "bmo.uio.no" ] {
+          lib.hm.dag.entryBefore [ "bmo.uio.no" "*" ] {
             match = "host bmo.uio.no exec \"nmcli -g GENERAL.STATE c s eduroam|grep -q -E '\\bactiv'\"";
             hostname = "bmo.uio.no";
             forwardAgent = false;
+            serverAliveInterval = 30;
+            controlMaster = "auto";
           }
         )
       );
 
-      "bmo.uio.no" = {
-        setEnv = {
-          # TERM = "xterm-256color";
-        };
+      "bmo.uio.no" = lib.hm.dag.entryBefore [ "*" ] {
         hostname = "bmo.uio.no";
         forwardAgent = false;
         proxyJump = "torjus@rlogin.uio.no";
+        serverAliveInterval = 30;
+        controlMaster = "auto";
+      };
+
+      "*" = {
+        serverAliveInterval = 30;
+        controlMaster = "auto";
       };
     };
   };