all repos — nixfiles @ 6c204ac570b8cbc961317a11d62dd4367f41038c

System and user configuration, managed by nix and home-manager

update ssh settings schema

Alin
commit

6c204ac570b8cbc961317a11d62dd4367f41038c

parent

548e6ef871fdd3332dd5c702204c1902c8102499

2 files changed, 14 insertions(+), 16 deletions(-)

changed files
M user/settings/darwin.nix → user/settings/darwin.nix
@@ -112,7 +112,7 @@
   home.sessionVariables = {
     SSH_AUTH_SOCK = "${config.home.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
   };
-  programs.ssh.extraConfig = ''
+  programs.ssh.settings."*" = ''
     IdentityAgent ~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh
   '';
 }
M user/settings/ssh.nix → user/settings/ssh.nix
@@ -6,22 +6,20 @@ {
   programs.ssh = {
     enable = true;
     enableDefaultConfig = false;
-    matchBlocks."*" = {
-      compression = true;
-      controlMaster = "auto";
-      controlPersist = "10m";
-      serverAliveInterval = 15;
+    settings."*" = {
+      Compression = true;
+      ControlMaster = "auto";
+      ControlPersist = "10m";
+      ServerAliveInterval = 15;
+      SendEnv = "TERM_PROGRAM";
+      VerifyHostKeyDNS = "ask";
+      CanonicalizeHostname = "yes";
+      CanonicalizeFallbackLocal = "no";
+      CanonicalizeMaxDots = 0;
+      CanonicalDomains = "${data.homenet} ${data.tailnet}";
+      IdentitiesOnly = "yes";
+      StrictHostKeyChecking = "yes";
     };
-    extraConfig = ''
-      SendEnv TERM_PROGRAM
-      VerifyHostKeyDNS ask
-      CanonicalizeHostname yes
-      CanonicalizeFallbackLocal no
-      CanonicalizeMaxDots 0
-      CanonicalDomains ${data.homenet} ${data.tailnet}
-      IdentitiesOnly yes
-      StrictHostKeyChecking yes
-    '';
     includes = [
       "local.ssh_config"
     ];