From 6f92fd2a3ac2fc015cd932b351413fff37b4430f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Mon, 1 Sep 2025 20:01:52 +0200
Subject: [PATCH] Fix deprecated ssh options

---
 home/ssh/config.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/home/ssh/config.nix b/home/ssh/config.nix
index 1e55f5e..c26da9e 100644
--- a/home/ssh/config.nix
+++ b/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";
       };
     };
   };