From 7791ad09073529a8b01e534928fc0c61da139d53 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 31 Mar 2025 11:00:10 +0000
Subject: [PATCH] nixos: services: servarr: fix 'enableAll' logic

I renamed the option and refactored how it worked to make it more
explicit that it enables the entire suite by default, with explicit
opt-out of individual components (or fine-grained opt-in as an
alternative).
---
 hosts/nixos/porthos/services.nix           |  2 +-
 modules/nixos/services/servarr/default.nix | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/hosts/nixos/porthos/services.nix b/hosts/nixos/porthos/services.nix
index ffd150a..021a6ae 100644
--- a/hosts/nixos/porthos/services.nix
+++ b/hosts/nixos/porthos/services.nix
@@ -144,7 +144,7 @@ in
     sabnzbd.enable = true;
     # The whole *arr software suite
     servarr = {
-      enable = true;
+      enableAll = true;
       # ... But not Lidarr because I don't care for music that much
       lidarr = {
         enable = false;
diff --git a/modules/nixos/services/servarr/default.nix b/modules/nixos/services/servarr/default.nix
index e25d9cf..65c409a 100644
--- a/modules/nixos/services/servarr/default.nix
+++ b/modules/nixos/services/servarr/default.nix
@@ -19,6 +19,8 @@ let
       enable = true;
       group = "media";
     };
+    # Set-up media group
+    users.groups.media = { };
   };
 
   mkRedirection = service: {
@@ -54,34 +56,30 @@ let
 in
 {
   options.my.services.servarr = {
-    enable = lib.mkEnableOption "Media automation";
+    enableAll = lib.mkEnableOption "media automation suite";
 
     bazarr = {
-      enable = lib.my.mkDisableOption "Bazarr";
+      enable = lib.mkEnableOption "Bazarr" // { default = cfg.enableAll; };;
     };
 
     lidarr = {
-      enable = lib.my.mkDisableOption "Lidarr";
+      enable = lib.mkEnableOption "Lidarr" // { default = cfg.enableAll; };
     };
 
     radarr = {
-      enable = lib.my.mkDisableOption "Radarr";
+      enable = lib.mkEnableOption "Radarr" // { default = cfg.enableAll; };
     };
 
     readarr = {
-      enable = lib.my.mkDisableOption "Readarr";
+      enable = lib.mkEnableOption "Readarr" // { default = cfg.enableAll; };
     };
 
     sonarr = {
-      enable = lib.my.mkDisableOption "Sonarr";
+      enable = lib.mkEnableOption "Sonarr" // { default = cfg.enableAll; };
     };
   };
 
-  config = lib.mkIf cfg.enable (lib.mkMerge [
-    {
-      # Set-up media group
-      users.groups.media = { };
-    }
+  config = (lib.mkMerge [
     # Bazarr does not log authentication failures...
     (mkFullConfig "bazarr")
     # Lidarr for music