From e7a53a5df01b866d9001a21754ba32dceeb72ec8 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sat, 11 Jan 2025 13:04:23 -0600
Subject: [PATCH] updated jellyfin persist folders

---
 modules/nixos-modules/server/jellyfin.nix | 72 ++++++++++++++---------
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git a/modules/nixos-modules/server/jellyfin.nix b/modules/nixos-modules/server/jellyfin.nix
index 6d6874a..a10470a 100644
--- a/modules/nixos-modules/server/jellyfin.nix
+++ b/modules/nixos-modules/server/jellyfin.nix
@@ -7,6 +7,7 @@
   jellyfinPort = 8096;
   jellyfin_data_directory = "/var/lib/jellyfin";
   jellyfin_cache_directory = "/var/cache/jellyfin";
+  jellyfin_media_directory = "/srv/jellyfin/media";
 in {
   options.host.jellyfin = {
     enable = lib.mkEnableOption "should jellyfin be enabled on this computer";
@@ -31,34 +32,6 @@ in {
         ];
       }
       (lib.mkIf config.host.impermanence.enable {
-        assertions = [
-          {
-            assertion = config.services.jellyfin.dataDir == jellyfin_data_directory;
-            message = "jellyfin data directory does not match persistence";
-          }
-          {
-            assertion = config.services.jellyfin.cacheDir == jellyfin_cache_directory;
-            message = "jellyfin cache directory does not match persistence";
-          }
-        ];
-
-        environment.persistence."/persist/system/jellyfin" = {
-          enable = true;
-          hideMounts = true;
-          directories = [
-            {
-              directory = jellyfin_data_directory;
-              user = "jellyfin";
-              group = "jellyfin";
-            }
-            {
-              directory = jellyfin_cache_directory;
-              user = "jellyfin";
-              group = "jellyfin";
-            }
-          ];
-        };
-
         fileSystems."/persist/system/jellyfin".neededForBoot = true;
 
         host.storage.pool.extraDatasets = {
@@ -73,6 +46,49 @@ in {
             };
           };
         };
+
+        assertions = [
+          {
+            assertion = config.services.jellyfin.dataDir == jellyfin_data_directory;
+            message = "jellyfin data directory does not match persistence";
+          }
+          {
+            assertion = config.services.jellyfin.cacheDir == jellyfin_cache_directory;
+            message = "jellyfin cache directory does not match persistence";
+          }
+        ];
+
+        environment.persistence = {
+          "/persist/system/root" = {
+            enable = true;
+            hideMounts = true;
+            directories = [
+              {
+                directory = jellyfin_data_directory;
+                user = "jellyfin";
+                group = "jellyfin";
+              }
+              {
+                directory = jellyfin_cache_directory;
+                user = "jellyfin";
+                group = "jellyfin";
+              }
+            ];
+          };
+
+          "/persist/system/jellyfin" = {
+            enable = true;
+            hideMounts = true;
+            directories = [
+              {
+                directory = jellyfin_media_directory;
+                user = "jellyfin";
+                group = "jellyfin_media";
+                mode = "1770";
+              }
+            ];
+          };
+        };
       })
     ]
   );