From ae474de92e1de4c70d5fe5b095232eedeffe03a7 Mon Sep 17 00:00:00 2001
From: Jo <johannesreckers2006@gmail.com>
Date: Wed, 29 May 2024 14:00:31 +0200
Subject: [PATCH] [general] add missing shell theme config to gnome

Signed-off-by: Jo <johannesreckers2006@gmail.com>
---
 flake.lock                                      | 17 -----------------
 flake.nix                                       |  4 +---
 .../home-manager/themes/catppuccin/global.nix   |  2 +-
 .../home-manager/themes/catppuccin/gnome.nix    | 14 +++++++++++++-
 users/jo/desktop/gnome.nix                      | 14 ++++----------
 5 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/flake.lock b/flake.lock
index e3fdf12..869a120 100644
--- a/flake.lock
+++ b/flake.lock
@@ -68,22 +68,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-catppuccin": {
-      "locked": {
-        "lastModified": 1716835396,
-        "narHash": "sha256-H2dN5tooIaHqbU52ldreAhbxE33fxASflPqvMsoQFQc=",
-        "owner": "isabelroses",
-        "repo": "nixpkgs",
-        "rev": "a554569da3b72f2896aa26537a4339ac45a15f66",
-        "type": "github"
-      },
-      "original": {
-        "owner": "isabelroses",
-        "ref": "update-catppuccin",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "plasma-manager": {
       "inputs": {
         "home-manager": [
@@ -113,7 +97,6 @@
         "hardware": "hardware",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-catppuccin": "nixpkgs-catppuccin",
         "plasma-manager": "plasma-manager"
       }
     }
diff --git a/flake.nix b/flake.nix
index ed36c9d..8e90aa1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,11 +21,9 @@
     hardware.url = "github:NixOS/nixos-hardware/master";
 
     catppuccin.url = "github:catppuccin/nix";
-
-    nixpkgs-catppuccin.url = "github:isabelroses/nixpkgs/update-catppuccin";
   };
 
-  outputs = { self, nixpkgs, home-manager, plasma-manager, hardware, catppuccin, nixpkgs-catppuccin, ... } @inputs:
+  outputs = { self, nixpkgs, home-manager, plasma-manager, hardware, catppuccin, ... } @inputs:
   let
     inherit (self) outputs;
 
diff --git a/modules/home-manager/themes/catppuccin/global.nix b/modules/home-manager/themes/catppuccin/global.nix
index cd2f047..4970340 100644
--- a/modules/home-manager/themes/catppuccin/global.nix
+++ b/modules/home-manager/themes/catppuccin/global.nix
@@ -12,6 +12,6 @@
   catppuccin = {
     enable = true;
     accent = "blue";
-    flavor = "macchiato";
+    flavor = "frappe";
   };
 }
\ No newline at end of file
diff --git a/modules/home-manager/themes/catppuccin/gnome.nix b/modules/home-manager/themes/catppuccin/gnome.nix
index 348e453..4b17e9d 100644
--- a/modules/home-manager/themes/catppuccin/gnome.nix
+++ b/modules/home-manager/themes/catppuccin/gnome.nix
@@ -7,6 +7,18 @@
 }: {
   gtk = {
     enable = true;
-    catppuccin.enable = true;
+  };
+
+  dconf.settings = {
+    # ---------------------- Theming
+    "org/gnome/desktop/background" = {
+      picture-uri = "${outputs.resources.wallpapers}/animals_at_campfire.jpg";
+      picture-uri-dark = "${outputs.resources.wallpapers}/animals_at_campfire.jpg";
+    };
+
+    "org/gnome/shell/extensions/user-theme" = {
+      name = "Catppuccin-Frappe-Standard-Blue-Dark";
+    };
+    # ---------------------- Theming END
   };
 }
\ No newline at end of file
diff --git a/users/jo/desktop/gnome.nix b/users/jo/desktop/gnome.nix
index 1fcc6c8..525724c 100644
--- a/users/jo/desktop/gnome.nix
+++ b/users/jo/desktop/gnome.nix
@@ -5,6 +5,10 @@
   lib,
   ...
 }: {
+  imports = [
+    outputs.homeManagerModules.themes.catppuccin.gnome
+  ];
+
   home.packages = with pkgs.gnomeExtensions; [
     dash-to-dock
     user-themes
@@ -13,11 +17,6 @@
     unite
   ];
 
-  gtk = {
-    enable = true;
-    catppuccin.enable = true;
-  };
-
   # Use `dconf watch /` to track stateful changes you are doing, then set them here.
   dconf.settings = {
     "org/gnome/desktop/interface" = {
@@ -45,11 +44,6 @@
       workspace-names = [ "Main" ];
     };
 
-    "org/gnome/desktop/background" = {
-      picture-uri = "${outputs.resources.wallpapers}/animals_at_campfire.jpg";
-      picture-uri-dark = "${outputs.resources.wallpapers}/animals_at_campfire.jpg";
-    };
-
     "org/gnome/shell/extensions/unite" = {
       use-activities-text = false;
       extend-left-box = false;