diff --git a/hosts/Infini-DESKTOP/default.nix b/hosts/Infini-DESKTOP/default.nix
index 880af89..c49dc5e 100644
--- a/hosts/Infini-DESKTOP/default.nix
+++ b/hosts/Infini-DESKTOP/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ config, pkgs, lib, ... }: {
   imports = lib.lists.flatten [
     ./hardware-configuration.nix
     ./filesystems.nix
@@ -22,9 +22,6 @@
       gpu.nvidia = true;
       wireless.enable = true;
       form.desktop = true;
-
-      # FIXME: openrazer does not properly build under Linux 5.18
-      # peripherals.razer.enable = true;
     };
     services = {
       apcupsd = {
@@ -52,11 +49,18 @@
     arduino
     hydrus
     sidequest
+    razergenie # TODO: replace with polychromatic
   ];
 
+
   programs.ns-usbloader.enable = true;
   programs.minipro.enable = true;
 
+  hardware.openrazer = {
+    enable = true;
+    users = [ config.user.name ];
+  };
+
   services.minecraft-servers = {
     enable = true;
 
diff --git a/modules/modules/hardware/peripherals/razer.nix b/modules/modules/hardware/peripherals/razer.nix
deleted file mode 100644
index bf84c91..0000000
--- a/modules/modules/hardware/peripherals/razer.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ options, config, lib, pkgs, ... }:
-
-with lib;
-with lib.our;
-let cfg = config.modules.hardware.peripherals.razer;
-in
-{
-  options.modules.hardware.peripherals.razer = {
-    enable = mkBoolOpt false;
-  };
-
-  config = mkIf cfg.enable {
-    hardware.openrazer = {
-      enable = true;
-      users = [ config.user.name ];
-    };
-
-    user.extraGroups = [ "plugdev" ];
-
-    home.home.packages = with pkgs; [ razergenie ]; # TODO replace with polychromatic
-  };
-}