From bb830b2ceb23aa2936577dd2a4c5b0e92b7a9089 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Thu, 23 Jan 2025 18:02:15 -0500
Subject: [PATCH] fix(hypr): declare plugins correctly

---
 modules/desktop/environment/home/hyprexpo.nix  | 7 ++-----
 modules/desktop/environment/home/hyprgrass.nix | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/desktop/environment/home/hyprexpo.nix b/modules/desktop/environment/home/hyprexpo.nix
index 0015abeb..85c14938 100644
--- a/modules/desktop/environment/home/hyprexpo.nix
+++ b/modules/desktop/environment/home/hyprexpo.nix
@@ -6,18 +6,15 @@ self: {
 }: let
   inherit (self.lib.hypr) mkBind;
 
-  inherit (lib) mkBefore mkIf;
+  inherit (lib) mkIf;
 
   cfg = osConfig.roles.desktop;
 in {
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland = {
-      # FIXME: https://github.com/hyprwm/Hyprland/issues/9131
-      # plugins = [self.inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo];
+      plugins = [self.inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo];
 
       settings = {
-        exec-once = mkBefore ["hyprctl plugins load ${self.inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo}/lib/libhyprexpo.so"];
-
         plugin.hyprexpo = {
           columns = 3;
           gap_size = 5;
diff --git a/modules/desktop/environment/home/hyprgrass.nix b/modules/desktop/environment/home/hyprgrass.nix
index 60a415a4..cee64f8e 100644
--- a/modules/desktop/environment/home/hyprgrass.nix
+++ b/modules/desktop/environment/home/hyprgrass.nix
@@ -6,18 +6,15 @@ self: {
 }: let
   inherit (self.lib.hypr) mkBind;
 
-  inherit (lib) map mkBefore mkIf;
+  inherit (lib) mkIf;
 
   cfg = osConfig.roles.desktop;
 in {
   config = mkIf (cfg.enable && cfg.isTouchscreen) {
     wayland.windowManager.hyprland = {
-      # FIXME: https://github.com/hyprwm/Hyprland/issues/9131
-      # plugins = [self.inputs.hyprgrass.packages.${pkgs.system}.default];
+      plugins = [self.inputs.hyprgrass.packages.${pkgs.system}.default];
 
       settings = {
-        exec-once = mkBefore ["hyprctl plugins load ${self.inputs.hyprgrass.packages.${pkgs.system}.default}/lib/libhyprgrass.so"];
-
         plugin.touch_gestures = {
           # The default sensitivity is probably too low on tablet screens,
           # I recommend turning it up to 4.0