fix(module): stop using jellyConfig

matt1432 · Oct 30, 2024 · 59dbbf2 · 59dbbf2
1 parent 25f5866
commit 59dbbf2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -55,7 +55,7 @@ in {
 
   metadataPath = mkOption {
     type = types.str;
-    default = "${jellyConfig.WorkingDirectory}/metadata";
+    default = "${jellyConfig.dataDir}/metadata";
     description = mdDocs ''
       The metadata path.
     '';