diff options
| -rw-r--r-- | archetypes/profiles/desktop/default.nix | 5 | ||||
| -rw-r--r-- | archetypes/profiles/headless/default.nix | 2 | ||||
| -rw-r--r-- | nixos/default.nix | 1 | ||||
| -rw-r--r-- | nixos/ssh.nix | 16 |
4 files changed, 5 insertions, 19 deletions
diff --git a/archetypes/profiles/desktop/default.nix b/archetypes/profiles/desktop/default.nix index 7cd7d48..e816815 100644 --- a/archetypes/profiles/desktop/default.nix +++ b/archetypes/profiles/desktop/default.nix @@ -40,7 +40,10 @@ _geoclue2.enable = mkDesktop true; _pipewire.enable = mkDesktop true; _printing.enable = mkDesktop true; - _ssh.enable = mkDesktop true; + openssh = { + enable = mkDesktop true; + settings.X11Forwarding = mkDesktop true; + }; tlp.enable = mkDesktop true; # Ensure video group can change backlight diff --git a/archetypes/profiles/headless/default.nix b/archetypes/profiles/headless/default.nix index 34aaefb..c3ab755 100644 --- a/archetypes/profiles/headless/default.nix +++ b/archetypes/profiles/headless/default.nix @@ -17,7 +17,7 @@ }; services = { - _ssh.enable = mkHeadless true; + openssh.enable = mkHeadless true; smartd.enable = mkHeadless true; }; diff --git a/nixos/default.nix b/nixos/default.nix index 224ce70..8eb5708 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -26,7 +26,6 @@ ./powerkeys.nix ./printing.nix ./secrets.nix - ./ssh.nix ./sudo.nix ./suspend.nix ./zshenv.nix diff --git a/nixos/ssh.nix b/nixos/ssh.nix deleted file mode 100644 index 8f81474..0000000 --- a/nixos/ssh.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib, config, ... }: let - cfg = config.services._ssh; -in { - options.services._ssh = { - enable = lib.mkEnableOption "enable openssh with X11 forwarding"; - }; - - config = lib.mkIf cfg.enable { - services.openssh = { - enable = true; - settings = { - X11Forwarding = true; - }; - }; - }; -} |