diff --git a/system/app/virtualization.nix b/system/app/virtualization.nix
index 20588384..947b0fd8 100644
--- a/system/app/virtualization.nix
+++ b/system/app/virtualization.nix
@@ -8,7 +8,7 @@
       "virbr0"
     ];
     enable = true;
-    qemuRunAsRoot = false;
+    qemu.runAsRoot = false;
   };
   boot.extraModulePackages = with config.boot.kernelPackages; [ virtualbox ];
 }
diff --git a/system/hardware/printing.nix b/system/hardware/printing.nix
index 8adce810..33863438 100644
--- a/system/hardware/printing.nix
+++ b/system/hardware/printing.nix
@@ -4,7 +4,7 @@
   # Enable printing
   services.printing.enable = true;
   services.avahi.enable = true;
-  services.avahi.nssmdns = true;
+  services.avahi.nssmdns4 = true;
   services.avahi.openFirewall = true;
   environment.systemPackages = [ pkgs.cups-filters ];
 }
diff --git a/system/wm/fonts.nix b/system/wm/fonts.nix
index a7cd9694..a75544c6 100644
--- a/system/wm/fonts.nix
+++ b/system/wm/fonts.nix
@@ -2,7 +2,7 @@
 
 {
   # Fonts are nice to have
-  fonts.fonts = with pkgs; [
+  fonts.packages = with pkgs; [
     # Fonts
     (nerdfonts.override { fonts = [ "Inconsolata" ]; })
     powerline
diff --git a/system/wm/wayland.nix b/system/wm/wayland.nix
index f2fbbf7a..d8d41566 100644
--- a/system/wm/wayland.nix
+++ b/system/wm/wayland.nix
@@ -23,9 +23,11 @@
   # Configure xwayland
   services.xserver = {
     enable = true;
-    layout = "us";
-    xkbVariant = "";
-    xkbOptions = "caps:escape";
+    xkb = {
+      layout = "us";
+      variant = "";
+      options = "caps:escape";
+    };
     displayManager.sddm = {
       enable = true;
       wayland.enable = true;