diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix
index 1e1f53c..5d86803 100644
--- a/hosts/eddie/configuration.nix
+++ b/hosts/eddie/configuration.nix
@@ -99,7 +99,7 @@
       efi.canTouchEfiVariables = true;
     };
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelModules = [ "i2c-dev" "ddcci-backlight" ];
+    kernelModules = [ "i2c-dev" "ddcci-backlight" "amd_3d_vcache" "uinput" ];
     extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver ];
     initrd.systemd.enable = true;
     initrd.kernelModules = [
@@ -127,7 +127,7 @@
 
   hardware = {
     i2c.enable = true;
-
+    uinput.enable = true;
     openrazer = {
       enable = true;
       users = [ "emenel" ];
@@ -189,6 +189,7 @@
   };
   services.udev = {
     extraRules = ''
+      KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput"
       DEVPATH=="/devices/virtual/misc/cpu_dma_latency", OWNER="root", GROUP="audio", MODE="0660"
       ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="ddcci*", RUN+="${pkgs.coreutils-full}/bin/chgrp video /sys/class/backlight/%k/brightness"
       ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="ddcci*", RUN+="${pkgs.coreutils-full}/bin/chmod a+w /sys/class/backlight/%k/brightness"
@@ -484,6 +485,7 @@
     openFirewall = true;
   };
 
+  users.groups.uinput = { };
   # add user accounts
   users.users.emenel = {
     isNormalUser = true;
diff --git a/modules/system/kanata.nix b/modules/system/kanata.nix
index 644a30b..32c9914 100644
--- a/modules/system/kanata.nix
+++ b/modules/system/kanata.nix
@@ -1,6 +1,17 @@
 { config, lib, pkgs, ... }:
 
 {
+  environment.systemPackages = [ pkgs.kanata ];
+
+  # Add the Kanata service user to necessary groups
+  systemd.services.kanata-razer.serviceConfig = {
+    SupplementaryGroups = [
+      "input"
+      "uinput"
+      "openrazer"
+    ];
+  };
+
   services.kanata = {
     enable = true;
     keyboards = {
@@ -53,9 +64,9 @@
   lctrl lmet lalt           spc            ralt rctrl)
 
 (defalias
-  supesc (tap-hold-press 200 200 esc lmet)
-  sp-lsft (tap-hold-press 200 200 S-9 lsft)
-  sp-rsft (tap-hold-press 200 200 S-0 lsft))
+  supesc (tap-hold-press 100 200 esc lmet)
+  sp-lsft (tap-hold-press 100 200 S-9 lsft)
+  sp-rsft (tap-hold-press 100 200 S-0 lsft))
 
 (deflayer qwerty
   grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc