From f22f1fabe08319ff59aface0a953556a213a73cf Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Tue, 2 Apr 2024 17:58:49 +0200
Subject: [PATCH] Make theming a part of the DE config

---
 modules/home/de/default.nix | 36 +++++++++++++++++++++++++++++
 modules/home/default.nix    |  1 -
 modules/home/theming.nix    | 45 -------------------------------------
 users/seb/home.nix          |  2 +-
 4 files changed, 37 insertions(+), 47 deletions(-)
 delete mode 100644 modules/home/theming.nix

diff --git a/modules/home/de/default.nix b/modules/home/de/default.nix
index de8fee3..32f07d0 100644
--- a/modules/home/de/default.nix
+++ b/modules/home/de/default.nix
@@ -13,6 +13,7 @@ in {
         wallpaper = lib.mkOption {
             type = lib.types.path;
         };
+        theming.enable = lib.mkEnableOption "";
         tray = {
             syncthing.enable = lib.mkEnableOption "";
             networkmanager.enable = lib.mkEnableOption "";
@@ -20,6 +21,41 @@ in {
     };
 
     config = lib.mkMerge [
+        (lib.mkIf config.myConfig.theming.enable {
+            dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
+
+            gtk = {
+                enable = true;
+
+                gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+
+                theme.name = "Adwaita-dark";
+                theme.package = pkgs.gnome.gnome-themes-extra;
+
+                iconTheme.name = "Adwaita";
+                iconTheme.package = pkgs.gnome.adwaita-icon-theme;
+
+                font.name = "Open Sans";
+                font.package = pkgs.open-sans;
+            };
+
+            qt = {
+                enable = true;
+                platformTheme = "gnome";
+                style.name = "adwaita-dark";
+                style.package = pkgs.adwaita-qt;
+            };
+
+            home.pointerCursor = {
+                name = "Bibata-Original-Classic";
+                package = pkgs.bibata-cursors;
+                size = 24;
+                x11.enable = true;
+                x11.defaultCursor = "X_cursor";
+                gtk.enable = true;
+            };
+        })
+
         (lib.mkIf cfg.tray.syncthing.enable {
             assertions = [
                 {
diff --git a/modules/home/default.nix b/modules/home/default.nix
index a70915c..20d2468 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -3,7 +3,6 @@
         ./de
         ./vscode.nix
         ./shell.nix
-        ./theming.nix
         ./ssh-client.nix
         ./git.nix
         ./neovim.nix
diff --git a/modules/home/theming.nix b/modules/home/theming.nix
deleted file mode 100644
index a110407..0000000
--- a/modules/home/theming.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    config,
-    pkgs,
-    lib,
-    ...
-}: {
-    options.myConfig.theming.enable = lib.mkEnableOption "";
-
-    config = lib.mkIf config.myConfig.theming.enable {
-        dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
-
-        gtk = {
-            enable = true;
-
-            gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
-
-            theme.name = "Adwaita-dark";
-            theme.package = pkgs.gnome.gnome-themes-extra;
-
-            iconTheme.name = "Adwaita";
-            iconTheme.package = pkgs.gnome.adwaita-icon-theme;
-
-            font.name = "Open Sans";
-            font.package = pkgs.open-sans;
-        };
-
-        qt = {
-            enable = true;
-            platformTheme = "gnome";
-            style.name = "adwaita-dark";
-            style.package = pkgs.adwaita-qt;
-        };
-
-        home.pointerCursor = {
-            name = "Bibata-Original-Classic";
-            package = pkgs.bibata-cursors;
-            size = 24;
-            x11.enable = true;
-            x11.defaultCursor = "X_cursor";
-            gtk.enable = true;
-        };
-
-        fonts.fontconfig.enable = true;
-    };
-}
diff --git a/users/seb/home.nix b/users/seb/home.nix
index a5b3114..35b012f 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -3,6 +3,7 @@
         de = {
             qtile.enable = true;
             wallpaper = ./wallpaper;
+            theming.enable = true;
             tray.syncthing.enable = true;
         };
         vscode.enable = true;
@@ -13,7 +14,6 @@
             improvedCommands.enable = true;
             direnv.enable = true;
         };
-        theming.enable = true;
         ssh-client.enable = true;
         git.enable = true;
         neovim.enable = true;