From a5d226ed224d0a08520a10935db6f25d046d1129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?=
 <nicolas.jeannerod@moduscreate.com>
Date: Fri, 14 Feb 2025 20:08:01 +0100
Subject: [PATCH] Get rid of `fediversity.enable`

---
 deployment/flake-part.nix                 | 3 ---
 services/fediversity/default.nix          | 9 +--------
 services/fediversity/garage/default.nix   | 2 +-
 services/fediversity/mastodon/default.nix | 2 +-
 services/fediversity/peertube/default.nix | 2 +-
 services/fediversity/pixelfed/default.nix | 2 +-
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/deployment/flake-part.nix b/deployment/flake-part.nix
index c903f8a1..0eeba75b 100644
--- a/deployment/flake-part.nix
+++ b/deployment/flake-part.nix
@@ -80,7 +80,6 @@ in
           { pkgs, ... }:
           {
             fediversity = {
-              enable = true;
               domain = "fedi101.abundos.eu";
               pixelfed = {
                 enable = true;
@@ -97,7 +96,6 @@ in
           { pkgs, ... }:
           {
             fediversity = {
-              enable = true;
               domain = "fedi102.abundos.eu";
               mastodon = {
                 enable = true;
@@ -116,7 +114,6 @@ in
           { pkgs, ... }:
           {
             fediversity = {
-              enable = true;
               domain = "fedi103.abundos.eu";
               peertube = {
                 enable = true;
diff --git a/services/fediversity/default.nix b/services/fediversity/default.nix
index 5147c8f9..d935499a 100644
--- a/services/fediversity/default.nix
+++ b/services/fediversity/default.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 
 let
-  inherit (lib) mkOption mkEnableOption mkForce;
+  inherit (lib) mkOption;
   inherit (lib.types) types;
 
 in
@@ -15,8 +15,6 @@ in
 
   options = {
     fediversity = {
-      enable = mkEnableOption "the collection of services bundled under Fediversity";
-
       domain = mkOption {
         type = types.str;
         description = ''
@@ -50,10 +48,5 @@ in
       defaults.email = "nicolas.jeannerod+fediversity@moduscreate.com";
       # defaults.server = "https://acme-staging-v02.api.letsencrypt.org/directory";
     };
-
-    ## NOTE: For a one-machine deployment, this removes the need to provide an
-    ## `s3.garage.<domain>` domain. However, this will quickly stop working once
-    ## we go to multi-machines deployment.
-    fediversity.garage.api.domain = mkForce "s3.garage.localhost";
   };
 }
diff --git a/services/fediversity/garage/default.nix b/services/fediversity/garage/default.nix
index 6915cb50..e3a6012d 100644
--- a/services/fediversity/garage/default.nix
+++ b/services/fediversity/garage/default.nix
@@ -99,7 +99,7 @@ in
 {
   imports = [ ./options.nix ];
 
-  config = lib.mkIf config.fediversity.enable {
+  config = {
     environment.systemPackages = [
       pkgs.minio-client
       pkgs.awscli
diff --git a/services/fediversity/mastodon/default.nix b/services/fediversity/mastodon/default.nix
index 63e536d9..4fe5ef30 100644
--- a/services/fediversity/mastodon/default.nix
+++ b/services/fediversity/mastodon/default.nix
@@ -13,7 +13,7 @@ in
 {
   imports = [ ./options.nix ];
 
-  config = lib.mkIf (config.fediversity.enable && config.fediversity.mastodon.enable) {
+  config = lib.mkIf config.fediversity.mastodon.enable {
     #### garage setup
     fediversity.garage = {
       ensureBuckets = {
diff --git a/services/fediversity/peertube/default.nix b/services/fediversity/peertube/default.nix
index 3c18486e..cb469691 100644
--- a/services/fediversity/peertube/default.nix
+++ b/services/fediversity/peertube/default.nix
@@ -7,7 +7,7 @@ in
 {
   imports = [ ./options.nix ];
 
-  config = mkIf (config.fediversity.enable && config.fediversity.peertube.enable) {
+  config = mkIf config.fediversity.peertube.enable {
     networking.firewall.allowedTCPPorts = [
       80
       443
diff --git a/services/fediversity/pixelfed/default.nix b/services/fediversity/pixelfed/default.nix
index b845d92a..3198929d 100644
--- a/services/fediversity/pixelfed/default.nix
+++ b/services/fediversity/pixelfed/default.nix
@@ -12,7 +12,7 @@ in
 {
   imports = [ ./options.nix ];
 
-  config = mkIf (config.fediversity.enable && config.fediversity.pixelfed.enable) {
+  config = mkIf config.fediversity.pixelfed.enable {
     fediversity.garage = {
       ensureBuckets = {
         pixelfed = {