From af647e2a1e2ba391ccd94f0f690b10437a257c63 Mon Sep 17 00:00:00 2001
From: ediblerope <fredrik@nordhammer.it>
Date: Tue, 12 May 2026 11:48:28 +0100
Subject: [PATCH] stylix: switch cursor to Bibata-Modern-Ice

Updates stylix.cursor and the three places that hardcode the cursor
name as env vars / hyprctl arg / XCURSOR_PATH so they stay aligned.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 settings/gnome.nix    | 6 +++---
 settings/hyprland.nix | 9 ++++-----
 settings/stylix.nix   | 4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/settings/gnome.nix b/settings/gnome.nix
index 44243d2..01defc5 100644
--- a/settings/gnome.nix
+++ b/settings/gnome.nix
@@ -24,12 +24,12 @@
       papirus-icon-theme
     ];
 
-    # Set cursor theme
+    # Cursor theme — stylix.cursor in settings/stylix.nix owns the choice.
     environment.sessionVariables = {
-      XCURSOR_THEME = "Adwaita";
+      XCURSOR_THEME = "Bibata-Modern-Ice";
       XCURSOR_SIZE = "24";
       XCURSOR_PATH = lib.mkForce [
-        "${pkgs.adwaita-icon-theme}/share/icons"
+        "${pkgs.bibata-cursors}/share/icons"
         "$HOME/.icons"
         "$HOME/.local/share/icons"
       ];
diff --git a/settings/hyprland.nix b/settings/hyprland.nix
index 003d143..ba806c8 100644
--- a/settings/hyprland.nix
+++ b/settings/hyprland.nix
@@ -76,11 +76,10 @@
             "AQ_DRM_DEVICES,/dev/dri/card1"
             "WLR_DRM_DEVICES,/dev/dri/card1"
             "DRI_PRIME,pci-0000_03_00_0"
-            # Match the GNOME session's cursor — same Adwaita already
-            # available from the gnome.nix package set.
-            "XCURSOR_THEME,Adwaita"
+            # Keep these in sync with stylix.cursor in settings/stylix.nix.
+            "XCURSOR_THEME,Bibata-Modern-Ice"
             "XCURSOR_SIZE,24"
-            "HYPRCURSOR_THEME,Adwaita"
+            "HYPRCURSOR_THEME,Bibata-Modern-Ice"
             "HYPRCURSOR_SIZE,24"
 
             # Prefer native Wayland backends where the app supports it.
@@ -104,7 +103,7 @@
             "nm-applet --indicator"
             "wl-paste --type text  --watch cliphist store"
             "wl-paste --type image --watch cliphist store"
-            "hyprctl setcursor Adwaita 24"
+            "hyprctl setcursor Bibata-Modern-Ice 24"
           ];
 
           general = {
diff --git a/settings/stylix.nix b/settings/stylix.nix
index 8bd0a50..c97aae9 100644
--- a/settings/stylix.nix
+++ b/settings/stylix.nix
@@ -13,8 +13,8 @@
       autoEnable = true;
 
       cursor = {
-        package = pkgs.adwaita-icon-theme;
-        name = "Adwaita";
+        package = pkgs.bibata-cursors;
+        name = "Bibata-Modern-Ice";
         size = 24;
       };