From 934644c5e2fdbe5970e714674914d7ae12010392 Mon Sep 17 00:00:00 2001
From: Christoph Urlacher <christoph.urlacher@protonmail.com>
Date: Fri, 20 Mar 2026 17:10:43 +0100
Subject: [PATCH] Modules/Niri: Update gtk theme + fix flatpak themes

---
 home/christoph/default.nix        |  8 ++++++--
 home/homemodules/niri/default.nix | 20 +++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 15aa6b38..e66ac0bc 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -836,14 +836,18 @@ in
             # Force Wayland by default
             # Context.sockets = ["wayland" "!x11" "!fallback-x11"]; # NOTE: Makes discord + steam crash
 
-            Context.filesystems = ["/nix/store:ro"];
+            Context.filesystems = [
+              "/nix/store:ro"
+              "${config.home.homeDirectory}/.themes:ro"
+              "${config.home.homeDirectory}/.config/gtk-4.0:ro"
+            ];
 
             Environment = {
               # Fix un-themed cursor in some Wayland apps
               XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons";
 
               # Force correct theme for some GTK apps
-              GTK_THEME = "Adwaita:light";
+              GTK_THEME = config.gtk.theme.name;
             };
           };
 
diff --git a/home/homemodules/niri/default.nix b/home/homemodules/niri/default.nix
index ed70e074..ce7e5a0b 100644
--- a/home/homemodules/niri/default.nix
+++ b/home/homemodules/niri/default.nix
@@ -29,8 +29,14 @@ in {
       gtk4.colorScheme = "dark";
 
       theme = {
-        name = "adw-gtk3-dark";
-        package = pkgs.adw-gtk3;
+        # 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 = {
@@ -56,6 +62,9 @@ in {
       file.".config/DankMaterialShell/.firstlaunch".text = "";
       file.".config/DankMaterialShell/.changelog-1.4".text = "";
 
+      # Link theme for flatpak
+      file.".themes/${config.gtk.theme.name}".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
+
       sessionVariables = {
         QT_QPA_PLATFORMTHEME = "gtk3"; # For Noctalia
         GDK_BACKEND = "wayland"; # For screen sharing
@@ -75,7 +84,12 @@ in {
 
         nautilus # Fallback file chooser used by xdg-desktop-portal-gnome
 
-        # In case we fallback to the default config
+        # Catppuccin-GTK theme
+        sassc
+        gtk-engine-murrine
+        gnome-themes-extra
+
+        # In case we fallback to the default niri config/keybindings
         alacritty
         fuzzel
       ];