From 14adf2731ff919f0995461e259ce469e7126dbfd Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Wed, 6 Mar 2024 11:31:47 +0100
Subject: [PATCH] create input module for catbook-j

---
 hosts/catbook-j/configuration.nix   | 26 +-------------------------
 hosts/catbook-j/modules/default.nix |  5 +++++
 hosts/catbook-j/modules/input.nix   | 27 +++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 25 deletions(-)
 create mode 100644 hosts/catbook-j/modules/default.nix
 create mode 100644 hosts/catbook-j/modules/input.nix

diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix
index 6361745..d87e1cb 100644
--- a/hosts/catbook-j/configuration.nix
+++ b/hosts/catbook-j/configuration.nix
@@ -15,6 +15,7 @@
     ./hardware-configuration.nix
     ../../common.nix
     ../../modules
+    ./modules
   ];
   jade = {
     desktop = {
@@ -25,29 +26,6 @@
       mail.enable = true;
       gaming.enable = true;
     };
-    input.remapping = {
-      enable = true;
-      devices."AT Translated Set 2 keyboard" = {
-        swapKeys = [
-          ["KEY_Y" "KEY_Z"]
-          ["KEY_LEFTALT" "KEY_LEFTMETA"]
-        ];
-        dual_role = [
-          {
-            input = "KEY_CAPSLOCK";
-            hold = ["KEY_LEFTCTRL"];
-            tap = ["KEY_ESC"];
-          }
-        ];
-      };
-    };
-  };
-
-  hardware.trackpoint = {
-    enable = true;
-    # device = "MELF0410:00 1FD2:7007";
-    device = "DELL081C:00 044E:121F Mouse";
-    sensitivity = 255;
   };
 
   hardware.usb-modeswitch.enable = true;
@@ -81,8 +59,6 @@
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
 
-  services.xserver.libinput.touchpad.tapping = false;
-
   environment.systemPackages = [
     pkgs.plantuml
     pkgs.mqttui
diff --git a/hosts/catbook-j/modules/default.nix b/hosts/catbook-j/modules/default.nix
new file mode 100644
index 0000000..935baf9
--- /dev/null
+++ b/hosts/catbook-j/modules/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./input.nix
+  ];
+}
diff --git a/hosts/catbook-j/modules/input.nix b/hosts/catbook-j/modules/input.nix
new file mode 100644
index 0000000..cd5833b
--- /dev/null
+++ b/hosts/catbook-j/modules/input.nix
@@ -0,0 +1,27 @@
+{...}: {
+  # key remapping
+  jade.input.remapping = {
+    enable = true;
+    devices."AT Translated Set 2 keyboard" = {
+      swapKeys = [
+        ["KEY_Y" "KEY_Z"]
+        ["KEY_LEFTALT" "KEY_LEFTMETA"]
+      ];
+      dual_role = [
+        {
+          input = "KEY_CAPSLOCK";
+          hold = ["KEY_LEFTCTRL"];
+          tap = ["KEY_ESC"];
+        }
+      ];
+    };
+  };
+
+  hardware.trackpoint = {
+    enable = true;
+    device = "TPPS/2 IBM TrackPoint";
+    sensitivity = 220;
+  };
+
+  services.xserver.libinput.touchpad.tapping = false;
+}