From 0679717dc90ea37464dcb1ba533fa21ee4d91431 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Fri, 29 Mar 2024 08:23:23 -0400
Subject: [PATCH] moved desktopConfig apps to homeManagerModules

---
 homeManagerModules/guiApps/default.nix          | 10 ++++++++++
 homeManagerModules/guiApps/firefox/default.nix  |  8 ++------
 homeManagerModules/guiApps/fractal/default.nix  | 11 +++++++++++
 homeManagerModules/guiApps/obsidian/default.nix | 10 ++++++++++
 homeManagerModules/guiApps/tauon/default.nix    |  8 ++++++++
 homeManagerModules/guiApps/webCord/default.nix  |  8 ++++++++
 homeManagerModules/guiApps/zoom/default.nix     |  8 ++++++++
 nixosModules/desktopConfig/default.nix          |  9 ---------
 8 files changed, 57 insertions(+), 15 deletions(-)
 create mode 100644 homeManagerModules/guiApps/fractal/default.nix
 create mode 100644 homeManagerModules/guiApps/obsidian/default.nix
 create mode 100644 homeManagerModules/guiApps/tauon/default.nix
 create mode 100644 homeManagerModules/guiApps/webCord/default.nix
 create mode 100644 homeManagerModules/guiApps/zoom/default.nix

diff --git a/homeManagerModules/guiApps/default.nix b/homeManagerModules/guiApps/default.nix
index 563ef80d..dfef6c44 100644
--- a/homeManagerModules/guiApps/default.nix
+++ b/homeManagerModules/guiApps/default.nix
@@ -5,15 +5,25 @@
     ./alacritty
     ./chromium
     ./firefox
+    ./fractal
     ./fuzzel
     ./librewolf
     ./mako
+    ./obsidian
+    ./tauon
     ./vsCodium
     ./waybar
+    ./webCord
+    ./zoom
   ];
 
   guiApps.firefox.enable = lib.mkDefault true;
   guiApps.alacritty.enable = lib.mkDefault true;
   guiApps.vsCodium.enable = lib.mkDefault true;
   guiApps.chromium.enable = lib.mkDefault true;
+  guiApps.obsidian.enable = lib.mkDefault true;
+  guiApps.tauon.enable = lib.mkDefault true;
+  guiApps.fractal.enable = lib.mkDefault true;
+  guiApps.webCord.enable = lib.mkDefault true;
+  guiApps.zoom.enable = lib.mkDefault true;
 }
diff --git a/homeManagerModules/guiApps/firefox/default.nix b/homeManagerModules/guiApps/firefox/default.nix
index e8effe67..b1ab7810 100644
--- a/homeManagerModules/guiApps/firefox/default.nix
+++ b/homeManagerModules/guiApps/firefox/default.nix
@@ -1,12 +1,8 @@
 { pkgs, lib, config, ... }: {
 
-  options = {
-    guiApps.firefox.enable = lib.mkEnableOption "Enables Firefox.";
-  };
+  options = { guiApps.firefox.enable = lib.mkEnableOption "Enables Firefox."; };
 
   config = lib.mkIf config.guiApps.firefox.enable {
-    programs.firefox = {
-      enable = true;
-    };
+    programs.firefox = { enable = true; };
   };
 }
diff --git a/homeManagerModules/guiApps/fractal/default.nix b/homeManagerModules/guiApps/fractal/default.nix
new file mode 100644
index 00000000..4364bd1b
--- /dev/null
+++ b/homeManagerModules/guiApps/fractal/default.nix
@@ -0,0 +1,11 @@
+{ pkgs, lib, config, ... }: {
+
+  options = {
+    guiApps.fractal.enable =
+      lib.mkEnableOption "Enables Fractal Matrix client.";
+  };
+
+  config = lib.mkIf config.guiApps.fractal.enable {
+    home.packages = with pkgs; [ fractal ];
+  };
+}
diff --git a/homeManagerModules/guiApps/obsidian/default.nix b/homeManagerModules/guiApps/obsidian/default.nix
new file mode 100644
index 00000000..8a609af8
--- /dev/null
+++ b/homeManagerModules/guiApps/obsidian/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, lib, config, ... }: {
+
+  options = {
+    guiApps.obsidian.enable = lib.mkEnableOption "Enables Obsidian.";
+  };
+
+  config = lib.mkIf config.guiApps.obsidian.enable {
+    home.packages = with pkgs; [ obsidian ];
+  };
+}
diff --git a/homeManagerModules/guiApps/tauon/default.nix b/homeManagerModules/guiApps/tauon/default.nix
new file mode 100644
index 00000000..f9270c58
--- /dev/null
+++ b/homeManagerModules/guiApps/tauon/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, lib, config, ... }: {
+
+  options = { guiApps.tauon.enable = lib.mkEnableOption "Enables Tauon."; };
+
+  config = lib.mkIf config.guiApps.tauon.enable {
+    home.packages = with pkgs; [ tauon ];
+  };
+}
diff --git a/homeManagerModules/guiApps/webCord/default.nix b/homeManagerModules/guiApps/webCord/default.nix
new file mode 100644
index 00000000..1a9ed61c
--- /dev/null
+++ b/homeManagerModules/guiApps/webCord/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, lib, config, ... }: {
+
+  options = { guiApps.webCord.enable = lib.mkEnableOption "Enables WebCord."; };
+
+  config = lib.mkIf config.guiApps.webCord.enable {
+    home.packages = with pkgs; [ webcord ];
+  };
+}
diff --git a/homeManagerModules/guiApps/zoom/default.nix b/homeManagerModules/guiApps/zoom/default.nix
new file mode 100644
index 00000000..6cfa6b38
--- /dev/null
+++ b/homeManagerModules/guiApps/zoom/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, lib, config, ... }: {
+
+  options = { guiApps.zoom.enable = lib.mkEnableOption "Enables Zoom."; };
+
+  config = lib.mkIf config.guiApps.zoom.enable {
+    home.packages = with pkgs; [ webcord ];
+  };
+}
diff --git a/nixosModules/desktopConfig/default.nix b/nixosModules/desktopConfig/default.nix
index 7387ed16..a6b0d906 100644
--- a/nixosModules/desktopConfig/default.nix
+++ b/nixosModules/desktopConfig/default.nix
@@ -32,15 +32,6 @@
         })
       ];
 
-    # Enable basic assortment of GUI apps.
-    environment.systemPackages = with pkgs; [
-      fractal
-      obsidian
-      tauon
-      webcord
-      zoom-us
-    ];
-
     desktopConfig.windowManagers.hyprland.enable = lib.mkDefault true;
   };
 }