proper mountpoint testing

flake.nix

@@ -135,9 +135,22 @@
         };
       };
 
-      serviceMountDeps = serviceName: dirs: {
+      serviceMountDeps = serviceName: dirs: pkgs: {
+        systemd.services."${serviceName}_mounts" = {
+          unitConfig.Wants = "zfs.target";
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+            ExecStart =
+              let
+                lib = nixpkgs.lib;
+              in
+              "${lib.getExe pkgs.bash} -c \"${lib.getExe pkgs.zfs} get mounted | ${lib.getExe pkgs.gnugrep} yes | ${lib.getExe pkgs.gawk} '{print $1}' | while read i; do ${lib.getExe pkgs.zfs} get mountpoint \$i | ${lib.getExe pkgs.gawk} 'FNR==2 {print \$3}'; done | ${lib.getExe pkgs.gnugrep} '${lib.strings.concatStringsSep "\|" dirs}' | ${pkgs.coreutils}/bin/wc -l | ${lib.getExe pkgs.gnugrep} -q ${toString (lib.length dirs)}\"";
+          };
+        };
+
         systemd.services.${serviceName} = {
-          unitConfig.RequiresMountsFor = dirs;
+          wants = [ "${serviceName}_mounts.service" ];
         };
       };
     in

services/gitea.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   config,
   service_configs,
   username,
@@ -7,7 +8,7 @@
 }:
 {
   imports = [
-    (serviceMountDeps "gitea" [ config.services.gitea.stateDir ])
+    (serviceMountDeps "gitea" [ config.services.gitea.stateDir ] pkgs)
   ];
 
   services.gitea = {

services/immich.nix

@@ -8,8 +8,8 @@
 }:
 {
   imports = [
-    (serviceMountDeps "immich-server" [ config.services.immich.mediaLocation ])
-    (serviceMountDeps "immich-machine-learning" [ config.services.immich.mediaLocation ])
+    (serviceMountDeps "immich-server" [ config.services.immich.mediaLocation ] pkgs)
+    (serviceMountDeps "immich-machine-learning" [ config.services.immich.mediaLocation ] pkgs)
   ];
 
   services.immich = {

services/jellyfin.nix

@@ -12,7 +12,7 @@
     (serviceMountDeps "jellyfin" [
       config.services.jellyfin.dataDir
       config.services.jellyfin.cacheDir
-    ])
+    ] pkgs)
   ];
 
   services.jellyfin = {

services/minecraft.nix

@@ -11,7 +11,7 @@
   imports = [
     (serviceMountDeps "minecraft-server-${service_configs.minecraft.server_name}" [
       "${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name}"
-    ])
+    ] pkgs)
   ];
 
   environment.systemPackages = [

services/postgresql.nix

@@ -8,7 +8,7 @@
 }:
 {
   imports = [
-    (serviceMountDeps "postgresql" [ config.services.postgresql.dataDir ])
+    (serviceMountDeps "postgresql" [ config.services.postgresql.dataDir ] pkgs)
   ];
 
   services.postgresql = {

services/qbittorrent.nix

@@ -13,7 +13,7 @@
       service_configs.torrents_path
       config.services.qbittorrent.serverConfig.Preferences.Downloads.TempPath
       "/var/lib/qBittorrent/qBittorrent"
-    ])
+    ] pkgs)
   ];
 
   # network namespace that is proxied through mullvad

services/soulseek.nix

@@ -16,7 +16,7 @@ in
       service_configs.slskd.base
       # service_configs.slskd.downloads
       # service_configs.slskd.incomplete
-    ])
+    ] pkgs)
   ];
 
   users.groups."music" = { };