From bea4950ceaa74eba30a5648be9a1917fd2644071 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@horus.nu>
Date: Sat, 8 Jun 2024 16:02:42 +0200
Subject: [PATCH] gtk/regreet: switch to Orchis theme

---
 modules/greetd/default.nix  | 18 +++++++++++++-----
 modules/regreet/default.nix | 21 +++++++++++++++++----
 users/erwin/home.nix        | 10 +++++-----
 users/erwin/work.nix        | 10 +++++-----
 4 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix
index fe8fa13..dcf2a73 100644
--- a/modules/greetd/default.nix
+++ b/modules/greetd/default.nix
@@ -79,7 +79,15 @@ in
 
     environment = {
       systemPackages = with pkgs; [
-        pantheon.elementary-gtk-theme
+        (orchis-theme.override {
+          tweaks = [
+            "black"
+            "compact"
+            "macos"
+          ];
+          border-radius = 5;
+        })
+        catppuccin-cursors.mochaDark
         pantheon.elementary-icon-theme
       ];
       etc = {
@@ -122,9 +130,9 @@ in
         "xdg/gtk-3.0/settings.ini" = {
           text = generators.toINI { } {
             Settings = {
-              gtk-theme-name = "elementary";
+              gtk-theme-name = "Orchis-Dark";
               gtk-icon-theme-name = "elementary";
-              gtk-cursor-theme-name = "elementary";
+              gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
               gtk-application-prefer-dark-theme = "true";
             };
           };
@@ -132,9 +140,9 @@ in
         "xdg/gtk-4.0/settings.ini" = {
           text = generators.toINI { } {
             Settings = {
-              gtk-theme-name = "elementary";
+              gtk-theme-name = "Orchis-Dark";
               gtk-icon-theme-name = "elementary";
-              gtk-cursor-theme-name = "elementary";
+              gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
               gtk-application-prefer-dark-theme = "true";
             };
           };
diff --git a/modules/regreet/default.nix b/modules/regreet/default.nix
index 126327f..b5750e7 100644
--- a/modules/regreet/default.nix
+++ b/modules/regreet/default.nix
@@ -37,10 +37,10 @@ in
 
         GTK = {
           application_prefer_dark_theme = true;
-          theme_name = "elementary";
-          cursor_theme = "elementary";
+          theme_name = "Orchis-Dark";
+          cursor_theme = "Catppuccin-Mocha-Dark-Cursors";
           icon_theme_name = "elementary";
-          font_name = "Iosevka Aile 16";
+          font_name = "Monaspace Neon 16";
         };
 
         commands = {
@@ -54,6 +54,11 @@ in
           ];
         };
       };
+      cageArgs = [
+        "-s"
+        "-m"
+        "last"
+      ];
     };
     security.pam.services.greetd.u2fAuth = false;
 
@@ -63,7 +68,15 @@ in
 
     environment = {
       systemPackages = with pkgs; [
-        pantheon.elementary-gtk-theme
+        (orchis-theme.override {
+          tweaks = [
+            "black"
+            "compact"
+            "macos"
+          ];
+          border-radius = 5;
+        })
+        catppuccin-cursors.mochaDark
         pantheon.elementary-icon-theme
       ];
     };
diff --git a/users/erwin/home.nix b/users/erwin/home.nix
index 055b816..83b1c1e 100644
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@@ -333,14 +333,14 @@ in
       gtk = {
         enable = true;
         theme = {
-          name = "Catppuccin-Mocha-Compact-Blue-Dark";
-          package = pkgs.catppuccin-gtk.override {
-            size = "compact";
+          name = "Orchis-Dark";
+          package = pkgs.orchis-theme.override {
             tweaks = [
-              "rimless"
               "black"
+              "compact"
+              "macos"
             ];
-            variant = "mocha";
+            border-radius = 5;
           };
         };
 
diff --git a/users/erwin/work.nix b/users/erwin/work.nix
index 0b19795..77a2943 100644
--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@@ -358,14 +358,14 @@ in
       gtk = {
         enable = true;
         theme = {
-          name = "Catppuccin-Mocha-Compact-Dark";
-          package = pkgs.catppuccin-gtk.override {
-            size = "compact";
+          name = "Orchis-Dark";
+          package = pkgs.orchis-theme.override {
             tweaks = [
-              "rimless"
               "black"
+              "compact"
+              "macos"
             ];
-            variant = "mocha";
+            border-radius = 5;
           };
         };