1 files changed, 23 insertions, 16 deletions

diff --git a/custom/borgbackup.nix b/custom/borgbackup.nix
index 28dbba16..47714e83 100644
--- a/custom/borgbackup.nix
+++ b/custom/borgbackup.nix
@@ -54,14 +54,15 @@ in {
   config = mkIf (any (t: t.paths != []) (attrValues cfg.targets)) {
     services.btrfs-snapshots.enable = mkIf (cfg.snapshots == "btrfs") true;
   
-    systemd.timers = listToAttrs (map ({ target, path }: nameValuePair "borgbackup-${target}@${path}" {
+    systemd.timers = listToAttrs (map ({ target, path, tCfg }: nameValuePair "borgbackup-${target}@${path}" {
       wantedBy = [ "timers.target" ];
 
       timerConfig = {
-        Persistent = true;
-        OnUnitInactiveSec = "6h";
+        Persistent = false;
+        OnBootSec = tCfg.interval;
+        OnUnitInactiveSec = tCfg.interval;
       };
-    }) (flatten (mapAttrsToList (target: tCfg: map (path: { inherit target path; }) tCfg.paths) cfg.targets)));
+    }) (flatten (mapAttrsToList (target: tCfg: map (path: { inherit target path tCfg; }) tCfg.paths) cfg.targets)));
 
     systemd.services = mapAttrs' (target: tCfg: nameValuePair "borgbackup-${target}@" (let
       deps = flatten [
@@ -74,20 +75,26 @@ in {
 
       path = with pkgs; [borgbackup];
 
-      script = ''
-        borg create \
-          --stats \
-          --list \
-          --filter 'AME' \
-          --exclude-caches \
-          --keep-exclude-tags \
-          --patterns-from .backup \
-          --one-file-system \
-          --compression auto,lzma \
-          ${target}::${cfg.prefix}$1-{utcnow}
-      '';
+      script = let
+        borgCmd = ''
+          borg create \
+            --stats \
+            --list \
+            --filter 'AME' \
+            --exclude-caches \
+            --keep-exclude-tags \
+            --patterns-from .backup \
+            --one-file-system \
+            --compression auto,lzma \
+            ${target}::${cfg.prefix}$1-{utcnow}
+        '';
+      in if tCfg.lock == null then borgCmd else "flock -xo /var/lock/${tCfg.lock} ${borgCmd}";
       scriptArgs = "%i";
 
+      unitConfig = {
+        AssertPathIsDirectory = mkIf (tCfg.lock != null) "/var/lock";
+      };
+
       serviceConfig = {
         Type = "oneshot";
         WorkingDirectory = if (cfg.snapshots == null) then "%p" else "/mnt/snapshot-%i";