From 4e8e8f0fed4f6d0967af78c918d35d13998506d6 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Thu, 15 Jul 2021 19:07:57 +0700
Subject: [PATCH] split system/gui into system/input

---
 hosts/winter.nix         |  2 +-
 modules/system/gui.nix   | 12 ------------
 modules/system/input.nix | 19 +++++++++++++++++++
 3 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 modules/system/input.nix

diff --git a/hosts/winter.nix b/hosts/winter.nix
index 7466d65..126697d 100644
--- a/hosts/winter.nix
+++ b/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;
 }
 
diff --git a/modules/system/gui.nix b/modules/system/gui.nix
index 6ad91dc..a95c5e7 100644
--- a/modules/system/gui.nix
+++ b/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";
   };
 }
diff --git a/modules/system/input.nix b/modules/system/input.nix
new file mode 100644
index 0000000..41c7ba0
--- /dev/null
+++ b/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;
+}