diff --git a/nixos/graphical.nix b/nixos/graphical.nix
index ce10a642..cfbfd7fb 100644
--- a/nixos/graphical.nix
+++ b/nixos/graphical.nix
@@ -10,23 +10,24 @@
   services.xserver = {
     enable = true;
     desktopManager.xfce.enable = true;
-    displayManager = {
-      defaultSession = "xfce";
-      lightdm = {
-        background = ../backgrounds/${background-image};
-        greeters.slick.enable = true;
-      };
+    displayManager.lightdm = {
+      background = ../backgrounds/${background-image};
+      greeters.slick.enable = true;
     };
 
-    layout = "fox";
-    xkbOptions = "caps:escape";
-    extraLayouts.fox = {
-      description = "Layout suitable to be used by a fox";
-      languages = ["se"];
-      symbolsFile = fox-layout;
+    xkb = {
+      layout = "fox";
+      options = "caps:escape";
+      extraLayouts.fox = {
+        description = "Layout suitable to be used by a fox";
+        languages = ["se"];
+        symbolsFile = fox-layout;
+      };
     };
   };
 
+  services.displayManager.defaultSession = "xfce";
+
   console.useXkbConfig = true;
 
   # Enable sound.