From a45bda03ad90e741d0422d54dbc1bf629286ccfc Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 2 Feb 2026 02:27:06 +0100
Subject: [PATCH] gruppled-{black,white}-cursors: refactor & move to
 pkgs/by-name

since this changes the pname this unfortunately creates 2 rebuilds
---
 .../gr/gruppled-black-cursors/package.nix}      | 17 +++++++++++------
 pkgs/top-level/all-packages.nix                 |  6 ++----
 2 files changed, 13 insertions(+), 10 deletions(-)
 rename pkgs/{data/icons/gruppled-cursors/default.nix => by-name/gr/gruppled-black-cursors/package.nix} (59%)

diff --git a/pkgs/data/icons/gruppled-cursors/default.nix b/pkgs/by-name/gr/gruppled-black-cursors/package.nix
similarity index 59%
rename from pkgs/data/icons/gruppled-cursors/default.nix
rename to pkgs/by-name/gr/gruppled-black-cursors/package.nix
index f03313de4e77..bd0052da29e9 100644
--- a/pkgs/data/icons/gruppled-cursors/default.nix
+++ b/pkgs/by-name/gr/gruppled-black-cursors/package.nix
@@ -1,12 +1,17 @@
 {
+  lib,
   stdenvNoCC,
   fetchFromGitHub,
-  theme,
-  lib,
+  theme ? "black",
 }:
 
+assert lib.asserts.assertOneOf "theme" theme [
+  "black"
+  "white"
+];
+
 stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "gruppled-cursors";
+  pname = "gruppled-${theme}-cursors";
   version = "1.0.0";
 
   src = fetchFromGitHub {
@@ -17,12 +22,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   installPhase = ''
-    mkdir -p $out/share/icons/${theme}
-    cp -r ${theme}/{cursors,index.theme} $out/share/icons/${theme}
+    mkdir -p $out/share/icons/gruppled_${theme}
+    cp -r gruppled_${theme}/{cursors,index.theme} $out/share/icons/gruppled_${theme}
   '';
 
   meta = {
-    description = "Gruppled Cursors theme";
+    description = "Gruppled ${lib.toSentenceCase theme} Cursors theme";
     homepage = "https://github.com/nim65s/gruppled-cursors";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ nim65s ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0acf541c941a..15e732a048f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9658,21 +9658,19 @@ with pkgs;
 
   inherit
     ({
-      gruppled-black-cursors = callPackage ../data/icons/gruppled-cursors { theme = "gruppled_black"; };
       gruppled-black-lite-cursors = callPackage ../data/icons/gruppled-lite-cursors {
         theme = "gruppled_black_lite";
       };
-      gruppled-white-cursors = callPackage ../data/icons/gruppled-cursors { theme = "gruppled_white"; };
       gruppled-white-lite-cursors = callPackage ../data/icons/gruppled-lite-cursors {
         theme = "gruppled_white_lite";
       };
     })
-    gruppled-black-cursors
     gruppled-black-lite-cursors
-    gruppled-white-cursors
     gruppled-white-lite-cursors
     ;
 
+  gruppled-white-cursors = gruppled-black-cursors.override { theme = "white"; };
+
   iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix { });
 
   /**