Rebase to flake parts #10

modules/hosts/nix-server/_services/dispatcharr.nix

@@ -0,0 +1,38 @@
+# Dispatcharr — IPTV / M3U / EPG / HDHomeRun-style proxy (Docker, AIO image).
+# Docs: https://dispatcharr.github.io/Dispatcharr-Docs/
+# Compose reference: https://github.com/Dispatcharr/Dispatcharr/blob/main/docker/docker-compose.aio.yml
+#
+# Web UI: http://<host>:9191
+# After deploy: create an admin user, add playlists / EPG; point Jellyfin at the tuner/M3U URLs
+# Dispatcharr shows in its UI.
+{ lib, pkgs, ... }:
+{
+  systemd.tmpfiles.settings."nix-server-dispatcharr-data" = {
+    "/var/lib/dispatcharr"."d" = {
+      mode = "0755";
+      user = "root";
+      group = "root";
+    };
+  };
+
+  systemd.services.docker-dispatcharr.preStart = lib.mkBefore ''
+    ${pkgs.coreutils}/bin/mkdir -p /var/lib/dispatcharr
+  '';
+
+  virtualisation.oci-containers.containers.dispatcharr = {
+    image = "ghcr.io/dispatcharr/dispatcharr:latest";
+    ports = [ "9191:9191" ];
+    volumes = [
+      "/var/lib/dispatcharr:/data"
+    ];
+    environment = {
+      DISPATCHARR_ENV = "aio";
+      REDIS_HOST = "localhost";
+      CELERY_BROKER_URL = "redis://localhost:6379/0";
+      DISPATCHARR_LOG_LEVEL = "info";
+      TZ = "America/Moncton";
+    };
+  };
+
+  networking.firewall.allowedTCPPorts = [ 9191 ];
+}

modules/hosts/nix-server/_services/jellyfin-remote-storage.nix

@@ -1,27 +0,0 @@
-# NFS read-only mount of nixdesk (14900k) bulk storage for extra Jellyfin libraries.
-# Source: ssh inventory hostName for 14900k. Export is defined in
-#   modules/hosts/14900k/_private/jellyfin-nfs-export.nix
-#
-# In Jellyfin (in addition to local /var/lib/media/...), add e.g.:
-#   Movies → /mnt/nixdesk-jellyfin/movies
-#   Shows  → /mnt/nixdesk-jellyfin/tv
-{ ... }:
-let
-  # Must match LAN IP of the NFS server (flake `sshInventory` → hosts."14900k".hostName).
-  nfsExportHost = "192.168.2.25";
-in
-{
-  fileSystems."/mnt/nixdesk-jellyfin" = {
-    device = "${nfsExportHost}:/mnt/test/jellyfin";
-    fsType = "nfs";
-    options = [
-      "rw"
-      "noatime"
-      "nofail"
-      "_netdev"
-      "x-systemd.automount"
-      "x-systemd.idle-timeout=600"
-    ];
-  };
-
-}

modules/hosts/nix-server/_services/jellyfin.nix

@@ -1,5 +1,5 @@
 # Jellyfin (native NixOS service). Local media: /var/lib/media (group `media`; jellyfin + server).
-# Dashboard: Movies → /var/lib/media/movies, Shows → /var/lib/media/tv (see jellyfin-remote-storage.nix
+# Dashboard: Movies → /var/lib/media/movies, Shows → /var/lib/media/tv (see nixdesk-nfs-client.nix
 # for bulk libraries on nixdesk at /mnt/nixdesk-jellyfin/{movies,tv}).
 # Do not use "Mixed Movies and Shows" (deprecated): https://jellyfin.org/docs/general/server/media/mixed-movies-and-shows
 # Dedicated disk: fileSystems."/var/lib/media" in hardware.nix, then fix ownership.
@@ -53,8 +53,9 @@
   # not writable by uid jellyfin (it only had group `jellyfin`), so deletes fail.
   systemd.services.jellyfin.serviceConfig = {
     SupplementaryGroups = [ "media" ];
-    # Jellyfin libraries may live on NFS (e.g. /mnt/nixdesk-jellyfin). PrivateUsers breaks
-    # uid mapping for NFS auth in practice; disable so deletes use the real host jellyfin uid.
+    # Jellyfin libraries on NFS (e.g. /mnt/media, /mnt/nixdesk-jellyfin). PrivateUsers breaks
+    # uid mapping for NFS auth in practice; disable so metadata writes use the real jellyfin uid
+    # (squashed to olivier:nfsmedia on nixdesk exports).
     PrivateUsers = lib.mkForce false;
   };
 }

modules/hosts/nix-server/_services/nixdesk-nfs-client.nix

@@ -0,0 +1,41 @@
+# NFS mounts of nixdesk (14900k) bulk storage for nix-server. Exports live in
+#   modules/hosts/14900k/_private/jellyfin-nfs-export.nix
+#
+# Jellyfin library paths (see also services/jellyfin.nix):
+#   Movies → /mnt/nixdesk-jellyfin/movies
+#   Shows  → /mnt/nixdesk-jellyfin/tv
+#
+# If you see "Stale file handle" under /mnt after changing exports or fsid on nixdesk, drop the
+# old client mount and let automount reattach, e.g.:
+#   sudo umount -l /mnt/nixdesk-jellyfin
+#   ls /mnt/nixdesk-jellyfin
+# (or reboot nix-server.)
+{ ... }:
+let
+  nfsExportHost = "192.168.2.25";
+  # nfsvers+tcp: predictable Linux↔Linux; lookupcache=none: fewer stale dentries after export changes.
+  nfsClientOpts = [
+    "rw"
+    "noatime"
+    "nofail"
+    "_netdev"
+    "nfsvers=3"
+    "tcp"
+    "lookupcache=none"
+    "x-systemd.automount"
+    "x-systemd.idle-timeout=3600"
+  ];
+in
+{
+  fileSystems."/mnt/nixdesk-jellyfin" = {
+    device = "${nfsExportHost}:/mnt/test/jellyfin";
+    fsType = "nfs";
+    options = nfsClientOpts;
+  };
+
+  fileSystems."/mnt/media" = {
+    device = "${nfsExportHost}:/mnt/media";
+    fsType = "nfs";
+    options = nfsClientOpts;
+  };
+}

modules/hosts/nix-server/configuration.nix

@@ -20,7 +20,7 @@
         ./_services/swiftshare.nix
         ./_services/immich.nix
         ./_services/jellyfin.nix
-        ./_services/jellyfin-remote-storage.nix
+        ./_services/nixdesk-nfs-client.nix
         ./_services/ddrm-media-server.nix
         ./_services/sonarr.nix
         ./_services/prowlarr.nix
@@ -28,6 +28,7 @@
         ./_services/radarr.nix
         ./_services/qbittorrent.nix
         ./_services/seerr.nix
+        ./_services/dispatcharr.nix
       ];
 
       boot.loader.grub = {