From b41c025fc13203214a45746e9c1a8b346602afea Mon Sep 17 00:00:00 2001
From: Katharina Fey <kookie@spacekookie.de>
Date: Sun, 6 Oct 2019 19:48:14 +0000
Subject: <>: Move trackout module from input to hardware

---
 modules/workstation/hardware/default.nix            |  7 ++++++-
 modules/workstation/hardware/trackpoint/default.nix | 17 +++++++++++++++++
 modules/workstation/input/trackpoint.nix            | 17 -----------------
 3 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 modules/workstation/hardware/trackpoint/default.nix
 delete mode 100644 modules/workstation/input/trackpoint.nix

(limited to 'modules/workstation')

diff --git a/modules/workstation/hardware/default.nix b/modules/workstation/hardware/default.nix
index 28f684b5906..29f590df27a 100644
--- a/modules/workstation/hardware/default.nix
+++ b/modules/workstation/hardware/default.nix
@@ -4,13 +4,18 @@
  * some are only relevant for specific platforms. Still
  * the general support should be provided by the
  * WORKSTATION module, not be bound to be device specific
+ *
+ * Not included but available:
+ *
+ * - TRACKPOINT
+ * - CKB
  */
 
 { ... }:
 
 {
   imports = [
-    ./yubikey
     ./xkblayout
+    ./yubikey
   ];
 }
diff --git a/modules/workstation/hardware/trackpoint/default.nix b/modules/workstation/hardware/trackpoint/default.nix
new file mode 100644
index 00000000000..58de0a72be6
--- /dev/null
+++ b/modules/workstation/hardware/trackpoint/default.nix
@@ -0,0 +1,17 @@
+/* TRACKPOINT INPUT CONFIGURATION
+ *
+ * This is a compatibility module for Thinkpad computers
+ */
+
+{ config, ... }: {
+  services.xserver.libinput = {
+    accelProfile = "flat";
+    accelSpeed = "-0.2";
+    scrollButton = 2;
+  };
+
+  hardware.trackpoint = {
+    enable = true;
+    emulateWheel = true;
+  };
+}
diff --git a/modules/workstation/input/trackpoint.nix b/modules/workstation/input/trackpoint.nix
deleted file mode 100644
index e4019d6361d..00000000000
--- a/modules/workstation/input/trackpoint.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-/* TRACKPOINT INPUT CONFIGURATION
- *
- * This is a compatibility module for Thinkpad computers
- */
-
-{ config, .... }: {
-  services.xserver.libinput = {
-    accelProfile = "flat";
-    accelSpeed = "-0.2";
-    scrollButton = 2;
-  };
-
-  hardware.trackpoint = {
-    enable = true;
-    emulateWheel = true;
-  };
-}
-- 
cgit v1.2.3