From 131299587c7d1c8c469d68be0ae862ea439e1bd3 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 10 Dec 2024 20:40:28 -0500
Subject: [PATCH] fix(hypr): use upstream plugins

---
 flake.lock                                    | Bin 57231 -> 57153 bytes
 flake.nix                                     | Bin 11219 -> 11143 bytes
 inputs/default.nix                            |  15 +--------------
 .../desktop/environment/home/hyprgrass.nix    |   2 ++
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index 65ceb01bfc39b6c8fe7f68074df3d13988a81d3a..a8c27d9323258f4e981baed2daf895afb3e4461d 100644
GIT binary patch
delta 304
zcmZwBOHRT-9Dwl!5Ei;&;UgwOOk992oL8CY5=zDLC=iMJnWh8CqiKt{?g=#f51?Ma
zkg#z<e4M}=n0OOo;?e_rzkGLZsgKvxDz0U?Af^FNg~L;{=vTtUr5#OBr|V1`fqj0V
z=dK&iL%&XC+;-~G)%dJ-qa8?=yIaE`ibiVU&*T)6(hjV;Y1r5~_!?%56d~zzPb$eI
zrWy-RF>F%Am{O8(PJN<<mK>5?^FL_4u}hf@C5#9-I>?_G1Iuwny}sF)RJ$GAHpMlr
zNEJw8^_%nCYB(ClR!f&d3%(!r;NHr^pjjvqgCc4&zswb*WzD271tA8;*wd7Im?7$U
dii_Wkzi1zxQ^)Yw%fgGh4e3r{{oeXq{s6}bWc&aC

delta 329
zcmbWuy-vbF902ebBx+0t28n|rAto9+*z@k%9+POT)E31iLg;qAyAr=>`G^`fo<Pn2
z37i~skg#ifEhl{jfBWzIGxzwF`xrTSYGMPy%f`C?aHP89(DnN~95{M|XTI7QrnF5W
zx6_GKBj{atDiqz5u?Lf85y~rT(DLWu$64JbloH!!hU7>xTVc)w7FKM>gxL~Hh6KS}
zQVS*p|1TD`q*5zaGBq5feSSTAKCI{S#9+jP!dt0I{c|%4F8imvsq}qyJBaRWc1Fj_
z4M)3ou`lYTBlN4|_6?v`4c@&)Seh<FI$7AlvA~w(BxWKp1T!fk20|i6ieN;|L~%-_
ZAz-Qn@N`guS5N!L-Gr>F&Gv#h_ys8qX4wD$

diff --git a/flake.nix b/flake.nix
index 16ce691752de12845a8f2e2c3625c41b03fd52ae..71ef55f08c87faa9388deb6c2d9dc678338ed127 100644
GIT binary patch
delta 38
ucmcZ{-X6Z8gO?{Gzo;lPDJL~AF*kLxprGjHy}TD0C!gk3*!+zDtuz2Jun(pH

delta 87
zcmZn<zZ|}ygLm?J1!3Ma1zQEBg4Cko{Jg}R$pQSLn^*E)WYjN8EdxmyCnX!3rzDyr
pSth3$BwL!9TACOb8YU+hrkWTVnwq7hCYqY07$h5PF60-J0RRN|8wvmb

diff --git a/inputs/default.nix b/inputs/default.nix
index f8bb0aab..a79702d2 100644
--- a/inputs/default.nix
+++ b/inputs/default.nix
@@ -119,24 +119,11 @@ let
       hyprland-plugins = mkHyprDep {
         owner = "hyprwm";
         repo = "hyprland-plugins";
-
-        # FIXME: wait for hyprgrass PR to make this one
-        rev = "3bc37da4b9cf0c96594011cb1e43156fea54d0c0";
-
-        # type = "path";
-        # path = "/home/matt/git/hyprland-plugins";
       };
 
       hyprgrass = mkHyprDep {
-        # owner = "horriblename";
+        owner = "horriblename";
         repo = "hyprgrass";
-
-        # FIXME: hopefully this gets merged soon
-        owner = "matt1432";
-        ref = "personal";
-
-        # type = "path";
-        # path = "/home/matt/git/hyprgrass";
       };
 
       hyprpaper = mkDep {
diff --git a/nixosModules/desktop/environment/home/hyprgrass.nix b/nixosModules/desktop/environment/home/hyprgrass.nix
index a99af09e..8ce5958b 100644
--- a/nixosModules/desktop/environment/home/hyprgrass.nix
+++ b/nixosModules/desktop/environment/home/hyprgrass.nix
@@ -22,6 +22,8 @@ in {
           # must be >= 3
           workspace_swipe_fingers = 3;
 
+          emulate_touchpad_swipe = true;
+
           # switching workspaces by swiping from an edge, this is separate from workspace_swipe_fingers
           # and can be used at the same time
           # possible values: l, r, u, or d