From 7418159761addf50a52833981510cc168d2b7a09 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Mon, 17 Feb 2025 22:03:32 +0100
Subject: [PATCH] Remove reliance on NFS volumes

---
 modules/bootstrap-default.nix | 10 ----------
 modules/longhorn-volume.nix   | 12 ++++++------
 modules/media.nix             | 23 +++++++++--------------
 3 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/modules/bootstrap-default.nix b/modules/bootstrap-default.nix
index 25bc712..f2db421 100644
--- a/modules/bootstrap-default.nix
+++ b/modules/bootstrap-default.nix
@@ -87,16 +87,6 @@
 
         ipAddressPools.main.spec.addresses = ["192.168.30.128-192.168.30.200" "2a0d:6e00:1a77:30::2-2a0d:6e00:1a77:30:ffff:ffff:ffff:fffe"];
         l2Advertisements.main.metadata = {};
-
-        persistentVolumes.media-media.spec = {
-          capacity.storage = "1Gi";
-          accessModes = ["ReadWriteMany"];
-
-          nfs = {
-            server = "lewis.dmz";
-            path = "/mnt/longhorn/persistent/media";
-          };
-        };
       };
     };
 
diff --git a/modules/longhorn-volume.nix b/modules/longhorn-volume.nix
index 6eb4bfd..db08037 100644
--- a/modules/longhorn-volume.nix
+++ b/modules/longhorn-volume.nix
@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  longhornVolumeOpts = {name, ...}: {
+  longhornVolumeOpts = _: {
     options = {
       storage = lib.mkOption {
         type = lib.types.str;
@@ -16,7 +16,7 @@
     };
   };
 
-  longhornPVOpts = {name, ...}: {
+  longhornPVOpts = _: {
     options = {
       storage = lib.mkOption {
         type = lib.types.str;
@@ -71,7 +71,7 @@ in {
 
               claimRef = {
                 inherit name;
-                namespace = longhornVolume.namespace;
+                inherit (longhornVolume) namespace;
               };
 
               csi = {
@@ -134,7 +134,7 @@ in {
       persistentVolumeClaims =
         lib.mergeAttrs
         (builtins.mapAttrs
-          (name: longhornVolume: {
+          (_name: longhornVolume: {
             spec = {
               accessModes = ["ReadWriteOnce"];
               resources.requests.storage = longhornVolume.storage;
@@ -143,12 +143,12 @@ in {
           })
           config.lab.longhornVolumes)
         (builtins.mapAttrs
-          (name: longhornPVC: {
+          (_name: longhornPVC: {
             spec = {
               accessModes = ["ReadWriteOnce"];
               resources.requests.storage = longhornPVC.storage;
               storageClassName = "";
-              volumeName = longhornPVC.volumeName;
+              inherit (longhornPVC) volumeName;
             };
           })
           config.lab.longhorn.persistentVolumeClaim);
diff --git a/modules/media.nix b/modules/media.nix
index 2264a70..ee035b3 100644
--- a/modules/media.nix
+++ b/modules/media.nix
@@ -151,7 +151,11 @@ in {
 
                 volumes = {
                   config.persistentVolumeClaim.claimName = "deluge";
-                  media.persistentVolumeClaim.claimName = "media";
+
+                  media.hostPath = {
+                    path = "/mnt/longhorn/persistent/media";
+                    type = "Directory";
+                  };
                 };
 
                 securityContext = {
@@ -575,19 +579,10 @@ in {
         };
       };
 
-      persistentVolumeClaims = {
-        jellyfin-cache = lib.mkIf cfg.jellyfin.enable {
-          spec = {
-            accessModes = ["ReadWriteOnce"];
-            resources.requests.storage = "20Gi";
-          };
-        };
-
-        media.spec = {
-          accessModes = ["ReadWriteMany"];
-          storageClassName = "";
-          resources.requests.storage = "1Mi";
-          volumeName = "media-media";
+      persistentVolumeClaims.jellyfin-cache = lib.mkIf cfg.jellyfin.enable {
+        spec = {
+          accessModes = ["ReadWriteOnce"];
+          resources.requests.storage = "20Gi";
         };
       };
     };