simplify script

flake.nix

@@ -138,16 +138,18 @@
       serviceMountDeps = serviceName: dirs: pkgs: {
         systemd.services."${serviceName}_mounts" =
           let
+            lib = nixpkgs.lib;
             zfslistmounted = pkgs.writeShellApplication {
               name = "zfslistmounted";
               runtimeInputs = with pkgs; [
                 zfs
                 gnugrep
                 gawk
+                coreutils
               ];
               text = ''
                 #!/bin/sh
-                zfs get mounted | grep yes | awk '{print $1}' | while read -r i; do zfs get mountpoint "$i" | awk 'FNR==2 {print $3}'; done
+                zfs list -o mountpoint,mounted | awk 'FNR > 1 && $2 == "yes" {print $1}' | grep -c '${lib.strings.concatStringsSep "\|" dirs}' | grep -Fq ${toString (lib.length dirs)}
               '';
             };
           in
@@ -156,12 +158,7 @@
             serviceConfig = {
               Type = "oneshot";
               RemainAfterExit = true;
-              ExecStart =
-                let
-                  lib = nixpkgs.lib;
-                  contains_cmd = "${lib.getExe pkgs.gnugrep} '${lib.strings.concatStringsSep "\|" dirs}' | ${pkgs.coreutils}/bin/wc -l | ${lib.getExe pkgs.gnugrep} -q ${toString (lib.length dirs)}";
-                in
-                "${lib.getExe pkgs.bash} -c \"${lib.getExe zfslistmounted} | ${contains_cmd}\"";
+              ExecStart = nixpkgs.lib.getExe zfslistmounted;
             };
           };
 

services/caddy.nix

@@ -3,9 +3,17 @@
   service_configs,
   username,
   pkgs,
+  serviceMountDeps,
   ...
 }:
 {
+  imports = [
+    (serviceMountDeps "caddy" [
+      "/var/lib/caddy"
+      service_configs.https.data_dir
+    ] pkgs)
+  ];
+
   services.caddy = {
     enable = true;
     email = "titaniumtown@proton.me";
@@ -23,6 +31,7 @@
 
   systemd.tmpfiles.rules = [
     "d ${service_configs.https.data_dir} 750 ${config.services.caddy.user} ${config.services.caddy.group}"
+    "d /var/lib/caddy 750 ${config.services.caddy.user} ${config.services.caddy.group}"
   ];
 
   systemd.packages = with pkgs; [ nssTools ];