From 72c9177f952c3b3a3084cfcc9ebf11af3e9b1eb5 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Fri, 22 May 2026 05:54:04 -0700
Subject: [PATCH] Fix hyprexpo Hyprland plugin loading

---
 nixos/flake.lock   |  6 +++---
 nixos/hyprland.nix | 12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/nixos/flake.lock b/nixos/flake.lock
index 29ad355c..30cc318d 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -745,11 +745,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779446260,
-        "narHash": "sha256-ZXwD/THjBMTtRzPiwkYQrkRW9yUPm1wGD3I5BWzWoGk=",
+        "lastModified": 1779454209,
+        "narHash": "sha256-n4yKGRu/vh7Y3ltmJsqDTe+D+KM3MyRQcZmTmu8Q8do=",
         "owner": "colonelpanic8",
         "repo": "hyprexpo",
-        "rev": "c1f7fe882f669e482aec2ce3a4b0ef491136828d",
+        "rev": "1036964b11dac19d09069309e118f5e3196c1dc1",
         "type": "github"
       },
       "original": {
diff --git a/nixos/hyprland.nix b/nixos/hyprland.nix
index 0a239b5e..d56f963a 100644
--- a/nixos/hyprland.nix
+++ b/nixos/hyprland.nix
@@ -22,6 +22,9 @@
   # GCC 15.2 ICEs while compiling Hyprland 0.55 on this pin. Keep the
   # Hyprland/plugin pin set intact and build Hyprland itself with Clang.
   baseHyprlandPackage = avoidHyprlandGccIce hyprlandInput.packages.${system}.hyprland;
+  hyprlandPluginsForBase = pkgs.callPackage "${pkgs.path}/pkgs/applications/window-managers/hyprwm/hyprland-plugins" {
+    hyprland = baseHyprlandPackage;
+  };
   cleanupStaleGraphicalSession = pkgs.writeShellScript "cleanup-stale-graphical-session" ''
     set -u
 
@@ -124,8 +127,11 @@
         ./packages/hyprwobbly-safe-geometry-and-idle-timer.patch
       ];
   });
-  hyprexpo = pkgs.callPackage "${inputs.hyprexpo}/default.nix" {};
-  hyprwinview = pkgs.hyprlandPlugins.mkHyprlandPlugin {
+  hyprexpo = pkgs.callPackage "${inputs.hyprexpo}/default.nix" {
+    hyprland = baseHyprlandPackage;
+    hyprlandPlugins = hyprlandPluginsForBase;
+  };
+  hyprwinview = hyprlandPluginsForBase.mkHyprlandPlugin {
     pluginName = "hyprwinview";
     version = "0.1.0";
     src = inputs.hyprwinview;
@@ -138,7 +144,7 @@
       platforms = lib.platforms.linux;
     };
   };
-  hyprWorkspaceHistory = pkgs.hyprlandPlugins.mkHyprlandPlugin {
+  hyprWorkspaceHistory = hyprlandPluginsForBase.mkHyprlandPlugin {
     pluginName = "hypr-workspace-history";
     version = "0.1.0";
     src = inputs.hypr-workspace-history;