feat(hypr): add stuff to make development easier

flake.lock

@@ -190,17 +190,17 @@
     "firefox-gx-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1717510595,
+        "lastModified": 1718121058,
-        "narHash": "sha256-QWae4pNWUsoNUvz6MntUtBG242aer3n+JrSk2cw/NOA=",
+        "narHash": "sha256-opmS7Qa4IUXs9hXVK9/xo1ZlHOwj+5gGxAc81l3ttWM=",
         "owner": "Godiesc",
         "repo": "firefox-gx",
-        "rev": "dde9941d4bf78b94d76bf06cccb2d1dce5372c56",
+        "rev": "c300409a4e45b53c5dc3203847476f60e7b906e1",
         "type": "github"
       },
       "original": {
         "owner": "Godiesc",
+        "ref": "v.9.2",
         "repo": "firefox-gx",
-        "rev": "dde9941d4bf78b94d76bf06cccb2d1dce5372c56",
         "type": "github"
       }
     },
@@ -817,36 +817,6 @@
         "type": "github"
       }
     },
-    "hypr-official-plugins": {
-      "inputs": {
-        "hyprland": [
-          "hyprland"
-        ],
-        "nixpkgs": [
-          "hypr-official-plugins",
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hypr-official-plugins",
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719173945,
-        "narHash": "sha256-VPXoV9osFbbjCmOnwN+8/7P1508SCp7CO7Y06AayQqs=",
-        "owner": "hyprwm",
-        "repo": "hyprland-plugins",
-        "rev": "135de7b88649dbe5fea8c997447bdc9d6f15ad86",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-plugins",
-        "type": "github"
-      }
-    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -924,6 +894,36 @@
         "url": "https://github.com/hyprwm/Hyprland"
       }
     },
+    "hyprland-plugins": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ],
+        "nixpkgs": [
+          "hyprland-plugins",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland-plugins",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1719173945,
+        "narHash": "sha256-VPXoV9osFbbjCmOnwN+8/7P1508SCp7CO7Y06AayQqs=",
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "rev": "135de7b88649dbe5fea8c997447bdc9d6f15ad86",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "type": "github"
+      }
+    },
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
@@ -1924,9 +1924,9 @@
         "gtk-theme-src": "gtk-theme-src",
         "headscale": "headscale",
         "home-manager": "home-manager",
-        "hypr-official-plugins": "hypr-official-plugins",
         "hyprgrass": "hyprgrass",
         "hyprland": "hyprland",
+        "hyprland-plugins": "hyprland-plugins",
         "jellyfin-flake": "jellyfin-flake",
         "jellyfin-ultrachromic-src": "jellyfin-ultrachromic-src",
         "libratbag-src": "libratbag-src",

flake.nix

@@ -64,8 +64,8 @@
     firefox-gx-src = {
       flake = false;
       owner = "Godiesc";
+      ref = "v.9.2";
       repo = "firefox-gx";
-      rev = "dde9941d4bf78b94d76bf06cccb2d1dce5372c56";
       type = "github";
     };
     flakegen.url = "github:jorsn/flakegen";
@@ -110,12 +110,6 @@
       repo = "home-manager";
       type = "github";
     };
-    hypr-official-plugins = {
-      inputs.hyprland.follows = "hyprland";
-      owner = "hyprwm";
-      repo = "hyprland-plugins";
-      type = "github";
-    };
     hyprgrass = {
       inputs.hyprland.follows = "hyprland";
       owner = "horriblename";
@@ -128,6 +122,12 @@
       type = "git";
       url = "https://github.com/hyprwm/Hyprland";
     };
+    hyprland-plugins = {
+      inputs.hyprland.follows = "hyprland";
+      owner = "hyprwm";
+      repo = "hyprland-plugins";
+      type = "github";
+    };
     jellyfin-flake = {
       inputs.nixpkgs.follows = "nixpkgs";
       owner = "matt1432";

inputs.nix

@@ -133,9 +133,12 @@ let
         submodules = true;
       };
 
-      hypr-official-plugins = mkHyprDep {
+      hyprland-plugins = mkHyprDep {
         owner = "hyprwm";
         repo = "hyprland-plugins";
+
+        # type = "path";
+        # path = "/home/matt/git/hyprland-plugins";
       };
 
       Hyprspace = mkHyprDep {
@@ -264,7 +267,7 @@ let
     {
       owner = "Godiesc";
       repo = "firefox-gx";
-      rev = "dde9941d4bf78b94d76bf06cccb2d1dce5372c56";
+      ref = "v.9.2";
     }
     {
       name = "git-theme-src";

modules/hyprland/default.nix

@@ -65,9 +65,13 @@ in {
   # HOME-MANAGER CONFIG
   home-manager.users.${mainUser} = {
     imports = [
+      ./dev.nix
+
+      # Plugins
       ./hyprgrass.nix
       ./hyprexpo.nix
       # ./Hyprspace.nix
+
       ./inputs.nix
       ./style.nix
     ];

modules/hyprland/dev.nix

@@ -0,0 +1,18 @@
+{pkgs, ...}: {
+  programs.bash.shellAliases = {
+    # https://wiki.hyprland.org/Contributing-and-Debugging/#lsp-and-formatting
+    "mkCMakeFiles" = "cmake -S . -B build/ -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON";
+  };
+
+  home.packages = [
+    (pkgs.writeShellScriptBin "testChanges" ''
+      rm -r /home/matt/git/$1/$2/{.cache,build}
+      nix flake update "$1"
+      nh os switch
+      (
+          cd "/home/matt/git/$1/$2"
+          nix develop /home/matt/git/$1 -c cmake -S . -B build/ -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+      )
+    '')
+  ];
+}

modules/hyprland/hyprexpo.nix

@@ -1,10 +1,10 @@
 {
-  hypr-official-plugins,
+  hyprland-plugins,
   pkgs,
   ...
 }: {
   wayland.windowManager.hyprland = {
-    plugins = [hypr-official-plugins.packages.${pkgs.system}.hyprexpo];
+    plugins = [hyprland-plugins.packages.${pkgs.system}.hyprexpo];
 
     settings = {
       plugin = {