diff --git a/modules/nixos/boot.nix b/modules/nixos/boot.nix
index 80756a2..3b12055 100644
--- a/modules/nixos/boot.nix
+++ b/modules/nixos/boot.nix
@@ -2,6 +2,12 @@
   boot = {
     consoleLogLevel = 3;
     initrd.verbose = false;
+    
+    # Global kernel parameters
+    kernelParams = [
+      "usbcore.autosuspend=-1" # Disable USB autosuspend to fix keyboard wakeup issues
+    ];
+
     loader = {
       timeout = 0;
       systemd-boot = {
@@ -26,4 +32,4 @@
       theme = "hakase";
     };
   };
-}
+}
\ No newline at end of file
diff --git a/modules/nixos/gaming.nix b/modules/nixos/gaming.nix
index 8e9c3bd..e1ab5ea 100644
--- a/modules/nixos/gaming.nix
+++ b/modules/nixos/gaming.nix
@@ -8,7 +8,7 @@
   hardware.steam-hardware.enable = true;
   hardware.xpadneo.enable = true; # Xbox controllers via Bluetooth
   hardware.uinput.enable = true;
-  # services.udev.packages = [pkgs.game-devices-udev-rules];
+  services.udev.packages = [pkgs.game-devices-udev-rules];
 
   programs.steam = {
     enable = true;
diff --git a/modules/nixos/power.nix b/modules/nixos/power.nix
index dcfaa93..feafb5a 100644
--- a/modules/nixos/power.nix
+++ b/modules/nixos/power.nix
@@ -1,10 +1,4 @@
 {pkgs, ...}: {
-  # USB wakeup configuration
-  # services.udev.extraRules = ''
-  #   # Enable keyboard (NuPhy Air96 V2) wakeup from suspend
-  #   ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="19f5", ATTRS{idProduct}=="3247", ATTR{power/wakeup}="enabled"
-  #
-  #   # Disable mouse (Pulsar 8Kdx) wakeup from suspend
-  #   ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="3710", ATTRS{idProduct}=="5406", ATTR{power/wakeup}="disabled"
-  # '';
-}
+  # USB wakeup configuration - Temporarily Disabled
+  # systemd.services.disable-usb-wakeups = { ... };
+}
\ No newline at end of file