From 45f68945233017c53dfe7deca7d2983b368e6b15 Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Sun, 21 Jan 2024 21:18:57 +0800
Subject: [PATCH] nix: include some directory for ssh config

---
 nix/common.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nix/common.nix b/nix/common.nix
index ca0ff2d..58ff8a4 100644
--- 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