zfs: HEAVILY REFACTOR subvolume handling

services/bitwarden.nix

@@ -7,16 +7,14 @@
 }:
 {
   imports = [
-    (lib.serviceMountDeps "vaultwarden" [
+    (lib.serviceMountWithZpool "vaultwarden" service_configs.zpool_ssds [
       service_configs.vaultwarden.path
       config.services.vaultwarden.backupDir
     ])
-    (lib.serviceMountDeps "backup-vaultwarden" [
+    (lib.serviceMountWithZpool "backup-vaultwarden" service_configs.zpool_ssds [
       service_configs.vaultwarden.path
       config.services.vaultwarden.backupDir
     ])
-    (lib.serviceDependZpool "vaultwarden" service_configs.zpool_ssds)
-    (lib.serviceDependZpool "backup-vaultwarden" service_configs.zpool_ssds)
   ];
 
   services.vaultwarden = {

services/caddy.nix

@@ -44,10 +44,9 @@ let
 in
 {
   imports = [
-    (lib.serviceMountDeps "caddy" [
+    (lib.serviceMountWithZpool "caddy" service_configs.zpool_ssds [
       config.services.caddy.dataDir
     ])
-    (lib.serviceDependZpool "caddy" service_configs.zpool_ssds)
   ];
 
   services.caddy = {

services/gitea.nix

@@ -7,8 +7,7 @@
 }:
 {
   imports = [
-    (lib.serviceMountDeps "gitea" [ config.services.gitea.stateDir ])
-    (lib.serviceDependZpool "gitea" service_configs.zpool_ssds)
+    (lib.serviceMountWithZpool "gitea" service_configs.zpool_ssds [ config.services.gitea.stateDir ])
   ];
 
   services.gitea = {

services/immich.nix

@@ -7,10 +7,12 @@
 }:
 {
   imports = [
-    (lib.serviceMountDeps "immich-server" [ config.services.immich.mediaLocation ])
-    (lib.serviceMountDeps "immich-machine-learning" [ config.services.immich.mediaLocation ])
-    (lib.serviceDependZpool "immich-server" service_configs.zpool_ssds)
-    (lib.serviceDependZpool "immich-machine-learning" service_configs.zpool_ssds)
+    (lib.serviceMountWithZpool "immich-server" service_configs.zpool_ssds [
+      config.services.immich.mediaLocation
+    ])
+    (lib.serviceMountWithZpool "immich-machine-learning" service_configs.zpool_ssds [
+      config.services.immich.mediaLocation
+    ])
   ];
 
   services.immich = {

services/jellyfin.nix

@@ -7,11 +7,10 @@
 }:
 {
   imports = [
-    (lib.serviceMountDeps "jellyfin" [
+    (lib.serviceMountWithZpool "jellyfin" service_configs.zpool_ssds [
       config.services.jellyfin.dataDir
       config.services.jellyfin.cacheDir
     ])
-    (lib.serviceDependZpool "jellyfin" service_configs.zpool_ssds)
   ];
 
   services.jellyfin = {

services/minecraft.nix

@@ -7,10 +7,12 @@
 }:
 {
   imports = [
-    (lib.serviceMountDeps "minecraft-server-${service_configs.minecraft.server_name}" [
-      "${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name}"
-    ])
-    (lib.serviceDependZpool "minecraft-server-${service_configs.minecraft.server_name}" service_configs.zpool_ssds)
+    (lib.serviceMountWithZpool "minecraft-server-${service_configs.minecraft.server_name}"
+      service_configs.zpool_ssds
+      [
+        "${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name}"
+      ]
+    )
   ];
 
   environment.systemPackages = [

services/monero.nix

@@ -5,10 +5,9 @@
 }:
 {
   imports = [
-    (lib.serviceMountDeps "monero" [
+    (lib.serviceMountWithZpool "monero" service_configs.zpool_hdds [
       service_configs.monero.dataDir
     ])
-    (lib.serviceDependZpool "monero" service_configs.zpool_hdds)
   ];
 
   services.monero = {

services/postgresql.nix

@@ -7,8 +7,9 @@
 }:
 {
   imports = [
-    (lib.serviceMountDeps "postgresql" [ config.services.postgresql.dataDir ])
-    (lib.serviceDependZpool "postgresql" service_configs.zpool_ssds)
+    (lib.serviceMountWithZpool "postgresql" service_configs.zpool_ssds [
+      config.services.postgresql.dataDir
+    ])
   ];
 
   services.postgresql = {

services/qbittorrent.nix

@@ -8,13 +8,12 @@
 }:
 {
   imports = [
-    (lib.serviceMountDeps "qbittorrent" [
+    (lib.serviceMountWithZpool "qbittorrent" service_configs.zpool_hdds [
       service_configs.torrents_path
       config.services.qbittorrent.serverConfig.Preferences.Downloads.TempPath
       "${config.services.qbittorrent.profileDir}/qBittorrent"
     ])
     (lib.vpnNamespaceOpenPort config.services.qbittorrent.webuiPort "qbittorrent")
-    (lib.serviceDependZpool "qbittorrent" service_configs.zpool_hdds)
   ];
 
   services.qbittorrent = {

services/soulseek.nix

@@ -11,13 +11,11 @@ let
 in
 {
   imports = [
-    (lib.serviceMountDeps "slskd" [
+    (lib.serviceMountWithZpool "slskd" "" [
       service_configs.slskd.base
       service_configs.slskd.downloads
       service_configs.slskd.incomplete
     ])
-    (lib.serviceDependZpool "slskd" service_configs.zpool_ssds)
-    (lib.serviceDependZpool "slskd" service_configs.zpool_hdds)
   ];
 
   users.groups."music" = { };