diff --git a/nix/system/common/users.nix b/nix/system/common/users.nix
index ba97722..cf23bb8 100644
--- a/nix/system/common/users.nix
+++ b/nix/system/common/users.nix
@@ -13,7 +13,7 @@
 
   # run the following command to swap escape and caps-lock keys, like a
   # civilized person:
-  services.xserver.xkbOptions = "caps:swapescape";
+  services.xserver.xkb.options = "caps:swapescape";
 
   users.extraUsers.haak = {
     shell = pkgs.zsh;
diff --git a/nix/system/framework/configuration.nix b/nix/system/framework/configuration.nix
index 4092afe..7ab723f 100644
--- a/nix/system/framework/configuration.nix
+++ b/nix/system/framework/configuration.nix
@@ -114,7 +114,7 @@
   # enable avahi for printer discovery
   services.avahi = {
     enable = true;
-    nssmdns = true;
+    nssmdns4 = true;
   };
 
   # VPN setup
@@ -149,7 +149,7 @@
     displayManager.gdm.enable = true;
     desktopManager.gnome.enable = true;
 
-    layout = "us";
+    xkb = { layout = "us"; };
   };
 
   services.syncthing = {