From 87c07bfecf78bb9ed011b6bd64775f93d7e6c36b Mon Sep 17 00:00:00 2001
From: DACHXY <Danny10132024@gmail.com>
Date: Thu, 26 Dec 2024 15:53:51 +0800
Subject: [PATCH] fix: catppuccin gtk theme

---
 home/user/config.nix        |  4 +++-
 home/user/environment.nix   |  1 -
 home/user/gtk.nix           | 26 +++++++++++++++++++-------
 home/user/programs.nix      |  1 +
 system/modules/packages.nix |  1 +
 system/modules/programs.nix | 11 +++++------
 system/modules/services.nix |  3 +++
 7 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/home/user/config.nix b/home/user/config.nix
index 0eb7a50..8248720 100644
--- a/home/user/config.nix
+++ b/home/user/config.nix
@@ -1,5 +1,7 @@
+{ pkgs, ... }:
 let configDir = ../config;
-in {
+in
+{
   home.file = {
     ".config/nvim" = {
       source = "${configDir}/nvim";
diff --git a/home/user/environment.nix b/home/user/environment.nix
index 547af59..490c8dc 100644
--- a/home/user/environment.nix
+++ b/home/user/environment.nix
@@ -17,7 +17,6 @@
     CLUTTER_BACKEND = "wayland";
     WLR_RENDERER = "vulkan";
     XCURSOR_SIZE = "32";
-    GTK_THEME = "Catppuccin-Macchiato-Compact-Lavender-Dark";
     XDG_CURRENT_DESKTOP = "Hyprland";
     XDG_SESSION_DESKTOP = "Hyprland";
     XDG_SESSION_TYPE = "wayland";
diff --git a/home/user/gtk.nix b/home/user/gtk.nix
index d53c349..6fd0ed2 100644
--- a/home/user/gtk.nix
+++ b/home/user/gtk.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   gtk = {
     enable = true;
 
@@ -8,10 +9,10 @@
     };
 
     theme = {
-      name = "Catppuccin-Macchiato-Compact-Lavender-dark";
+      name = "catppuccin-macchiato-lavender-compact";
       package = pkgs.catppuccin-gtk.override {
-        size = "compact";
         accents = [ "lavender" ];
+        size = "compact";
         variant = "macchiato";
       };
     };
@@ -21,13 +22,24 @@
       package = pkgs.papirus-folders;
     };
 
-    gtk3.extraConfig = {
-      gtk-application-prefer-dark-theme = 1;
+    gtk3 = {
+      # extraCss = gtk-css;
+      extraConfig = {
+        gtk-application-prefer-dark-theme = 1;
+      };
     };
 
-    gtk4.extraConfig = {
-      gtk-application-prefer-dark-theme = 1;
+    gtk4 = {
+      # extraCss = gtk-css;
+      extraConfig = {
+        gtk-application-prefer-dark-theme = 1;
+      };
     };
+  };
 
+  qt = {
+    enable = true;
+    style.name = "adwaita-dark";
+    style.package = pkgs.adwaita-qt;
   };
 }
diff --git a/home/user/programs.nix b/home/user/programs.nix
index 23824d9..c27e766 100644
--- a/home/user/programs.nix
+++ b/home/user/programs.nix
@@ -27,6 +27,7 @@
       "font.name.monospace.zh-TW" = "Noto Sans Mono CJK TC";
     };
 
+
     # firefox = {
     #   enable = true;
     #   languagePacks = [
diff --git a/system/modules/packages.nix b/system/modules/packages.nix
index be54856..4fbb95d 100644
--- a/system/modules/packages.nix
+++ b/system/modules/packages.nix
@@ -55,6 +55,7 @@
 
     # Misc
     xfce.thunar # File manager
+    nwg-look
 
     # Portal
     xdg-desktop-portal-gtk
diff --git a/system/modules/programs.nix b/system/modules/programs.nix
index 11b3d0a..b53aeab 100644
--- a/system/modules/programs.nix
+++ b/system/modules/programs.nix
@@ -86,12 +86,11 @@
     mtr.enable = true;
     fish.enable = true;
 
-    # nix-index = {
-    #   enable = true;
-    #   enableFishIntegration = true;
-    #   enableBashIntegration = false;
-    #   enableZshIntegration = false;
-    # };
+    thunar.plugins = with pkgs.xfce; [
+      thunar-archive-plugin
+      thunar-volman
+      thunar-media-tags-plugin
+    ];
 
     # Set fish as default shell but not login shell
     bash = {
diff --git a/system/modules/services.nix b/system/modules/services.nix
index 9758c72..654ffff 100644
--- a/system/modules/services.nix
+++ b/system/modules/services.nix
@@ -42,5 +42,8 @@
     devmon.enable = true;
 
     flatpak.enable = true;
+
+    # Thuner plugin
+    tumbler.enable = true; # Thumbnail
   };
 }