nix: include some directory for ssh config

contrun · Jan 21, 2024 · 45f6894 · 45f6894
1 parent c9169f6
commit 45f6894
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/nix/common.nix b/nix/common.nix
@@ -739,7 +739,12 @@ in
       enableBrowserSocket = true;
     };
     sysdig = { enable = prefs.enableSysdig; };
-    ssh = { startAgent = true; };
+    ssh = {
+      startAgent = true;
+      extraConfig = ''
+        Include ssh_config.d/*
+      '';
+    };
     # vim.defaultEditor = true;
     adb.enable = prefs.enableADB;
     slock.enable = prefs.enableSlock;
@@ -1397,7 +1402,7 @@ in
       };
       startWhenNeeded = true;
       extraConfig = builtins.concatStringsSep "\n" (
-        [ "Include /etc/ssh/sshd_config_*" ] ++ (lib.optionals prefs.enableSshPortForwarding [
+        [ "Include /etc/ssh/sshd_config.d/*" ] ++ (lib.optionals prefs.enableSshPortForwarding [
           ''
             Match User ssh-port-forwarding
               # PermitTunnel no