Get rid of fediversity.enable

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;

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";
   };
 }

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

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 = {

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

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 = {