diff --git a/iso-minimal b/iso-minimal deleted file mode 120000 index 1d53201..0000000 --- a/iso-minimal +++ /dev/null @@ -1 +0,0 @@ -/nix/store/l75qzsqgsaafrgkjchxpvmmdr4k5pjq1-nixos-26.05.20251209.677fbe9-x86_64-linux.iso \ No newline at end of file diff --git a/lib/module/default.nix b/lib/module/default.nix index af29c39..f074a34 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -30,7 +30,8 @@ rec { options ? { }, moduleConfig ? { }, domain ? "services", - config + config, + serviceName ? name }: let cfg = config.${namespace}.${domain}.${name}; @@ -63,6 +64,10 @@ rec { groups.${name} = { }; }; + systemd.services.${serviceName} = { + requires = [ "media-nas-main.mount" ]; + }; + services = { postgresql = lib.mkIf cfg.configureDb { enable = true; diff --git a/modules/nixos/services/ai/default.nix b/modules/nixos/services/ai/default.nix index cc8c88f..6863f7a 100755 --- a/modules/nixos/services/ai/default.nix +++ b/modules/nixos/services/ai/default.nix @@ -12,6 +12,7 @@ let aiConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "open-webui"; # todo multiple? description = "AI Services"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/arrs/default.nix b/modules/nixos/services/arrs/default.nix index d7db916..6b0c8c6 100644 --- a/modules/nixos/services/arrs/default.nix +++ b/modules/nixos/services/arrs/default.nix @@ -11,6 +11,7 @@ let arrsConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "sabnzbd"; description = "*arr Services"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/authentik/default.nix b/modules/nixos/services/authentik/default.nix index a946f3b..5f7993a 100644 --- a/modules/nixos/services/authentik/default.nix +++ b/modules/nixos/services/authentik/default.nix @@ -30,6 +30,7 @@ let authentikRacConfig = lib.${namespace}.mkModule { inherit config; name = "authentikRac"; + serviceName = "podman-authenticRac"; description = "authentik_rac Service"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/calibre/default.nix b/modules/nixos/services/calibre/default.nix index 5b88da3..b626e76 100644 --- a/modules/nixos/services/calibre/default.nix +++ b/modules/nixos/services/calibre/default.nix @@ -12,6 +12,7 @@ let calibreConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "calibre-web"; description = "Calibre Server"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/collabora/default.nix b/modules/nixos/services/collabora/default.nix index 1c66536..1281ab3 100644 --- a/modules/nixos/services/collabora/default.nix +++ b/modules/nixos/services/collabora/default.nix @@ -11,6 +11,7 @@ let collaboraConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "coolwsd"; description = "collabora code server"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/ersatztv/default.nix b/modules/nixos/services/ersatztv/default.nix index 60802a6..70001ad 100644 --- a/modules/nixos/services/ersatztv/default.nix +++ b/modules/nixos/services/ersatztv/default.nix @@ -11,6 +11,7 @@ let ersatztvConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "podman-${name}"; description = "ersatztv"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/free-games-claimer/default.nix b/modules/nixos/services/free-games-claimer/default.nix index 8ccdb9b..6dca3eb 100755 --- a/modules/nixos/services/free-games-claimer/default.nix +++ b/modules/nixos/services/free-games-claimer/default.nix @@ -11,6 +11,7 @@ let fgcConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "podman-${name}"; description = "free-games-claimer"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/immich/default.nix b/modules/nixos/services/immich/default.nix index 982adaf..8bf1532 100755 --- a/modules/nixos/services/immich/default.nix +++ b/modules/nixos/services/immich/default.nix @@ -12,6 +12,7 @@ let immichConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "${name}-server"; description = "immich"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/lubelogger/default.nix b/modules/nixos/services/lubelogger/default.nix index 9b12b8d..acbc273 100644 --- a/modules/nixos/services/lubelogger/default.nix +++ b/modules/nixos/services/lubelogger/default.nix @@ -11,6 +11,7 @@ let lubeloggerConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "podman-${name}"; description = "lubelogger"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/manyfold/default.nix b/modules/nixos/services/manyfold/default.nix index f96c7dc..6963cdc 100755 --- a/modules/nixos/services/manyfold/default.nix +++ b/modules/nixos/services/manyfold/default.nix @@ -11,6 +11,7 @@ let manyfoldConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "podman-${name}"; description = "manyfold"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/matrix/default.nix b/modules/nixos/services/matrix/default.nix index cecd7cf..ba35b35 100644 --- a/modules/nixos/services/matrix/default.nix +++ b/modules/nixos/services/matrix/default.nix @@ -10,6 +10,7 @@ let matrixConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "${name}-synapse"; description = "config"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 121281b..c0b49dc 100644 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -11,6 +11,7 @@ let nextcloudConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "podman-${name}"; description = "nextcloud"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/opencloud/default.nix b/modules/nixos/services/opencloud/default.nix index 2e513b2..932263a 100644 --- a/modules/nixos/services/opencloud/default.nix +++ b/modules/nixos/services/opencloud/default.nix @@ -11,6 +11,7 @@ let opencloudConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "podman-${name}"; description = "opencloud"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/orca/default.nix b/modules/nixos/services/orca/default.nix index dadb98e..e99ede1 100644 --- a/modules/nixos/services/orca/default.nix +++ b/modules/nixos/services/orca/default.nix @@ -12,6 +12,7 @@ let orcaConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "podman-${name}"; description = "orca slicer web ui"; options = { httpsPort = mkOpt types.int 443 "HTTPS port"; diff --git a/modules/nixos/services/paperless/default.nix b/modules/nixos/services/paperless/default.nix index eb21692..62f5277 100755 --- a/modules/nixos/services/paperless/default.nix +++ b/modules/nixos/services/paperless/default.nix @@ -12,6 +12,7 @@ let paperlessConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "${name}-web"; description = "paperless"; options = { }; moduleConfig = { @@ -35,6 +36,7 @@ let paperlessAiConfig = lib.${namespace}.mkModule { inherit config; name = "paperless-ai"; + serviceName = "podman-paperless-ai"; description = "paperless-ai"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/restic/default.nix b/modules/nixos/services/restic/default.nix index 64418e7..0a38cb1 100644 --- a/modules/nixos/services/restic/default.nix +++ b/modules/nixos/services/restic/default.nix @@ -11,6 +11,7 @@ let resticConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "${name}-rest-server"; description = "restic"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/unmanic/default.nix b/modules/nixos/services/unmanic/default.nix index 88df1c3..4aa8ab3 100644 --- a/modules/nixos/services/unmanic/default.nix +++ b/modules/nixos/services/unmanic/default.nix @@ -12,6 +12,7 @@ let unmanicConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "podman-${name}"; description = "unmanic"; options = { }; moduleConfig = { diff --git a/modules/nixos/services/wyoming/default.nix b/modules/nixos/services/wyoming/default.nix index f3c43dd..4b8ceee 100755 --- a/modules/nixos/services/wyoming/default.nix +++ b/modules/nixos/services/wyoming/default.nix @@ -11,6 +11,7 @@ let wyomingConfig = lib.${namespace}.mkModule { inherit config name; + serviceName = "${name}-faster-whisper-hass-whisper"; description = "wyoming protocol"; options = { }; moduleConfig = {