From 874cbcec703a08d13b507bab4ca5d8d3c8242eb2 Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Fri, 21 Jun 2024 11:41:29 +0200
Subject: [PATCH] Group app programs options

---
 home/packages/gui/nomacs.nix                     |  2 +-
 home/packages/gui/stremio.nix                    |  2 +-
 home/programs/graphical/apps/spotify/default.nix |  2 +-
 home/programs/graphical/apps/vesktop/default.nix |  2 +-
 hosts/herugrim/default.nix                       |  5 +++--
 hosts/voyager/default.nix                        | 14 ++++++++------
 options/home/programs/default.nix                | 14 ++++++++------
 7 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/home/packages/gui/nomacs.nix b/home/packages/gui/nomacs.nix
index 9a170bb..33d003c 100644
--- a/home/packages/gui/nomacs.nix
+++ b/home/packages/gui/nomacs.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
 
-  cfg = osConfig.myOptions.home-manager.programs.nomacs;
+  cfg = osConfig.myOptions.home-manager.programs.applications.nomacs;
 in {
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/home/packages/gui/stremio.nix b/home/packages/gui/stremio.nix
index 1ad2144..4147642 100644
--- a/home/packages/gui/stremio.nix
+++ b/home/packages/gui/stremio.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
 
-  cfg = osConfig.myOptions.home-manager.programs.stremio;
+  cfg = osConfig.myOptions.home-manager.programs.applications.stremio;
 in {
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/home/programs/graphical/apps/spotify/default.nix b/home/programs/graphical/apps/spotify/default.nix
index 435e586..3f6620f 100644
--- a/home/programs/graphical/apps/spotify/default.nix
+++ b/home/programs/graphical/apps/spotify/default.nix
@@ -7,7 +7,7 @@
 }: let
   inherit (lib) mkIf;
 
-  cfg = osConfig.myOptions.home-manager.programs.spotify;
+  cfg = osConfig.myOptions.home-manager.programs.applications.spotify;
   spicePkgs = inputs.spicetify.packages.${pkgs.system}.default;
 in {
   imports = [inputs.spicetify.homeManagerModule];
diff --git a/home/programs/graphical/apps/vesktop/default.nix b/home/programs/graphical/apps/vesktop/default.nix
index 8ef56eb..87f563e 100644
--- a/home/programs/graphical/apps/vesktop/default.nix
+++ b/home/programs/graphical/apps/vesktop/default.nix
@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
 
-  cfg = osConfig.myOptions.home-manager.programs.vesktop;
+  cfg = osConfig.myOptions.home-manager.programs.applications.vesktop;
 in {
   config = mkIf cfg.enable {
     home.packages = with pkgs; [ vesktop ];
diff --git a/hosts/herugrim/default.nix b/hosts/herugrim/default.nix
index be8acf2..5872cd2 100644
--- a/hosts/herugrim/default.nix
+++ b/hosts/herugrim/default.nix
@@ -101,8 +101,9 @@
           mullvad-browser.enable = true;
           schizofox.enable = true;
         };
-
-        spotify.enable = true;
+        applications = {
+          spotify.enable = true;
+        };
       };
     };
   };
diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix
index f5a792d..1052e46 100644
--- a/hosts/voyager/default.nix
+++ b/hosts/voyager/default.nix
@@ -166,13 +166,15 @@
           fastfetch.enable = true;
           hyfetch.enable = true;
         };
-        spotify.enable = true;
-        stremio.enable = true;
-        vesktop = {
-          enable = true;
-          autoStart = true;
+        applications = {
+          spotify.enable = true;
+          stremio.enable = true;
+          vesktop = {
+            enable = true;
+            autoStart = true;
+          };
+          nomacs.enable = true;
         };
-        nomacs.enable = true;
       };
     };
   };
diff --git a/options/home/programs/default.nix b/options/home/programs/default.nix
index f739c33..4a91423 100644
--- a/options/home/programs/default.nix
+++ b/options/home/programs/default.nix
@@ -26,13 +26,15 @@ in
       schizofox.enable = mkEnableOption "Schizophrenic version of Firefox browser";
     };
 
-    spotify.enable = mkEnableOption "Spotify";
-    stremio.enable = mkEnableOption "Stremio free media center";
-    vesktop = {
-      enable = mkEnableOption "Vesktop (An alternate client for Discord with Vencord built-in)";
-      autoStart = mkEnableOption "Auto-Start for Vesktop";
+    applications = {
+      spotify.enable = mkEnableOption "Spotify";
+      stremio.enable = mkEnableOption "Stremio free media center";
+      vesktop = {
+        enable = mkEnableOption "Vesktop (An alternate client for Discord with Vencord built-in)";
+        autoStart = mkEnableOption "Auto-Start for Vesktop";
+      };
+      nomacs.enable = mkEnableOption "Nomacs (Qt-based image viewer)";
     };
-    nomacs.enable = mkEnableOption "Nomacs (Qt-based image viewer)";
 
     tools = {
       fastfetch.enable = mkEnableOption "FastFetch (fast neofetch)";