From 30426ad89e355d59402ece932546bc3c5b398e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Fri, 15 Sep 2023 09:55:26 +0300
Subject: [PATCH] zfsborg: mount the tmpfs on all units

---
 modules/base/zfsborg/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/modules/base/zfsborg/default.nix b/modules/base/zfsborg/default.nix
index 620b8ee..6368fcb 100644
--- a/modules/base/zfsborg/default.nix
+++ b/modules/base/zfsborg/default.nix
@@ -5,14 +5,8 @@
   ...
 }: let
   mountLatest = mountpoint: zfs_name: ''
-    set -euo pipefail
-    ${pkgs.util-linux}/bin/umount ${mountpoint}/.snapshot-latest &>/dev/null || :
-    mkdir -p ${mountpoint}/.snapshot-latest
-    ${pkgs.util-linux}/bin/mount -t zfs -o ro $(${pkgs.zfs}/bin/zfs list -H -t snapshot -o name ${zfs_name} | sort | tail -1) ${mountpoint}/.snapshot-latest
-  '';
-
-  umountLatest = mountpoint: ''
-    exec ${pkgs.util-linux}/bin/umount ${mountpoint}/.snapshot-latest
+    set -x
+    exec ${pkgs.util-linux}/bin/mount -t zfs -o ro $(${pkgs.zfs}/bin/zfs list -H -t snapshot -o name ${zfs_name} | sort | tail -1) ${mountpoint}/.snapshot-latest
   '';
 in {
   options.mj.base.zfsborg = with lib.types; {
@@ -46,7 +40,7 @@ in {
   config = with config.mj.base.zfsborg;
     lib.mkIf enable {
       systemd.services =
-        lib.listToAttrs (lib.imap1 (
+        lib.listToAttrs (lib.imap0 (
             i: attr:
               lib.nameValuePair "borgbackup-job-${lib.strings.sanitizeDerivationName attr.mountpoint}-${toString i}" {
                 serviceConfig.TemporaryFileSystem = "${attr.mountpoint}/.snapshot-latest";
@@ -94,7 +88,6 @@ in {
                   compression = "auto,lzma";
                   startAt = attrs.backup_at;
                   preHook = mountLatest mountpoint fs.device;
-                  postHook = umountLatest mountpoint;
                   prune.keep = {
                     within = "1d";
                     daily = 7;