1 files changed, 7 insertions, 9 deletions

diff --git a/custom/borgbackup.nix b/custom/borgbackup.nix
index 3871af0a..0db4b5da 100644
--- a/custom/borgbackup.nix
+++ b/custom/borgbackup.nix
@@ -21,7 +21,7 @@ let
 
   systemdPath = path: escapeSystemdPath (if cfg.snapshots == "lvm" then "${path.VG}-${path.LV}" else path);
 
-  withPrefix = path: config.services.btrfs-snapshots.mountPrefix + path;
+  withSuffix = path: path + if cfg.snapshots == "btrfs" then config.services.btrfs-snapshots.mountSuffix else config.services.lvm-snapshots.mountSuffix;
 
   mountPoint = if cfg.snapshots == "lvm" then config.services.lvm-snapshots.mountPoint else config.services.btrfs-snapshots.mountPoint;
 
@@ -86,18 +86,16 @@ in {
     };
   };
 
-  imports = [
-    ./lvm-snapshots.nix
-    ./btrfs-snapshots.nix
-  ];
+  imports =
+       optional (cfg.snapshots == "lvm")   ./lvm-snapshots.nix
+    ++ optional (cfg.snapshats == "btrfs") ./btrfs-snapshots.nix;
 
   config = mkIf (any (t: t.paths != []) (attrValues cfg.targets)) {
-  
     services.btrfs-snapshots.enable = mkIf (cfg.snapshots == "btrfs") true;
 
     services.lvm-snapshots.snapshots = mkIf (cfg.snapshots == "lvm") (listToAttrs (map (path: nameValuePair (path.VG + "-" + path.LV) {
       inherit (path) LV VG; 
-      mountName = withPrefix (path.VG + "-" + path.LV);
+      mountName = withSuffix (path.VG + "-" + path.LV);
     }) (unique (flatten (mapAttrsToList (target: tCfg: tCfg.paths) cfg.targets)))));
 
     systemd.targets."timers-borg" = {
@@ -159,12 +157,12 @@ in {
       unitConfig = {
         AssertPathIsDirectory = mkIf (tCfg.lock != null) "/var/lock";
         DefaultDependencies = false;
-        RequiresMountsFor = mkIf (cfg.snapshots == "lvm") [ "${mountPoint}/${withPrefix "%I"}" ];
+        RequiresMountsFor = mkIf (cfg.snapshots == "lvm") [ "${mountPoint}/${withSuffix "%I"}" ];
       };
 
       serviceConfig = {
         Type = "oneshot";
-        WorkingDirectory = if (cfg.snapshots == null) then "%I" else (if (cfg.snapshots == "lvm") then "${mountPoint}/${withPrefix "%I"}" else "${mountPoint}/${withPrefix "%i"}");
+        WorkingDirectory = if (cfg.snapshots == null) then "%I" else (if (cfg.snapshots == "lvm") then "${withSuffix "%I"}" else "${mountPoint}/${withPrefix "%i"}");
         Nice = 15;
         IOSchedulingClass = 2;
         IOSchedulingPriority = 7;