Modules: Fix autostarting services

modules/services/airsonic.nix

@@ -32,7 +32,8 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
       aux.system.users.media.enable = true;
       users.users.airsonic.extraGroups = [ "media" ];
 
@@ -61,8 +62,11 @@ in
         } // lib.optionalAttrs (cfg.home != "") { home = cfg.home; };
       };
 
-    systemd.services = {
+      systemd.services.nginx.wants = [ config.systemd.services.airsonic.name ];
-      nginx.wants = [ config.systemd.services.airsonic.name ];
+    })
-    } // lib.optionalAttrs (!cfg.autostart) { airsonic.wantedBy = lib.mkForce [ ]; };
+    (lib.mkIf (!cfg.autostart) {
-  };
+      # Disable autostart if needed
+      systemd.services.airsonic.wantedBy = lib.mkForce [ ];
+    })
+  ];
 }

modules/services/duplicacy-web.nix

@@ -28,7 +28,8 @@ rec {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
       nixpkgs.config.allowUnfree = true;
       environment.systemPackages = [ duplicacy-web ];
 
@@ -53,6 +54,13 @@ rec {
         environment = {
           HOME = cfg.environment;
         };
-    } // optionalAttrs cfg.autostart { wantedBy = [ "multi-user.target" ]; }; # Start at boot if autostart is enabled.
       };
+    })
+
+    (lib.mkIf (!cfg.autostart) {
+      # Disable autostart if needed
+      systemd.services.duplicacy-web.wantedBy = lib.mkForce [ ];
+    })
+  ];
+
 }

modules/services/forgejo.nix

@@ -55,7 +55,8 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
       environment.systemPackages = [
         forgejo-cli
         pkgs.podman-tui
@@ -104,9 +105,7 @@ in
         };
       };
 
-    systemd.services = {
+      systemd.services.nginx.wants = [ config.systemd.services.forgejo.name ];
-      nginx.wants = [ config.systemd.services.forgejo.name ];
-    } // lib.optionalAttrs (!cfg.autostart) { forgejo.wantedBy = lib.mkForce [ ]; };
 
       # Enable Podman for running...uh, runners.
       virtualisation = lib.mkIf cfg.actions.enable {
@@ -127,5 +126,10 @@ in
         allowedTCPPorts = [ 53 ];
         allowedUDPPorts = [ 53 ];
       };
-  };
+    })
+    (lib.mkIf (!cfg.autostart) {
+      # Disable autostart if needed
+      systemd.services.forgejo.wantedBy = lib.mkForce [ ];
+    })
+  ];
 }

modules/services/nginx.nix

@@ -17,7 +17,8 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
       services.nginx = {
         enable = true;
 
@@ -37,8 +38,10 @@ in
           443
         ];
       };
-
+    })
+    (lib.mkIf (!cfg.autostart) {
       # Disable autostart if needed
-    systemd.services.nginx.wantedBy = lib.mkIf (!cfg.autostart) [ ];
+      systemd.services.nginx.wantedBy = lib.mkForce [ ];
-  };
+    })
+  ];
 }