From 9171c9c09ce4288316197e4c0acb53abe0259eca Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Thu, 31 Oct 2024 01:09:48 -0700
Subject: [PATCH] refactor: update stylix cursor config and kitty cursor

---
 modules/linux/stylix/default.nix        |  6 ++++++
 users/youwen/linux/hyprland/common.nix  | 13 ++++++-------
 users/youwen/linux/programs/default.nix |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/modules/linux/stylix/default.nix b/modules/linux/stylix/default.nix
index 558d682..4a673e1 100644
--- a/modules/linux/stylix/default.nix
+++ b/modules/linux/stylix/default.nix
@@ -29,5 +29,11 @@
         package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });
       };
     };
+
+    cursor = {
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Ice";
+      size = 26;
+    };
   };
 }
diff --git a/users/youwen/linux/hyprland/common.nix b/users/youwen/linux/hyprland/common.nix
index 6235366..1451591 100644
--- a/users/youwen/linux/hyprland/common.nix
+++ b/users/youwen/linux/hyprland/common.nix
@@ -7,7 +7,6 @@
     wl-clipboard
     swaybg
 
-    bibata-cursors
     libsForQt5.qtstyleplugin-kvantum
     libsForQt5.qt5ct
     papirus-icon-theme
@@ -26,12 +25,12 @@
       "$Right" = "L";
       "$Up" = "K";
       "$Down" = "J";
-      env = [
-        "HYPRCURSOR_THEME,Bibata-Modern-Ice"
-        "HYPRCURSOR_SIZE,26"
-        "XCURSOR_THEME,Bibata-Modern-Ice"
-        "XCURSOR_SIZE,26"
-      ];
+      # env = [
+      #   "HYPRCURSOR_THEME,Bibata-Modern-Ice"
+      #   "HYPRCURSOR_SIZE,26"
+      #   "XCURSOR_THEME,Bibata-Modern-Ice"
+      #   "XCURSOR_SIZE,26"
+      # ];
       bind =
         [
           # Application Keybinds
diff --git a/users/youwen/linux/programs/default.nix b/users/youwen/linux/programs/default.nix
index 9d2fcc4..a0bf533 100644
--- a/users/youwen/linux/programs/default.nix
+++ b/users/youwen/linux/programs/default.nix
@@ -15,8 +15,8 @@
       allow_remote_control = "socket-only";
       listen_on = "unix:/tmp/kitty";
       scrollback_pager = ''nvim --noplugin -c "set signcolumn=no showtabline=0" -c "silent write! /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - "'';
-      cursor = "#c0caf5";
-      cursor_text_color = "#1a1b26";
+      cursor = pkgs.lib.mkForce "#c0caf5";
+      cursor_text_color = pkgs.lib.mkForce "#1a1b26";
     };
     keybindings = {
       "kitty_mod+h" = "show_scrollback";