From 2da812fecde0ef928ff4419b1560114e95608066 Mon Sep 17 00:00:00 2001
From: ahtlon <atlan@ahtlon.de>
Date: Sat, 26 Oct 2024 20:31:54 +0200
Subject: [PATCH] mehrere warnungen gefixt

---
 machines/lucia/configuration.nix | 4 ++--
 machines/moderatio/zfs.nix       | 1 -
 machines/modules/sshd.nix        | 2 +-
 machines/modules/xserver.nix     | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/machines/lucia/configuration.nix b/machines/lucia/configuration.nix
index f0164bda..440096a3 100644
--- a/machines/lucia/configuration.nix
+++ b/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;
diff --git a/machines/moderatio/zfs.nix b/machines/moderatio/zfs.nix
index 0052f1f2..db62d0a4 100644
--- a/machines/moderatio/zfs.nix
+++ b/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;
diff --git a/machines/modules/sshd.nix b/machines/modules/sshd.nix
index 25109ce1..3cf9bc07 100644
--- a/machines/modules/sshd.nix
+++ b/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;
 }
diff --git a/machines/modules/xserver.nix b/machines/modules/xserver.nix
index 622d1bc0..3e343990 100644
--- a/machines/modules/xserver.nix
+++ b/machines/modules/xserver.nix
@@ -7,7 +7,6 @@
       xterm.enable = false;
       cinnamon.enable = true;
     };
-
-    displayManager.defaultSession = "cinnamon";
   };
+  services.displayManager.defaultSession = "cinnamon";
 }