From b8f61f2946d2d6de97b806320c3aef6ddd2a26b6 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Mon, 29 Jan 2024 01:30:17 +0800 Subject: [PATCH] fix: nix-darwin do not have a `programs.ssh.extraConfig` --- modules/base.nix | 5 ----- modules/nixos/base/networking.nix | 11 ++++++++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/base.nix b/modules/base.nix index c7596ba0..7c4cade6 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -32,11 +32,6 @@ ]; }; - programs.ssh = { - extraConfig = vars_networking.ssh.extraConfig; - knownHosts = vars_networking.ssh.knownHosts; - }; - nix.settings = { # enable flakes globally experimental-features = ["nix-command" "flakes"]; diff --git a/modules/nixos/base/networking.nix b/modules/nixos/base/networking.nix index b2e11606..5cfa3fa6 100644 --- a/modules/nixos/base/networking.nix +++ b/modules/nixos/base/networking.nix @@ -1,9 +1,18 @@ -{lib, ...}: { +{ + lib, + vars_networking, + ... +}: { # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. networking.firewall.enable = lib.mkDefault false; + programs.ssh = { + extraConfig = vars_networking.ssh.extraConfig; + knownHosts = vars_networking.ssh.knownHosts; + }; + # Enable the OpenSSH daemon. services.openssh = { enable = true;