diff --git a/boxes/mlg/default.nix b/boxes/mlg/default.nix
index b05d4a0..74fe11a 100644
--- a/boxes/mlg/default.nix
+++ b/boxes/mlg/default.nix
@@ -63,7 +63,7 @@
 
   services.printing.enable = true;
   services.avahi.enable = true; # runs the Avahi daemon
-  services.avahi.nssmdns = true; # enables the mDNS NSS plug-in
+  services.avahi.nssmdns4 = true; # enables the mDNS NSS plug-in
   services.avahi.openFirewall = true; # opens the firewall for UDP port 5353
 
   powerManagement.cpuFreqGovernor = "performance";
diff --git a/boxes/netbox/default.nix b/boxes/netbox/default.nix
index 6592fe4..c391657 100644
--- a/boxes/netbox/default.nix
+++ b/boxes/netbox/default.nix
@@ -63,12 +63,13 @@
 
   services.radicale = {
     enable = true;
-    config = ''
-      [auth]
-      type = htpasswd
-      htpasswd_filename = radicale-passwd
-      htpasswd_encryption = plain
-    '';
+    settings = {
+      auth = {
+        type = "htpasswd";
+        htpasswd_filename = "radicale-passwd";
+        htpasswd_encryption = "plain";
+      };
+    };
   };
 
   services.rss2email = {
diff --git a/modules/x11.nix b/modules/x11.nix
index f71c3ea..95377a4 100644
--- a/modules/x11.nix
+++ b/modules/x11.nix
@@ -14,9 +14,10 @@
 
   services.xserver = {
     enable = true;
-    libinput.enable = true;
-    layout = "us";
+    xkb.layout = "us";
 
     displayManager.sx.enable = true;
   };
+
+  services.libinput.enable = true;
 }