diff options
| author | ene <ene@sils.li> | 2023-01-21 07:41:32 +0100 |
|---|---|---|
| committer | ene <ene@sils.li> | 2023-01-21 07:41:32 +0100 |
| commit | cf63e4141cf072b7b942bff23e023890e767a3b1 (patch) | |
| tree | 7eeafef988fd8c3f541369526b6711e082085a48 | |
| parent | Merge branch 'server1' into server1_users (diff) | |
| download | nixos-server-cf63e4141cf072b7b942bff23e023890e767a3b1.tar.gz nixos-server-cf63e4141cf072b7b942bff23e023890e767a3b1.zip | |
Fix: Resolve merge conflicts
| -rw-r--r-- | configuration.nix | 8 | ||||
| -rw-r--r-- | hardware-configuration.nix | 9 | ||||
| -rw-r--r-- | services/opensshd.nix | 27 |
3 files changed, 18 insertions, 26 deletions
diff --git a/configuration.nix b/configuration.nix index 75701ad..8fc047a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -4,7 +4,6 @@ ./packages.nix ./networking.nix # network configuration that just works ./users.nix - ./services/minecraft.nix ./services/minecraft.nix ./services/rust-motd.nix @@ -16,13 +15,6 @@ networking.hostName = "server1"; networking.domain = "vhack.eu"; - # openssh config - services.openssh = { - enable = true; - passwordAuthentication = false; - extraConfig = "PrintMotd yes\n"; # this could be done with pam - }; - system.stateVersion = "22.11"; } # vim: ts=2 diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 9fcbe2b..76cdb1e 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -19,13 +19,14 @@ fsType = "btrfs"; options = ["subvol=storage" "compress-force=zstd"]; }; - "/etc/nixos" = { - device = "/srv/nix-config"; - options = ["bind"]; - }; "/boot" = { device = "/dev/vda3"; options = ["subvol=boot" "compress-force=zstd"]; }; + + "/etc/nixos" = { + device = "/srv/nix-config"; + options = ["bind"]; + }; }; } diff --git a/services/opensshd.nix b/services/opensshd.nix index 4bd38fd..cb9f2ba 100644 --- a/services/opensshd.nix +++ b/services/opensshd.nix @@ -1,19 +1,18 @@ -{ config, pkg, ... }: { +{ + config, + pkg, + ... +}: { services.openssh = { enable = true; passwordAuthentication = false; - extraConfig = '' - PrintMotd yes - ''; # this could be done with pam - hostKeys = [{ - comment = "key comment"; - path = "/srv/sshd/ssh_host_ed25519_key"; - rounds = 1000; - type = "ed25519"; - }]; + hostKeys = [ + { + comment = "key comment"; + path = "/srv/sshd/ssh_host_ed25519_key"; + rounds = 1000; + type = "ed25519"; + } + ]; }; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGBFuTNNn71Rhfnop2cdz3r/RhWWlCePnSBOhTBbu2ME soispha" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG63gxw8JePmrC8Fni0pLV4TnPBhCPmSV9FYEdva+6s7 sils" - ]; } |