diff --git a/configuration.nix b/configuration.nix
index 8660d63..49ff05f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -37,10 +37,12 @@
 
   # Enable the X11 windowing system.
   services.xserver = {
-    layout = "us";
-    enable = true;
-    xkbVariant = "";
-    xkbOptions = "caps_lock:esc";
+    xkb = {
+      layout = "us";
+      enable = true;
+      variant = "";
+      options = "caps_lock:esc";
+    };
     videoDrivers = [
                      # "displaylink" # broken
                      "modesetting"