From eb782a67cbf8ccc4b373cdf9bac020c1dd743e06 Mon Sep 17 00:00:00 2001
From: Christoph Urlacher <christoph.urlacher@protonmail.com>
Date: Thu, 26 Mar 2026 20:14:47 +0100
Subject: [PATCH] Modules/Niri: Update gtk config after HM update

---
 home/homemodules/niri/default.nix | 47 ++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/home/homemodules/niri/default.nix b/home/homemodules/niri/default.nix
index 9e63018e..e3998003 100644
--- a/home/homemodules/niri/default.nix
+++ b/home/homemodules/niri/default.nix
@@ -19,30 +19,43 @@ in {
       }
     ];
 
-    gtk = {
-      enable = true;
-      iconTheme.package = color.iconPackage;
-      iconTheme.name = color.iconTheme;
+    gtk = let
+      gtkConfig = {
+        enable = true;
 
-      colorScheme = "dark";
-      gtk3.colorScheme = "dark";
-      gtk4.colorScheme = "dark";
+        colorScheme = "dark";
 
-      theme = {
-        # name = "adw-gtk3-dark";
-        # package = pkgs.adw-gtk3;
-        name = "catppuccin-mocha-mauve-standard";
-        package = pkgs.catppuccin-gtk.override {
-          variant = "mocha";
-          accents = ["mauve"];
-          size = "standard";
+        iconTheme = {
+          package = color.iconPackage;
+          name = color.iconTheme;
+        };
+
+        cursorTheme = {
+          name = color.cursor;
+          package = color.cursorPackage;
+        };
+
+        theme = {
+          # name = "adw-gtk3-dark";
+          # package = pkgs.adw-gtk3;
+          name = "catppuccin-mocha-mauve-standard";
+          package = pkgs.catppuccin-gtk.override {
+            variant = "mocha";
+            accents = ["mauve"];
+            size = "standard";
+          };
         };
       };
 
-      gtk3.extraConfig = {
+      gtkExtraConfig = {
         gtk-application-prefer-dark-theme = 1;
       };
-    };
+    in
+      gtkConfig
+      // {
+        gtk3 = gtkConfig // {extraConfig = gtkExtraConfig;};
+        gtk4 = gtkConfig // {extraConfig = gtkExtraConfig;};
+      };
 
     dconf = {
       enable = true;