From 6ac9ddb8f96bebd8261e3387bb008f70b1d43cab Mon Sep 17 00:00:00 2001
From: baritone <baritone@mail.spoodythe.one>
Date: Tue, 1 Apr 2025 09:55:56 +0200
Subject: [PATCH] migrated location of /media folder

---
 disko.nix                      |   8 ++++----
 services/.auto-torrent.nix.swp | Bin 0 -> 16384 bytes
 services/auto-torrent.nix      |  19 +++++++++++++++----
 services/jellyfin.nix          |  10 +++++++---
 4 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 services/.auto-torrent.nix.swp

diff --git a/disko.nix b/disko.nix
index 4314050..98f064a 100755
--- a/disko.nix
+++ b/disko.nix
@@ -112,10 +112,10 @@
             type = "zfs_fs";
             mountpoint = "/opt";
           };
-          media = {
-            type = "zfs_fs";
-            mountpoint = "/media";
-          };
+          # media = {
+          #   type = "zfs_fs";
+          #   mountpoint = "/media";
+          # };
         };
       };
     };
diff --git a/services/.auto-torrent.nix.swp b/services/.auto-torrent.nix.swp
new file mode 100644
index 0000000000000000000000000000000000000000..e42d16663581469e9263c698e05c85e9f4e18bab
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/services/auto-torrent.nix b/services/auto-torrent.nix
index 20d1eb9..e9ed097 100644
--- a/services/auto-torrent.nix
+++ b/services/auto-torrent.nix
@@ -18,6 +18,7 @@
   vpn-endpoint = "193.32.248.70";
   enable-services = true;
   wg-config = "/mnt/wg.conf";
+  jellyfin-gid = 989;
 
   ports-list = pkgs.lib.attrsets.mapAttrsToList (name: value: value.port) ports;
 in {
@@ -30,9 +31,7 @@ in {
 
   system.activationScripts."make-${vm-name}-data-dir" = lib.stringAfter ["var"] ''
     mkdir -p /var/lib/${vm-name}
-    chmod -R 777 /var/lib/${vm-name}
-    chown -R microvm /var/lib/${vm-name}
-    chmod -R 777 /media
+    # chown -R microvm:jellyfin /var/lib/${vm-name}
   '';
 
   microvm.vms.${vm-name} = {
@@ -67,7 +66,7 @@ in {
         }
         {
           tag = "media-dir";
-          source = "/media";
+          source = "/var/lib/media";
           mountPoint = "/media";
           inherit proto;
         }
@@ -131,6 +130,18 @@ in {
       programs.nano.enable = lib.mkForce false;
       programs.vim.enable = true;
 
+      # Fix permissions with groups
+      users.users = {
+        sonarr.extraGroups = ["jellyfin"];
+        radarr.extraGroups = ["jellyfin"];
+        transmission.extraGroups = ["jellyfin"];
+        jackett.extraGroups = ["jellyfin"];
+      };
+
+      users.groups.jellyfin = {
+        gid = jellyfin-gid;
+      };
+
       # Services
       services.sonarr = pkgs.lib.mkIf enable-services {
         enable = true;
diff --git a/services/jellyfin.nix b/services/jellyfin.nix
index cddda9e..ffa5656 100755
--- a/services/jellyfin.nix
+++ b/services/jellyfin.nix
@@ -6,6 +6,7 @@
 }: let
   host = "127.0.0.1";
   port = 8096;
+  gid = 989;
 in {
   imports = [./nginx.nix];
   # Enable VAAPI
@@ -23,11 +24,14 @@ in {
     ];
   };
 
+  # Set declarative gid
+  config.users.groups.jellyfin.gid = gid;
+
   # Create folder for media
   config.system.activationScripts."jellyfinMediaFolder" = lib.stringAfter ["var"] ''
-    mkdir -p /media
-    chmod -R 775 /media
-    chown -R jellyfin:jellyfin /media
+    mkdir -p /var/lib/media
+    chmod -R 775 /var/lib/media
+    chown -R jellyfin:jellyfin /var/lib/media
   '';
 
   # Enable Jellyfin