From 3fb80233b629b8dc4da56f16d5db0c3d0b44e251 Mon Sep 17 00:00:00 2001
From: Jonas Hahn <jonashahn1@gmx.net>
Date: Fri, 21 Nov 2025 00:16:29 +0100
Subject: [PATCH] Full kmonad

---
 hosts/minoxy-workstation/configuration.nix          | 1 +
 hosts/minoxy-workstation/hardware-configuration.nix | 2 +-
 hosts/thinix-thinkpad/configuration.nix             | 3 +--
 user/packages.nix                                   | 1 +
 user/users.nix                                      | 2 ++
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hosts/minoxy-workstation/configuration.nix b/hosts/minoxy-workstation/configuration.nix
index ccb3855..2dbfb6e 100644
--- a/hosts/minoxy-workstation/configuration.nix
+++ b/hosts/minoxy-workstation/configuration.nix
@@ -27,6 +27,7 @@
   services.udev.extraRules = ''
     # Ignore internal NVMe Windows partition
     SUBSYSTEM=="block", ENV{ID_FS_UUID}=="A09C8D5E9C8D2FB8", ENV{UDISKS_IGNORE}="1"
+    KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput"
   '';
 
   # TODO: Make all your working systems go to ext4 on the full disk for ease of use and storage
diff --git a/hosts/minoxy-workstation/hardware-configuration.nix b/hosts/minoxy-workstation/hardware-configuration.nix
index f525d2c..91f8ba4 100644
--- a/hosts/minoxy-workstation/hardware-configuration.nix
+++ b/hosts/minoxy-workstation/hardware-configuration.nix
@@ -9,7 +9,7 @@
   boot.initrd.availableKernelModules =
     [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
-	boot.kernelModules = [ "kvm-intel" "ecryptfs" ];
+	boot.kernelModules = [ "uinput" "kvm-intel" "ecryptfs" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/shared" = {
diff --git a/hosts/thinix-thinkpad/configuration.nix b/hosts/thinix-thinkpad/configuration.nix
index c3e36f3..b4dff6d 100644
--- a/hosts/thinix-thinkpad/configuration.nix
+++ b/hosts/thinix-thinkpad/configuration.nix
@@ -28,8 +28,7 @@
   }];
 
   services.xserver.xkb = {
-    layout = "us";           # or "us" or whatever base
-    variant = "neo";         # for Neo2
+    layout = "de";           # or "us" or whatever base
   };
   console.useXkbConfig = true;  # to make it apply on TTY too
 
diff --git a/user/packages.nix b/user/packages.nix
index 28b10aa..df17868 100644
--- a/user/packages.nix
+++ b/user/packages.nix
@@ -116,6 +116,7 @@
     lazydocker
     poppler_utils
     unstable.kmonad
+    xorg.setxkbmap
     prismlauncher
     entr
     yq
diff --git a/user/users.nix b/user/users.nix
index 221d3fd..bb76b2a 100644
--- a/user/users.nix
+++ b/user/users.nix
@@ -2,6 +2,7 @@
 
 {
 	users.defaultUserShell = pkgs.zsh;
+  users.groups = { uinput = {}; };
 	users.users = {
 		jonas = {
 			isNormalUser = true;
@@ -9,6 +10,7 @@
 			extraGroups = [ 
 				"docker"
 				"input"
+				"uinput"
 				"scanner"
 				"lp"
 				"davfs2"