migration: overarching home desktop toggle

4 files changed, 10 insertions, 7 deletions

diff --git a/modules/home/suites/desktop/default.nix b/modules/home/suites/desktop/default.nix
index 077843a..530a63a 100644
--- a/modules/home/suites/desktop/default.nix
+++ b/modules/home/suites/desktop/default.nix
@@ -2,12 +2,13 @@
 
 with lib; with lib.${namespace}; let
   cfg = config.${namespace}.suites.desktop;
+  desktop = config.${namespace}.desktop;
 in {
   options.${namespace}.suites.desktop = with types; {
     enable = mkEnableOption "desktop";
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf (cfg.enable && desktop.enable) {
     cxl = {
       apps = {
         kitty.enable = true;
diff --git a/modules/home/suites/dev/default.nix b/modules/home/suites/dev/default.nix
index eb1fef9..e1e375b 100644
--- a/modules/home/suites/dev/default.nix
+++ b/modules/home/suites/dev/default.nix
@@ -3,7 +3,7 @@
 with lib; with lib.${namespace}; let
   cfg = config.${namespace}.suites.dev;
   impermanence = config.${namespace}.impermanence;
-  desktop = config.${namespace}.suites.desktop;
+  desktop = config.${namespace}.desktop;
 in {
   options.${namespace}.suites.dev = with types; {
     enable = mkEnableOption "dev";
@@ -17,9 +17,9 @@ in {
     };
 
     cxl = {
-      apps = {
-        vscode.enable = desktop.enable;
-        intellij.enable = desktop.enable;
+      apps = mkIf desktop.enable {
+        vscode.enable = true;
+        intellij.enable = true;
       };
 
       tools = {
diff --git a/modules/home/suites/gaming/default.nix b/modules/home/suites/gaming/default.nix
index f72af27..13e98ec 100644
--- a/modules/home/suites/gaming/default.nix
+++ b/modules/home/suites/gaming/default.nix
@@ -2,12 +2,13 @@
 
 with lib; with lib.${namespace}; let
   cfg = config.${namespace}.suites.gaming;
+  desktop = config.${namespace}.desktop;
 in {
   options.${namespace}.suites.gaming = with types; {
     enable = mkEnableOption "gaming";
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf (cfg.enable && desktop.enable) {
     cxl = {
       apps = {
         steam.enable = true;
diff --git a/modules/home/suites/media/default.nix b/modules/home/suites/media/default.nix
index b99d064..2f44f20 100644
--- a/modules/home/suites/media/default.nix
+++ b/modules/home/suites/media/default.nix
@@ -2,6 +2,7 @@
 
 with lib; with lib.${namespace}; let
   cfg = config.${namespace}.suites.media;
+  desktop = config.${namespace}.desktop;
 in {
   options.${namespace}.suites.media = with types; {
     enable = mkEnableOption "media";
@@ -9,7 +10,7 @@ in {
 
   config = mkIf cfg.enable {
     cxl = {
-      apps = {
+      apps = mkIf desktop.enable {
         feh.enable = true;
         mpv.enable = true;