diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix
index 23187f5..54dbb64 100644
--- a/hosts/eddie/configuration.nix
+++ b/hosts/eddie/configuration.nix
@@ -18,6 +18,7 @@
     filesystems-filez
     filesystems-media-server
     sound
+    openrazer
   ];
 
   nixpkgs = {
@@ -164,7 +165,7 @@
       };
       efi.canTouchEfiVariables = true;
     };
-    kernelPackages = pkgs.linuxPackages_6_13;
+    kernelPackages = pkgs.linuxPackages_latest;
     kernelModules = [
       "i2c-dev"
       "ddcci-backlight"
@@ -177,7 +178,7 @@
     extraModulePackages = with config.boot.kernelPackages; [
       ddcci-driver
       xpadneo
-      openrazer
+      # openrazer
     ];
     extraModprobeConfig = ''
       options bluetooth disable_ertm=Y
@@ -219,10 +220,10 @@
     };
     i2c.enable = true;
     uinput.enable = true;
-    openrazer = {
-      enable = true;
-      users = [ "emenel" ];
-    };
+    # openrazer = {
+    #   enable = true;
+    #   users = [ "emenel" ];
+    # };
     graphics = {
       enable = true;
       enable32Bit = true;
diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix
index b619b50..fd1158f 100644
--- a/modules/home/desktop.nix
+++ b/modules/home/desktop.nix
@@ -72,7 +72,6 @@
       ungoogled-chromium
       obsidian
       vlc
-      polychromatic
       discord
       slack
       signal-desktop
diff --git a/modules/system/openrazer.nix b/modules/system/openrazer.nix
new file mode 100644
index 0000000..e1a6b4f
--- /dev/null
+++ b/modules/system/openrazer.nix
@@ -0,0 +1,48 @@
+{
+  config,
+  lib,
+  modulesPath,
+  pkgs,
+  ...
+}:
+
+{
+  # NIXPKGS-PR: 394300
+  disabledModules = [
+    "${modulesPath}/hardware/openrazer.nix"
+  ];
+  imports = [
+    (builtins.fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixpkgs/4a11562c20fbe7af7d5ac139dbf0f8d50ce276f6/nixos/modules/hardware/openrazer.nix";
+      sha256 = "0n6kzrcwlmxgws4pmffyqagp2rxpfxmfjl11vgvlkjcbglg6fs7y";
+    })
+  ];
+
+  hardware.openrazer = {
+    enable = true;
+    users = [
+      "emenel"
+    ];
+    # NIXPKGS-PR: 384992
+    packages = let
+      oldVersion = pkgs.python3Packages.openrazer-daemon.version;
+      version = "3.10.1";
+    in lib.mapAttrs (_: package: package.overrideAttrs (oldAttrs: {
+      version = lib.replaceStrings [ oldVersion ] [ version ] oldAttrs.version;
+      src = pkgs.fetchFromGitHub {
+        owner = "openrazer";
+        repo = "openrazer";
+        tag = "v${version}";
+        hash = "sha256-igrGx7Y6ENtZatJCTAW43/0q6ZjljJ9/kU3QFli4yIU=";
+      };
+    })) {
+      kernel = config.boot.kernelPackages.openrazer;
+      daemon = pkgs.python3Packages.openrazer-daemon;
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    openrazer-daemon
+    polychromatic
+  ];
+}