From 9a00e77cceb27717b01bbc97909ac8737b41b9e2 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Fri, 5 Apr 2024 22:44:46 +0200
Subject: [PATCH] Move input configuration for x11 into the DE config

---
 modules/system/de.nix      | 22 ++++++++++++++++++++--
 modules/system/x-input.nix | 31 -------------------------------
 2 files changed, 20 insertions(+), 33 deletions(-)
 delete mode 100644 modules/system/x-input.nix

diff --git a/modules/system/de.nix b/modules/system/de.nix
index b2acd66..67ed0eb 100644
--- a/modules/system/de.nix
+++ b/modules/system/de.nix
@@ -12,9 +12,27 @@
 
             windowManager.qtile.enable = true;
             desktopManager.wallpaper.mode = "fill";
-        };
 
-        myConfig.x-input.enable = true;
+                xkb = {
+                    layout = "de";
+                    variant = "nodeadkeys";
+                };
+
+                libinput = {
+                    enable = true;
+
+                    touchpad = {
+                        accelProfile = "adaptive";
+                        naturalScrolling = true;
+                        disableWhileTyping = true;
+                    };
+
+                    mouse = {
+                        accelProfile = "flat";
+                        middleEmulation = false;
+                    };
+                };
+            };
 
         xdg.portal = {
             enable = true;
diff --git a/modules/system/x-input.nix b/modules/system/x-input.nix
deleted file mode 100644
index b51caf2..0000000
--- a/modules/system/x-input.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    config,
-    lib,
-    ...
-}: {
-    options.myConfig.x-input.enable = lib.mkEnableOption "";
-
-    config = lib.mkIf config.myConfig.x-input.enable {
-        services.xserver = {
-            xkb = {
-                layout = "de";
-                variant = "nodeadkeys";
-            };
-
-            libinput = {
-                enable = true;
-
-                touchpad = {
-                    accelProfile = "adaptive";
-                    naturalScrolling = true;
-                    disableWhileTyping = true;
-                };
-
-                mouse = {
-                    accelProfile = "flat";
-                    middleEmulation = false;
-                };
-            };
-        };
-    };
-}