From 53fefe878e1f6d321a00c6916f8f2863c2ab6ee0 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Tue, 7 Jan 2025 20:26:40 +0100
Subject: [PATCH] Switch to Colloid theme

---
 modules/greetd/default.nix  | 26 +++++++++++++++++++++-----
 modules/regreet/default.nix | 17 ++++++++++-------
 users/erwin/home.nix        | 17 ++++++++++-------
 users/erwin/work.nix        | 17 ++++++++++-------
 4 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix
index dcf2a73..2ce63b9 100644
--- a/modules/greetd/default.nix
+++ b/modules/greetd/default.nix
@@ -79,9 +79,16 @@ in
 
     environment = {
       systemPackages = with pkgs; [
+        (colloid-gtk-theme.override {
+          colorVariants = [ "dark" ];
+          sizeVariants = [ "compact" ];
+          tweaks = [
+            "catppuccin"
+            "rimless"
+          ];
+        })
         (orchis-theme.override {
           tweaks = [
-            "black"
             "compact"
             "macos"
           ];
@@ -89,6 +96,9 @@ in
         })
         catppuccin-cursors.mochaDark
         pantheon.elementary-icon-theme
+        (colloid-icon-theme.override {
+          schemeVariants = [ "catppuccin" ];
+        })
       ];
       etc = {
         "greetd/sway-config" = {
@@ -130,8 +140,8 @@ in
         "xdg/gtk-3.0/settings.ini" = {
           text = generators.toINI { } {
             Settings = {
-              gtk-theme-name = "Orchis-Dark";
-              gtk-icon-theme-name = "elementary";
+              gtk-theme-name = "Colloid-Dark-Compact-Catppuccin";
+              gtk-icon-theme-name = "Colloid-Catppuccin-Dark";
               gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
               gtk-application-prefer-dark-theme = "true";
             };
@@ -140,12 +150,18 @@ in
         "xdg/gtk-4.0/settings.ini" = {
           text = generators.toINI { } {
             Settings = {
-              gtk-theme-name = "Orchis-Dark";
-              gtk-icon-theme-name = "elementary";
+              gtk-theme-name = "Colloid-Dark-Compact-Catppuccin";
+              gtk-icon-theme-name = "Colloid-Catppuccin-Dark";
               gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
               gtk-application-prefer-dark-theme = "true";
             };
           };
+          "xdg/gtk-4.0/assets".source =
+            "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/assets";
+          "xdg/gtk-4.0/gtk.css".source =
+            "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk.css";
+          "xdg/gtk-4.0/gtk-dark.css".source =
+            "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk-dark.css";
         };
       };
     };
diff --git a/modules/regreet/default.nix b/modules/regreet/default.nix
index af8d959..45b5bd3 100644
--- a/modules/regreet/default.nix
+++ b/modules/regreet/default.nix
@@ -30,19 +30,22 @@ in
       enable = true;
       package = regreetWrapper;
       theme = {
-        name = "Orchis-Dark";
-        package = pkgs.orchis-theme.override {
+        name = "Colloid-Dark-Compact-Catppuccin";
+        package = pkgs.colloid-gtk-theme.override {
+          colorVariants = [ "dark" ];
+          sizeVariants = [ "compact" ];
           tweaks = [
-            "compact"
-            "macos"
+            "catppuccin"
+            "rimless"
           ];
-          border-radius = 5;
         };
       };
 
       iconTheme = {
-        name = "elementary";
-        package = pkgs.pantheon.elementary-icon-theme;
+        name = "Colloid-Catppuccin-Dark";
+        package = pkgs.colloid-icon-theme.override {
+          schemeVariants = [ "catppuccin" ];
+        };
       };
 
       cursorTheme = {
diff --git a/users/erwin/home.nix b/users/erwin/home.nix
index 95e4d55..a309f0d 100644
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@@ -452,19 +452,22 @@ in
       gtk = {
         enable = true;
         theme = {
-          name = "Orchis-Dark";
-          package = pkgs.orchis-theme.override {
+          name = "Colloid-Dark-Compact-Catppuccin";
+          package = pkgs.colloid-gtk-theme.override {
+            colorVariants = [ "dark" ];
+            sizeVariants = [ "compact" ];
             tweaks = [
-              "compact"
-              "macos"
+              "catppuccin"
+              "rimless"
             ];
-            border-radius = 5;
           };
         };
 
         iconTheme = {
-          name = "elementary";
-          package = pkgs.pantheon.elementary-icon-theme;
+          name = "Colloid-Catppuccin-Dark";
+          package = pkgs.colloid-icon-theme.override {
+            schemeVariants = [ "catppuccin" ];
+          };
         };
 
         gtk3 = {
diff --git a/users/erwin/work.nix b/users/erwin/work.nix
index bde0755..1c7380f 100644
--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@@ -447,19 +447,22 @@ in
       gtk = {
         enable = true;
         theme = {
-          name = "Orchis-Dark";
-          package = pkgs.orchis-theme.override {
+          name = "Colloid-Dark-Compact-Catppuccin";
+          package = pkgs.colloid-gtk-theme.override {
+            colorVariants = [ "dark" ];
+            sizeVariants = [ "compact" ];
             tweaks = [
-              "compact"
-              "macos"
+              "catppuccin"
+              "rimless"
             ];
-            border-radius = 5;
           };
         };
 
         iconTheme = {
-          name = "elementary";
-          package = pkgs.pantheon.elementary-icon-theme;
+          name = "Colloid-Catppuccin-Dark";
+          package = pkgs.colloid-icon-theme.override {
+            schemeVariants = [ "catppuccin" ];
+          };
         };
 
         gtk3 = {