diff --git a/modules/default.nix b/modules/default.nix index a3514d5..2f999d1 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -20,7 +20,6 @@ jellyPkgs: { inherit (builtins) isNull; cfg = config.services.jellyfin; - jellyConfig = config.systemd.services.jellyfin.serviceConfig; mkEmptyDefault = opt: name: if isNull opt @@ -128,7 +127,8 @@ in { }; encoding = import ./options/encoding-options.nix { - inherit lib jellyConfig; + inherit lib; + jellyConfig = cfg; ffmpeg = cfg.ffmpegPackage; cfg = cfg.settings.encoding; }; @@ -139,7 +139,8 @@ in { system = (import ./options/server-config.nix { - inherit config lib jellyConfig; + inherit config lib; + jellyConfig = cfg; }) // (import ./options/base-app-config.nix { inherit lib; diff --git a/modules/options/encoding-options.nix b/modules/options/encoding-options.nix index 89a0939..820e354 100644 --- a/modules/options/encoding-options.nix +++ b/modules/options/encoding-options.nix @@ -24,7 +24,7 @@ in { transcodingTempPath = mkOption { type = types.str; - default = "${jellyConfig.WorkingDirectory}/transcodes"; + default = "${jellyConfig.dataDir}/transcodes"; description = mdDocs '' The temporary transcoding path. ''; diff --git a/modules/options/server-config.nix b/modules/options/server-config.nix index 7a8d78f..073b0cc 100644 --- a/modules/options/server-config.nix +++ b/modules/options/server-config.nix @@ -55,7 +55,7 @@ in { metadataPath = mkOption { type = types.str; - default = "${jellyConfig.WorkingDirectory}/metadata"; + default = "${jellyConfig.dataDir}/metadata"; description = mdDocs '' The metadata path. '';