Fix deprecated ssh options
All checks were successful
Run nix flake check / flake-check (push) Successful in 3m42s
Periodic flake update / flake-update (push) Successful in 2m25s

This commit is contained in:
2025-09-01 20:01:52 +02:00
parent df29d95fd9
commit 6f92fd2a3a

View File

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