simplify extra services for arr modules (#130)

* simplify extra services for arr modules

* add wait for api to jellyfin setupwizardservice

* increase timeout for jellyfin startup

Author: kiriwalawren

modules/arr-common/mkArrServiceModule.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-serviceName: extraConfigOptions:
+serviceName:
 with lib;
 let
   secrets = import ../../lib/secrets { inherit lib; };
@@ -177,7 +177,6 @@ in
             description = "API key for ${capitalizedName}.";
           };
         }
-        // extraConfigOptions
         // {
           hostConfig = hostConfig.options;
         }

modules/jellyfin/default.nix

@@ -151,7 +151,7 @@ in
         Group = cfg.group;
         WorkingDirectory = cfg.dataDir;
         Restart = "on-failure";
-        TimeoutStartSec = 120;
+        TimeoutStartSec = 300;
         TimeoutStopSec = 15;
         SuccessExitStatus = "0 143";
 

modules/jellyfin/setupWizardService.nix

@@ -45,6 +45,19 @@ in
 
         BASE_URL="${baseUrl}"
 
+        echo "Waiting for Jellyfin API to be available..."
+        for attempt in {1..90}; do
+          if ${pkgs.curl}/bin/curl -sf "$BASE_URL/System/Info/Public" >/dev/null 2>&1; then
+            echo "Jellyfin API is available"
+            break
+          fi
+          if [[ $attempt -eq 90 ]]; then
+            echo "Jellyfin API did not become available after 90 attempts" >&2
+            exit 1
+          fi
+          sleep 2
+        done
+
         echo "Checking if first admin user needs to be created..."
 
         # Check if startup wizard is already completed via API

modules/lidarr.nix

@@ -10,7 +10,7 @@ let
 in
 {
   imports = [
-    (import ./arr-common/mkArrServiceModule.nix { inherit config lib pkgs; } "lidarr" { })
+    (import ./arr-common/mkArrServiceModule.nix { inherit config lib pkgs; } "lidarr")
   ];
 
   config.nixflix.lidarr = {