From fffd743d54daa1bc8557bf39f19b581be9d10462 Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Mon, 3 Feb 2025 20:45:23 -0800
Subject: [PATCH] refactor: directly override hyprscroller instead of overlay,
 bump ver

---
 .../desktop-environment/hyprland/default.nix  | 12 +++++++-
 overlays/default.nix                          | 30 ++++++-------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/hm/modules/linux/desktop-environment/hyprland/default.nix b/hm/modules/linux/desktop-environment/hyprland/default.nix
index 9e242df..d9eca42 100644
--- a/hm/modules/linux/desktop-environment/hyprland/default.nix
+++ b/hm/modules/linux/desktop-environment/hyprland/default.nix
@@ -85,7 +85,17 @@ in
 
     wayland.windowManager.hyprland = {
       enable = true;
-      plugins = lib.mkIf cfg.hyprscroller.enable [ pkgs.hyprlandPlugins.hyprscroller ];
+      plugins = lib.mkIf cfg.hyprscroller.enable [
+        (pkgs.hyprlandPlugins.hyprscroller.overrideAttrs {
+          version = "0.47.2";
+          src = pkgs.fetchFromGitHub {
+            owner = "dawsers";
+            repo = "hyprscroller";
+            rev = "ce7503685297d88e0bb0961343ed3fbed21c559c";
+            hash = "sha256-3pGIe4H1LUOJw0ULfVwZ7Ph7r/AyEipx7jbWP7zz3MU=";
+          };
+        })
+      ];
       settings = {
         "$mod" = "SUPER";
         "$Left" = "H";
diff --git a/overlays/default.nix b/overlays/default.nix
index 1db6fc9..ceef228 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -13,27 +13,15 @@ in
   nixpkgs.overlays = [
     (import ../pkgs { inherit pkgs; })
     (final: prev: {
-      hyprlandPlugins.hyprscroller =
-        if (lib.versionAtLeast pkgs.hyprland.version "0.47.1") then
-          prev.hyprlandPlugins.hyprscroller.overrideAttrs {
-            version = "0.47.1";
-            src = prev.fetchFromGitHub {
-              owner = "dawsers";
-              repo = "hyprscroller";
-              rev = "e4b13544ef3cc235eb9ce51e0856ba47eb36e8ac";
-              hash = "sha256-OYCcIsE25HqVBp8z76Tk1v+SuYR7W1nemk9mDS9GHM8=";
-            };
-          }
-        else
-          prev.hyprlandPlugins.hyprscroller.overrideAttrs {
-            version = "0.47.0";
-            src = prev.fetchFromGitHub {
-              owner = "dawsers";
-              repo = "hyprscroller";
-              rev = "ce7503685297d88e0bb0961343ed3fbed21c559c";
-              hash = "sha256-3pGIe4H1LUOJw0ULfVwZ7Ph7r/AyEipx7jbWP7zz3MU=";
-            };
-          };
+      hyprlandPlugins.hyprscroller = prev.hyprlandPlugins.hyprscroller.overrideAttrs {
+        version = "0.47.2";
+        src = prev.fetchFromGitHub {
+          owner = "dawsers";
+          repo = "hyprscroller";
+          rev = "ce7503685297d88e0bb0961343ed3fbed21c559c";
+          hash = "";
+        };
+      };
     })
   ];
 }