From 9b1a57a16fe1abba28c30895d9762b3ecba08650 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Fri, 26 Apr 2024 21:49:10 -0400
Subject: [PATCH] home: move theme module outside of hyprland config

---
 homeManagerModules/desktop/default.nix          | 2 +-
 homeManagerModules/desktop/hypr/default.nix     | 4 ++--
 homeManagerModules/desktop/river/default.nix    | 1 +
 homeManagerModules/desktop/sway/default.nix     | 1 +
 homeManagerModules/desktop/{hypr => }/theme.nix | 6 +++---
 5 files changed, 8 insertions(+), 6 deletions(-)
 rename homeManagerModules/desktop/{hypr => }/theme.nix (89%)

diff --git a/homeManagerModules/desktop/default.nix b/homeManagerModules/desktop/default.nix
index 7e61dbaa..64a5a5e0 100644
--- a/homeManagerModules/desktop/default.nix
+++ b/homeManagerModules/desktop/default.nix
@@ -4,5 +4,5 @@
   pkgs,
   ...
 }: {
-  imports = [./gnome ./hypr ./sway ./river];
+  imports = [./theme.nix ./gnome ./hypr ./sway ./river];
 }
diff --git a/homeManagerModules/desktop/hypr/default.nix b/homeManagerModules/desktop/hypr/default.nix
index 1d60bed0..7d34301e 100644
--- a/homeManagerModules/desktop/hypr/default.nix
+++ b/homeManagerModules/desktop/hypr/default.nix
@@ -6,7 +6,7 @@
   hyprland,
   ...
 }: {
-  imports = [./hypridle ./hyprlock ./hyprpaper ./hyprshade ./theme.nix];
+  imports = [./hypridle ./hyprlock ./hyprpaper ./hyprshade];
 
   options = {
     alyraffauf.desktop.hyprland.enable =
@@ -25,7 +25,7 @@
     alyraffauf.desktop.hyprland.hyprpaper.enable = lib.mkDefault true;
     alyraffauf.desktop.hyprland.hyprshade.enable = lib.mkDefault true;
 
-    alyraffauf.desktop.hyprland.theme.enable = lib.mkDefault true;
+    alyraffauf.desktop.theme.enable = lib.mkDefault true;
 
     # Basic apps needed to run a hyprland desktop.
     alyraffauf.apps.waybar.enable = lib.mkDefault true;
diff --git a/homeManagerModules/desktop/river/default.nix b/homeManagerModules/desktop/river/default.nix
index 82492c77..b8394f8b 100644
--- a/homeManagerModules/desktop/river/default.nix
+++ b/homeManagerModules/desktop/river/default.nix
@@ -23,6 +23,7 @@
         kanshi.enable = lib.mkDefault true;
       };
       desktop.river.randomWallpaper = lib.mkDefault true;
+      desktop.theme.enable = lib.mkDefault true;
     };
 
     programs.swaylock.enable = lib.mkDefault true;
diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix
index 77d0dd12..e9fd3d4c 100644
--- a/homeManagerModules/desktop/sway/default.nix
+++ b/homeManagerModules/desktop/sway/default.nix
@@ -26,6 +26,7 @@
         firefox.enable = lib.mkDefault true;
         kanshi.enable = lib.mkDefault true;
       };
+      desktop.theme.enable = lib.mkDefault true;
     };
     # Packages that should be installed to the user profile.
     home.packages = with pkgs; [
diff --git a/homeManagerModules/desktop/hypr/theme.nix b/homeManagerModules/desktop/theme.nix
similarity index 89%
rename from homeManagerModules/desktop/hypr/theme.nix
rename to homeManagerModules/desktop/theme.nix
index 09100638..d9fae0ae 100644
--- a/homeManagerModules/desktop/hypr/theme.nix
+++ b/homeManagerModules/desktop/theme.nix
@@ -5,11 +5,11 @@
   ...
 }: {
   options = {
-    alyraffauf.desktop.hyprland.theme.enable =
-      lib.mkEnableOption "Hyprland GTK and Qt themes.";
+    alyraffauf.desktop.theme.enable =
+      lib.mkEnableOption "GTK and Qt themes.";
   };
 
-  config = lib.mkIf config.alyraffauf.desktop.hyprland.theme.enable {
+  config = lib.mkIf config.alyraffauf.desktop.theme.enable {
     home.pointerCursor = {
       gtk.enable = true;
       x11.enable = true;