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 /configuration.nix | |
parent | Merge branch 'server1' into server1_users (diff) | |
download | nixos-server-cf63e4141cf072b7b942bff23e023890e767a3b1.tar.gz nixos-server-cf63e4141cf072b7b942bff23e023890e767a3b1.zip |
Fix: Resolve merge conflicts
Diffstat (limited to 'configuration.nix')
-rw-r--r-- | configuration.nix | 8 |
1 files changed, 0 insertions, 8 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 |