diff --git a/modules/nixos.nix b/modules/nixos.nix
index 725d0929..899590b3 100644
--- a/modules/nixos.nix
+++ b/modules/nixos.nix
@@ -18,6 +18,15 @@
       temperature.night = 2300;
     };
     thermald.enable = lib.mkDefault true;
+    libinput = {
+      enable = true;
+      touchpad = {
+        accelSpeed = "1.0";
+        disableWhileTyping = true;
+        naturalScrolling = false;
+        tapping = true;
+      };
+    };
     xserver = {
       enable = true;
 
@@ -37,19 +46,9 @@
         ];
       };
 
-      libinput = {
-        enable = true;
-        touchpad = {
-          accelSpeed = "1.0";
-          disableWhileTyping = true;
-          naturalScrolling = false;
-          tapping = true;
-        };
-      };
-
       videoDrivers = lib.mkDefault [ "intel" ];
 
-      xkbOptions = "ctrl:nocaps,compose:ralt";
+      xkb.options = "ctrl:nocaps,compose:ralt";
     };
   };
   hardware.pulseaudio = {
diff --git a/src/modules/nixos.nw b/src/modules/nixos.nw
index 9f162ee4..a10902ab 100644
--- a/src/modules/nixos.nw
+++ b/src/modules/nixos.nw
@@ -64,6 +64,7 @@ services = {
 Enable the X server, start it automatically,
 
 <<Configure the X server>>=
+<<Configure libinput>>
 xserver = {
   enable = true;
 
@@ -71,11 +72,9 @@ xserver = {
 
   <<Configure the display manager>>
 
-  <<Configure libinput>>
-
   videoDrivers = lib.mkDefault [ "intel" ];
 
-  xkbOptions = "ctrl:nocaps,compose:ralt";
+  xkb.options = "ctrl:nocaps,compose:ralt";
 };
 @