fix: update to fix hyprland related breaking changes

common/home/neovim/default.nix

@@ -4,14 +4,12 @@
   lib,
   nvim-theme-src,
   coc-stylelintplus,
-  tree-sitter-hyprlang,
   ...
 }: let
   inherit (config.vars) neovimIde;
   inherit (lib) fileContents hasAttr optionalAttrs optionals;
 
   javaSdk = pkgs.temurin-bin-17;
-  nvim-treesitter-hyprlang = tree-sitter-hyprlang.packages.${pkgs.system}.default;
   coc-stylelintplus-flake = coc-stylelintplus.packages.${pkgs.system}.default;
 in {
   home = optionalAttrs neovimIde {
@@ -258,7 +256,6 @@ in {
         ++ (with pkgs.vimPlugins; [
           nvim-treesitter-context
           nvim-treesitter-textobjects
-          nvim-treesitter-hyprlang
           {
             type = "viml";
             config = fileContents ./plugins/treesitter.vim;
@@ -288,6 +285,7 @@ in {
               p.groovy
               p.haskell
               p.haskell_persistent
+              p.hyprlang
               p.html
               p.ini
               p.java

modules/hyprland/inputs.nix

@@ -3,51 +3,52 @@
   osConfig,
   ...
 }: let
-  inherit (lib) genAttrs optionals;
+  inherit (lib) optionals;
   inherit (osConfig.services.xserver) xkb;
   inherit (osConfig.vars) mainMonitor;
 
   nagaProNames = [
     # Wireless
-    "device:razer-razer-naga-pro"
+    "razer-razer-naga-pro"
 
     # Wired (it always changes)
-    "device:razer-razer-naga-pro-1"
-    "device:razer-naga-pro"
-    "device:razer-naga-pro-1"
-    "device:razer-naga-pro-2"
-    "device:razer-naga-pro-3"
+    "razer-razer-naga-pro-1"
+    "razer-naga-pro"
+    "razer-naga-pro-1"
+    "razer-naga-pro-2"
+    "razer-naga-pro-3"
   ];
-  nagaConf = {
+  nagaConf = name: {
+    inherit name;
     sensitivity = 0;
+    accel_profile = "flat";
   };
 in {
   wayland.windowManager.hyprland = {
-    settings =
-      (genAttrs nagaProNames (n: nagaConf))
-      // {
-        input = {
-          kb_layout = xkb.layout;
-          kb_variant = xkb.variant;
-          follow_mouse = true;
-          accel_profile = "flat";
+    device = map (d: (nagaConf d)) nagaProNames;
 
-          touchpad = {
-            natural_scroll = true;
-            disable_while_typing = false;
-          };
+    settings = {
+      input = {
+        kb_layout = xkb.layout;
+        kb_variant = xkb.variant;
+        follow_mouse = true;
+
+        touchpad = {
+          natural_scroll = true;
+          disable_while_typing = false;
         };
-
-        bind = [
-          ",XF86AudioPlay, exec, playerctl play-pause"
-          ",XF86AudioStop, exec, playerctl stop"
-          ",XF86AudioNext, exec, playerctl next"
-          ",XF86AudioPrev, exec, playerctl previous"
-        ];
-
-        exec-once =
-          optionals (! isNull mainMonitor)
-          ["hyprctl dispatch focusmonitor ${mainMonitor}"];
       };
+
+      bind = [
+        ",XF86AudioPlay, exec, playerctl play-pause"
+        ",XF86AudioStop, exec, playerctl stop"
+        ",XF86AudioNext, exec, playerctl next"
+        ",XF86AudioPrev, exec, playerctl previous"
+      ];
+
+      exec-once =
+        optionals (! isNull mainMonitor)
+        ["hyprctl dispatch focusmonitor ${mainMonitor}"];
+    };
   };
 }