From 880738787fbc10652b169c999facb1cdb2fbf8d4 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Wed, 13 Dec 2023 11:13:52 +0800
Subject: [PATCH] users/foo-dogsquared/setups: reinit certain modules into
 `setups`

---
 users/home-manager/foo-dogsquared/default.nix               | 6 ++++--
 users/home-manager/foo-dogsquared/modules/default.nix       | 4 ++--
 .../foo-dogsquared/modules/{services => setups}/desktop.nix | 4 ++--
 .../modules/{music-setup.nix => setups/music.nix}           | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)
 rename users/home-manager/foo-dogsquared/modules/{services => setups}/desktop.nix (88%)
 rename users/home-manager/foo-dogsquared/modules/{music-setup.nix => setups/music.nix} (97%)

diff --git a/users/home-manager/foo-dogsquared/default.nix b/users/home-manager/foo-dogsquared/default.nix
index 2389bf6d..e23295fc 100644
--- a/users/home-manager/foo-dogsquared/default.nix
+++ b/users/home-manager/foo-dogsquared/default.nix
@@ -5,7 +5,6 @@
 
   # All of the home-manager-user-specific setup are here.
   users.foo-dogsquared = {
-    music.enable = true;
     dotfiles.enable = false;
 
     programs = {
@@ -22,7 +21,10 @@
       terminal-multiplexer.enable = true;
     };
 
-    services.desktop.enable = true;
+    setups = {
+      desktop.enable = true;
+      music.enable = true;
+    };
   };
 
   # The keyfile required to decrypt the secrets.
diff --git a/users/home-manager/foo-dogsquared/modules/default.nix b/users/home-manager/foo-dogsquared/modules/default.nix
index 537c80c9..5c0eff26 100644
--- a/users/home-manager/foo-dogsquared/modules/default.nix
+++ b/users/home-manager/foo-dogsquared/modules/default.nix
@@ -1,7 +1,6 @@
 # Only optional modules should be imported here.
 {
   imports = [
-    ./music-setup.nix
     ./dotfiles.nix
 
     ./programs/browsers.nix
@@ -12,6 +11,7 @@
     ./programs/shell.nix
     ./programs/terminal-multiplexer.nix
 
-    ./services/desktop.nix
+    ./setups/desktop.nix
+    ./setups/music.nix
   ];
 }
diff --git a/users/home-manager/foo-dogsquared/modules/services/desktop.nix b/users/home-manager/foo-dogsquared/modules/setups/desktop.nix
similarity index 88%
rename from users/home-manager/foo-dogsquared/modules/services/desktop.nix
rename to users/home-manager/foo-dogsquared/modules/setups/desktop.nix
index ecf6a2bd..69f4f776 100644
--- a/users/home-manager/foo-dogsquared/modules/services/desktop.nix
+++ b/users/home-manager/foo-dogsquared/modules/setups/desktop.nix
@@ -3,10 +3,10 @@
 
 let
   userCfg = config.users.foo-dogsquared;
-  cfg = userCfg.services.desktop;
+  cfg = userCfg.setups.desktop;
 in
 {
-  options.users.foo-dogsquared.services.desktop.enable = lib.mkEnableOption "a set of usual desktop productivity services";
+  options.users.foo-dogsquared.setups.desktop.enable = lib.mkEnableOption "a set of usual desktop productivity services";
 
   config = lib.mkIf cfg.enable {
     # Self-inflicted telemetry.
diff --git a/users/home-manager/foo-dogsquared/modules/music-setup.nix b/users/home-manager/foo-dogsquared/modules/setups/music.nix
similarity index 97%
rename from users/home-manager/foo-dogsquared/modules/music-setup.nix
rename to users/home-manager/foo-dogsquared/modules/setups/music.nix
index fe6053ec..5e7bebe1 100644
--- a/users/home-manager/foo-dogsquared/modules/music-setup.nix
+++ b/users/home-manager/foo-dogsquared/modules/setups/music.nix
@@ -2,7 +2,7 @@
 
 let
   userCfg = config.users.foo-dogsquared;
-  cfg = userCfg.music;
+  cfg = userCfg.setups.music;
 
   ytdlpAudio = pkgs.writeScriptBin "yt-dlp-audio" ''
     ${pkgs.yt-dlp}/bin/yt-dlp --config-location "${../../config/yt-dlp-audio.conf}" $@
@@ -12,7 +12,7 @@ let
   playlistsDir = "${musicDir}/playlists";
 in
 {
-  options.users.foo-dogsquared.music = {
+  options.users.foo-dogsquared.setups.music = {
     enable = lib.mkEnableOption "foo-dogsquared's music setup";
     mpd.enable = lib.mkEnableOption "foo-dogsquared's MPD server setup";
   };