From a175907ba626f9db838df89b594b030ee9fd7d3b Mon Sep 17 00:00:00 2001
From: Nate Anderson <nate.anderson@vasion.com>
Date: Thu, 19 Dec 2024 13:55:46 -0700
Subject: [PATCH] Switch to bibata cursor for hyprcursor support, removed
 catppuccin flake gtk and using normal home manager

---
 nate-work/modules/home-manager/home.nix | 48 ++++++++++++-------------
 nate-work/modules/hypr/hypr_home.nix    | 10 +++---
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/nate-work/modules/home-manager/home.nix b/nate-work/modules/home-manager/home.nix
index 9353630..bd98e94 100644
--- a/nate-work/modules/home-manager/home.nix
+++ b/nate-work/modules/home-manager/home.nix
@@ -41,7 +41,7 @@
     enable = true;
     flavor = "macchiato";
     accent = "lavender";
-    pointerCursor.enable = true;
+    pointerCursor.enable = false;
   };
 
   
@@ -184,9 +184,9 @@
     # BAT_THEME="Catppuccin Macchiato";
     EDITOR = "hx";
     NIXOS_OZONE_WL = "1";
-    XCURSOR_THEME = "catppuccin-macchiato-lavender-cursors";
+    XCURSOR_THEME = "Bibata-Modern-Classic";
     XCURSOR_SIZE = "24";
-    HYPRCURSOR_THEME = "catppuccin-macchiato-lavender-cursors";
+    HYPRCURSOR_THEME = "Bibata-Modern-Classic";
     # HYPRCURSOR_SIZE = "24";
   };
 
@@ -267,31 +267,31 @@
 
   gtk = {
     enable = true;
-    catppuccin = {
-      enable = true;
-      size = "compact";
-      tweaks = [ "rimless" ];
-      icon = {
-        enable = true;
-      };
-    };
+    # catppuccin = {
+    #   enable = true;
+    #   size = "compact";
+    #   tweaks = [ "rimless" ];
+    #   icon = {
+    #     enable = true;
+    #   };
+    # };
     # cursorTheme = {
     #   package = pkgs.catppuccin-cursors.macchiatoLavender;
     #   name = "Catppuccin-Macchiato-Lavender-Cursors";
     # };
-    # iconTheme = {
-    #   package = pkgs.catppuccin-papirus-folders;
-    #   name = "Papirus-Dark";
-    # };
-    # theme = {
-    #   name = "catppuccin-macchiato-lavender-compact+rimless";
-    #   package = pkgs.catppuccin-gtk.override {
-    #     accents = [ "lavender" ];
-    #     size = "compact";
-    #     tweaks = [ "rimless" ];
-    #     variant = "macchiato";
-    #   };
-    # };
+    iconTheme = {
+      package = pkgs.catppuccin-papirus-folders;
+      name = "Papirus-Dark";
+    };
+    theme = {
+      name = "catppuccin-macchiato-lavender-compact+rimless";
+      package = pkgs.catppuccin-gtk.override {
+        accents = [ "lavender" ];
+        size = "compact";
+        tweaks = [ "rimless" ];
+        variant = "macchiato";
+      };
+    };
   };
   # Symlink in gtk and kvantum theme to ~/.config
   # xdg.configFile = {
diff --git a/nate-work/modules/hypr/hypr_home.nix b/nate-work/modules/hypr/hypr_home.nix
index 36e4481..3eb9ae6 100644
--- a/nate-work/modules/hypr/hypr_home.nix
+++ b/nate-work/modules/hypr/hypr_home.nix
@@ -198,11 +198,11 @@
     wayland.windowManager.hyprland.systemd.variables = ["--all"];
 
     home.pointerCursor = {
-      name = "catppuccin-macchiato-lavender-cursors";
-    #   package = pkgs.catppuccin-cursors.macchiatoLavender;
-    #   size = 24;
-    #   gtk.enable = true;
-    #   x11.enable = true;
+      gtk.enable = true;
+      name = "Bibata-Modern-Classic";
+      package = pkgs.bibata-cursors;
+
+      size = 24;
     };
     # home.sessionVariables = {
     # };