From 32a31bea834b2bd384f88ef69c6667f6bae72287 Mon Sep 17 00:00:00 2001
From: 514fpv <koishi@514fpv.one>
Date: Mon, 29 Jul 2024 14:19:20 +0800
Subject: [PATCH] home(gnome): update gtk theme names

---
 home/gnome/impl/dconf.nix | 16 +++++++++-------
 home/gnome/impl/nixos.nix |  5 ++++-
 home/gnome/nixos.nix      |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix
index f8426c5d..b729c39c 100644
--- a/home/gnome/impl/dconf.nix
+++ b/home/gnome/impl/dconf.nix
@@ -3,6 +3,7 @@
 , config
 , ... }: with lib; let
   cfg = config.passthrough.gnome;
+  bg = ../../catppuccin/flake.png;
 in mkIf cfg.enable {
   dconf.settings = let
     p = "org/gnome";
@@ -26,18 +27,18 @@ in mkIf cfg.enable {
     "${pd}/background" = {
       color-shading-type = "solid";
       picture-options = "zoom";
-      picture-uri = "file://${../../../share/catppuccin-nix.png}";
-      picture-uri-dark = "file://${../../../share/catppuccin-nix.png}";
+      picture-uri = "file://${bg}";
+      picture-uri-dark = "file://${bg}";
       primary-color = "#000000000000";
       secondary-color = "#000000000000";
     };
 
     "${pd}/interface" = {
       color-scheme = "prefer-dark";
-      cursor-theme = "Catppuccin-Frappe-Dark-Cursors";
+      cursor-theme = "catppuccin-mocha-dark-cursors";
       font-antialiasing = "grayscale";
       font-hinting = "slight";
-      gtk-theme = "Catppuccin-Frappe-Compact-Pink-Dark";
+      gtk-theme = "catppuccin-mocha-pink-compact";
       icon-theme = "Papirus-Dark";
     };
 
@@ -45,7 +46,7 @@ in mkIf cfg.enable {
       color-shading-type = "solid";
       lock-enabled = false;
       picture-options = "zoom";
-      picture-uri = "file://${../../../share/catppuccin-nix.png}";
+      picture-uri = "file://${bg}";
       primary-color = "#000000000000";
       secondary-color = "#000000000000";
     };
@@ -54,10 +55,11 @@ in mkIf cfg.enable {
       action-double-click-titlebar = "toggle-maximize";
       action-middle-click-titlebar = "minimize";
       button-layout = "close,minimize,maximize:appmenu";
+      resize-with-right-button = true;
     };
 
     "${ptlp}" = {
-      default = "71a9971e-e829-43a9-9b2f-4565c855d664";
+      default = "95894cfd-82f7-430d-af6e-84d168bc34f5";
       list = [
         "de8a9081-8352-4ce4-9519-5de655ad9361"
         "71a9971e-e829-43a9-9b2f-4565c855d664"
@@ -162,7 +164,7 @@ in mkIf cfg.enable {
       welcome-dialog-last-shown-version = "45.3";
     };
 
-    "${pse}/user-theme".name = "Catppuccin-Frappe-Compact-Pink-Dark";
+    "${pse}/user-theme".name = "catppuccin-mocha-pink-compact";
 
     "${pse}/dash-to-dock" = {
       background-opacity = 0.80000000000000004;
diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix
index e7ebd0a8..57716860 100644
--- a/home/gnome/impl/nixos.nix
+++ b/home/gnome/impl/nixos.nix
@@ -10,7 +10,10 @@ in mkIf cfg.enable {
   services.xserver.displayManager.gdm.enable = true;
   services.xserver.desktopManager.gnome.enable = true;
   services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
+  hardware.pulseaudio.enable = false;
 
-  users.home.persist.directories = [ ];
+  users.home.persist.directories = [
+    ".config/dconf"
+  ];
   environment.persistence."/nix/persist/fhs".directories = [ ];
 }
diff --git a/home/gnome/nixos.nix b/home/gnome/nixos.nix
index ee00b3ef..c7a3bd26 100644
--- a/home/gnome/nixos.nix
+++ b/home/gnome/nixos.nix
@@ -13,7 +13,7 @@ in {
   config = {
     users.homeModules = [
       # this module passes gnome configuration to home-manager
-      { passthrough.gnome= cfg; }
+      { passthrough.gnome = cfg; }
     ];
 
     specialisation.nognome = with cfg; mkIf enable {