From cec41c90eb8bbbe71d8797e471b4e9a211a920f8 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Wed, 8 Nov 2023 07:35:03 +0000
Subject: [PATCH] Switch back to tokyo-night-gtk theme

Set gtkgreet to inherit theme settings from gtk.nix for automatic
consistency

Include setting cursor size in gtk.nix
---
 flake.nix                |  5 +++--
 home/hyprland/config.nix |  2 +-
 home/hyprland/gtk.nix    |  6 ++++++
 system/desktop.nix       | 16 +++-------------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9f9a4104..a8340ad2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,7 @@
           ./home/emacs/default.nix
           ./home/hyprland/default.nix
           ./home/nyxt/default.nix
+          ./home/alacritty.nix
           ./home/default.nix
           ./home/foot.nix
           ./home/kdeconnect.nix
@@ -115,9 +116,9 @@
               system = { inherit stateVersion; };
               networking = { inherit hostName; };
               stylix = {
-                image = ./wallpapers/minimalistic/catppuccin_triangle.png;
+                image = ./wallpapers/default.jpg;
                 base16Scheme =
-                  "${pkgs.base16-schemes}/share/themes/primer-dark.yaml";
+                  "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-dark.yaml";
                 polarity = "dark";
                 opacity = {
                   applications = 0.8;
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 40c9585e..1fed95ec 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -2,7 +2,7 @@
 let
   themeName = config.gtk.theme.name;
   cursorName = config.gtk.cursorTheme.name;
-  cursorSize = "24";
+  cursorSize = toString config.gtk.cursorTheme.size;
 in ''
   source = ./extra.conf
   monitor=,preferred,auto,auto
diff --git a/home/hyprland/gtk.nix b/home/hyprland/gtk.nix
index 258f1c46..ea15a3e5 100644
--- a/home/hyprland/gtk.nix
+++ b/home/hyprland/gtk.nix
@@ -1,16 +1,22 @@
 { pkgs, ... }:
 
 {
+  stylix.targets.gtk.enable = false;
   gtk = {
     enable = true;
     cursorTheme = {
       package = pkgs.volantes-cursors;
       name = "volantes_cursors";
+      size = 24;
     };
     iconTheme = {
       package = pkgs.papirus-icon-theme;
       name = "Papirus-Dark";
     };
+    theme = {
+      package = pkgs.tokyo-night-gtk;
+      name = "Tokyonight-Dark-BL";
+    };
   };
   xdg.configFile."gtklock/config.ini".text = let
     powerbar = "${pkgs.gtklock-powerbar-module}/lib/gtklock/powerbar-module.so";
diff --git a/system/desktop.nix b/system/desktop.nix
index 980c73c1..9b4f19b6 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, user, ... }:
 
 {
   imports = [ ./default.nix ];
@@ -46,19 +46,9 @@
       displayManager.lightdm = {
         enable = true;
         greeters.gtk = {
+          inherit (config.home-manager.users.${user}.gtk)
+            cursorTheme iconTheme theme;
           enable = true;
-          cursorTheme = {
-            package = pkgs.volantes-cursors;
-            name = "volantes_cursors";
-          };
-          iconTheme = {
-            package = pkgs.papirus-icon-theme;
-            name = "Papirus-Dark";
-          };
-          theme = {
-            package = pkgs.tokyo-night-gtk;
-            name = "Tokyonight-Dark-BL";
-          };
         };
       };
     };