Merge branch 'LnL7:master' into master

LnL7 · Dec 28, 2024 · 3e3c5a6 · 3e3c5a6
2 parents a787d6d + bc03f78
commit 3e3c5a6
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/modules/programs/ssh/default.nix b/modules/programs/ssh/default.nix
@@ -114,6 +114,15 @@ in
       type = with types; attrsOf (submodule userOptions);
     };
 
+    programs.ssh.extraConfig = lib.mkOption {
+      type = lib.types.lines;
+      default = "";
+      description = ''
+        Extra configuration text loaded in {file}`ssh_config`.
+        See {manpage}`ssh_config(5)` for help.
+      '';
+    };
+
     programs.ssh.knownHosts = mkOption {
       default = {};
       type = types.attrsOf (types.submodule host);
@@ -151,6 +160,7 @@ in
               + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
             )) + "\n";
         };
+        "ssh/ssh_config.d/100-nix-darwin.conf".text = config.programs.ssh.extraConfig;
         "ssh/sshd_config.d/101-authorized-keys.conf" = {
           text = ''
             # sshd doesn't like reading from symbolic links, so we cat