From 4b03beb264e1e82495c2fc5db6118a36b93c2091 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 21:06:19 -0400 Subject: [PATCH] Moved openssh --- hosts/hl-bigbox1.nix | 13 ++++++------ hosts/hl-fws1.nix | 1 + hosts/hl-minipc1.nix | 1 + hosts/hl-minipc2.nix | 1 + hosts/hl-terra1.nix | 1 + modules/nixos/common/default.nix | 1 + modules/nixos/common/ssh-server.nix | 33 +++++++++++++++++++++++++++++ modules/os/ssh.nix | 21 ------------------ 8 files changed, 45 insertions(+), 27 deletions(-) create mode 100644 modules/nixos/common/ssh-server.nix delete mode 100644 modules/os/ssh.nix diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 57dbbf9..502427e 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -2,6 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-bigbox1.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; virtualisation.docker.enableNvidia = true; @@ -60,12 +61,12 @@ package = config.boot.kernelPackages.nvidiaPackages.stable; }; # Steam Settings - users.users.steam = { - shell = pkgs.zsh; - isNormalUser = true; - description = "Steam User"; - extraGroups = [ "wheel" ]; - }; + users.users.steam = { + shell = pkgs.zsh; + isNormalUser = true; + description = "Steam User"; + extraGroups = [ "wheel" ]; + }; programs.steam = { enable = true; remotePlay.openFirewall = true; diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index bbc3787..4e052c8 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -2,6 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 2237f7e..2163c32 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -2,6 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.ssh-server.enabled = true; # Nix Stores services.nix-serve = { diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 87c0533..4f6a1fb 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -2,6 +2,7 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-minipc2.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; # Bootloader. diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index 43275ef..e514b15 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -3,6 +3,7 @@ { imports = [ ./hl-terra1.hardware-configuration.nix ]; skyg.user.enabled = true; + skyg.ssh-server.enabled = true; # firmware updater services.fwupd.enable = true; # Bootloader. diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index 3634490..d8c1c8f 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -4,5 +4,6 @@ ./hardware ./core.nix ./user.nix + ./ssh-server.nix ]; } diff --git a/modules/nixos/common/ssh-server.nix b/modules/nixos/common/ssh-server.nix new file mode 100644 index 0000000..aa321c3 --- /dev/null +++ b/modules/nixos/common/ssh-server.nix @@ -0,0 +1,33 @@ +{ config, lib, ... }: +with lib; + +let + cfg = config.skyg.ssh-server; +in +{ + options = { + skyg.ssh-server = { + enabled = mkEnableOption + "enable ssh server"; + masterPubKey = mkOption { + type = types.str; + default = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuatskL9qXvgvS3E8zRwosFnpcN0f8PkKl8syAvpn297V2iPk6mi8yK3EE7xPpxaKKlwUuBHDj3BNUCoLgdRFKUgroRDzr3BMm+gZTHy6CuEZBY9zBRTmH+aOV6FZ96QPW4zba0BW5YPkPNy/FhYibjpXyZ3nX4/LWSbPKQJ7wTnUJZgq4VFmevBOttvhzUJUgTziMFsGXn6I38fAi6LI8qwI+zOOdsNjtKgr/TIlO/7VqcH7GYnQEwlthl577sDd1V6+XWz649qoiBYyq0Ahm09dwYx2iGQwLo8IYFbSy4aJRK/PI0+ytnPBoF5QCl+ILb5E8uV3e6Wb9WpXl9Hv2iLx91/9iq5hykHPnfVtkq3MK0C2vqkvX1qFOIkKM7vmxvXGbaDZDGK3G+/zkQ7GUw8ydbl9wGwE9cKbm9miqs4w2Ry/+3IZasE6G2TI97bSzSYInQd2RwoglqBOaJojbUqgI9wvNdKxGhADNFbZah2+s6SSe1ByQRN3b9wtmqu0= ari@shared"; + }; + }; + }; + config = mkIf cfg.enabled { + services.openssh = { + enable = true; + settings.PasswordAuthentication = false; + settings.KbdInteractiveAuthentication = false; + settings.PermitRootLogin = "yes"; + }; + users.users.${config.skyg.user.name}.openssh.authorizedKeys.keys = [ + cfg.masterPubKey + ]; + users.users.root.openssh.authorizedKeys.keys = [ + cfg.masterPubKey + ]; + }; +} + diff --git a/modules/os/ssh.nix b/modules/os/ssh.nix deleted file mode 100644 index 8196846..0000000 --- a/modules/os/ssh.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ enableSSHServer, user }: -{ ... }: -{ - services.openssh = - if enableSSHServer then { - enable = true; - settings.PasswordAuthentication = false; - settings.KbdInteractiveAuthentication = false; - settings.PermitRootLogin = "yes"; - } else { - enable = false; - }; - users.users.${user.name}.openssh.authorizedKeys.keys = - if enableSSHServer then [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuatskL9qXvgvS3E8zRwosFnpcN0f8PkKl8syAvpn297V2iPk6mi8yK3EE7xPpxaKKlwUuBHDj3BNUCoLgdRFKUgroRDzr3BMm+gZTHy6CuEZBY9zBRTmH+aOV6FZ96QPW4zba0BW5YPkPNy/FhYibjpXyZ3nX4/LWSbPKQJ7wTnUJZgq4VFmevBOttvhzUJUgTziMFsGXn6I38fAi6LI8qwI+zOOdsNjtKgr/TIlO/7VqcH7GYnQEwlthl577sDd1V6+XWz649qoiBYyq0Ahm09dwYx2iGQwLo8IYFbSy4aJRK/PI0+ytnPBoF5QCl+ILb5E8uV3e6Wb9WpXl9Hv2iLx91/9iq5hykHPnfVtkq3MK0C2vqkvX1qFOIkKM7vmxvXGbaDZDGK3G+/zkQ7GUw8ydbl9wGwE9cKbm9miqs4w2Ry/+3IZasE6G2TI97bSzSYInQd2RwoglqBOaJojbUqgI9wvNdKxGhADNFbZah2+s6SSe1ByQRN3b9wtmqu0= ari@shared" - ] else [ ]; - users.users.root.openssh.authorizedKeys.keys = - if enableSSHServer then [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuatskL9qXvgvS3E8zRwosFnpcN0f8PkKl8syAvpn297V2iPk6mi8yK3EE7xPpxaKKlwUuBHDj3BNUCoLgdRFKUgroRDzr3BMm+gZTHy6CuEZBY9zBRTmH+aOV6FZ96QPW4zba0BW5YPkPNy/FhYibjpXyZ3nX4/LWSbPKQJ7wTnUJZgq4VFmevBOttvhzUJUgTziMFsGXn6I38fAi6LI8qwI+zOOdsNjtKgr/TIlO/7VqcH7GYnQEwlthl577sDd1V6+XWz649qoiBYyq0Ahm09dwYx2iGQwLo8IYFbSy4aJRK/PI0+ytnPBoF5QCl+ILb5E8uV3e6Wb9WpXl9Hv2iLx91/9iq5hykHPnfVtkq3MK0C2vqkvX1qFOIkKM7vmxvXGbaDZDGK3G+/zkQ7GUw8ydbl9wGwE9cKbm9miqs4w2Ry/+3IZasE6G2TI97bSzSYInQd2RwoglqBOaJojbUqgI9wvNdKxGhADNFbZah2+s6SSe1ByQRN3b9wtmqu0= ari@shared" - ] else [ ]; -}