split system/gui into system/input

hosts/winter.nix

@@ -16,6 +16,7 @@
     audio
     gui
     hardware-configuration
+    input
     kernel
     networking
     packages
@@ -43,6 +44,5 @@
   nixpkgs.config.allowUnfree = true;
 
   i18n.defaultLocale = "en_GB.UTF-8";
-  console.useXkbConfig = true;
 }
 

modules/system/gui.nix

@@ -28,19 +28,7 @@
     displayManager = {
       lightdm.enable = lib.mkForce false;
       startx.enable = true;
-      xserverArgs = [
-        "-ardelay 250"
-        "-arinterval 15"
-      ];
     };
     desktopManager.xterm.enable = false;
-    libinput = {
-      enable = true;
-      mouse = {
-        accelSpeed = "0";
-        accelProfile = "flat";
-      };
-    };
-    xkbOptions = "caps:escape";
   };
 }

modules/system/input.nix

@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }: {
+  services.xserver = {
+    displayManager = {
+      xserverArgs = [
+        "-ardelay 250"
+        "-arinterval 15"
+      ];
+    };
+    libinput = {
+      enable = true;
+      mouse = {
+        accelSpeed = "0";
+        accelProfile = "flat";
+      };
+    };
+    xkbOptions = "caps:escape";
+  };
+  console.useXkbConfig = true;
+}