From 31c4d62a8253fb0e08f281c7ca10f1393cf95984 Mon Sep 17 00:00:00 2001
From: KoenDR06 <koen.de.ruiter@hotmail.com>
Date: Tue, 25 Nov 2025 16:27:39 +0100
Subject: [PATCH 1/2] move docker group to appropriate place

---
 modules/apps/terminal/default.nix | 1 +
 modules/users/default.nix         | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/apps/terminal/default.nix b/modules/apps/terminal/default.nix
index 06dd904..6cf66e1 100644
--- a/modules/apps/terminal/default.nix
+++ b/modules/apps/terminal/default.nix
@@ -62,5 +62,6 @@ in {
 
     # Docker
     virtualisation.docker.enable = true;
+    users.users.${username}.extraGroups = ["docker"];
   };
 }
diff --git a/modules/users/default.nix b/modules/users/default.nix
index e5a58a1..b87ffcd 100644
--- a/modules/users/default.nix
+++ b/modules/users/default.nix
@@ -53,7 +53,6 @@ in {
       ];
       extraGroups = [
         "wheel"
-        "docker"
       ];
     };
   };

From ea7e267dcf8025a127e65f99b85dc6e2964ef955 Mon Sep 17 00:00:00 2001
From: KoenDR06 <koen.de.ruiter@hotmail.com>
Date: Tue, 25 Nov 2025 16:53:48 +0100
Subject: [PATCH 2/2] feat: keyd

---
 modules/hardware/default.nix    |  1 +
 modules/hardware/keyd.nix       | 29 +++++++++++++++++++++++++++++
 modules/wm/hyprland/default.nix |  1 +
 3 files changed, 31 insertions(+)
 create mode 100644 modules/hardware/keyd.nix

diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
index 295367a..53ff11b 100644
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -5,5 +5,6 @@
     ./gpu/nvidia.nix
     ./wifi.nix
     ./fingerprint.nix
+    ./keyd.nix
   ];
 }
diff --git a/modules/hardware/keyd.nix b/modules/hardware/keyd.nix
new file mode 100644
index 0000000..cfd17d7
--- /dev/null
+++ b/modules/hardware/keyd.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf;
+  cfg = config.horseman.hardware.keyd;
+in {
+  options = {
+    horseman.hardware.keyd = {
+      enable = mkEnableOption "Kanata, the key remapper";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.keyd = {
+      enable = true;
+
+      keyboards.main = {
+        ids = ["*"];
+        settings = {
+          main = {
+            capslock = "overload(control, esc)";
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix
index 862504e..3f9d1e7 100644
--- a/modules/wm/hyprland/default.nix
+++ b/modules/wm/hyprland/default.nix
@@ -44,6 +44,7 @@ in {
     ];
 
     horseman.apps.visual.safeeyes.enable = true;
+    horseman.hardware.keyd.enable = true;
 
     horseman.wm.hyprland.config = {
       execOnce = [