machines/lucia/configuration.nix

@@ -14,7 +14,7 @@ in
 
   services.openssh.enable = true;
   services.openssh.ports = [ 22 ];
-  services.openssh.passwordAuthentication = false;
+  services.openssh.settings.PasswordAuthentication = false;
   services.openssh.settings.PermitRootLogin = "prohibit-password";
   users.users.root.openssh.authorizedKeys.keys = sshKeys.admins;
 
@@ -198,7 +198,7 @@ in
 
   services.avahi = {
     enable = true;
-    nssmdns = true;
+    nssmdns4 = true;
     publish = {
       enable = true;
       addresses = true;

machines/moderatio/zfs.nix

@@ -8,7 +8,6 @@ boot.loader.efi.canTouchEfiVariables = false;
 boot.loader.generationsDir.copyKernels = true;
 boot.loader.grub.efiInstallAsRemovable = true;
 boot.loader.grub.enable = true;
-boot.loader.grub.version = 2;
 boot.loader.grub.copyKernels = true;
 boot.loader.grub.efiSupport = true;
 boot.loader.grub.zfsSupport = true;

machines/modules/sshd.nix

@@ -6,7 +6,7 @@ in
 {
   services.openssh.enable = true;
   services.openssh.ports = [ 22 ];
-  services.openssh.passwordAuthentication = false;
+  services.openssh.settings.PasswordAuthentication = false;
   services.openssh.settings.PermitRootLogin = "no";
   users.users.root.openssh.authorizedKeys.keys = sshKeys.admins;
 }

machines/modules/xserver.nix

@@ -7,7 +7,6 @@
       xterm.enable = false;
       cinnamon.enable = true;
     };
-
-    displayManager.defaultSession = "cinnamon";
   };
+  services.displayManager.defaultSession = "cinnamon";
 }