Merge branch 'master' of git.yggdrasil.li:nixos

3 files changed, 21 insertions, 28 deletions

diff --git a/custom/borgbackup.nix b/custom/borgbackup.nix
index 3871af0a..b292f6f2 100644
--- a/custom/borgbackup.nix
+++ b/custom/borgbackup.nix
@@ -21,9 +21,9 @@ 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;
+  mountPoint = if cfg.snapshots == "lvm" then config.services.lvm-snapshots.mountPoint else "";
 
   targetOptions = {
     options = {
@@ -86,18 +86,17 @@ in {
     };
   };
 
-  imports = [
-    ./lvm-snapshots.nix
-    ./btrfs-snapshots.nix
-  ];
+  imports =
+    [ ./lvm-snapshots.nix
+      ./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 +158,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 "${withSuffix "%f"}");
         Nice = 15;
         IOSchedulingClass = 2;
         IOSchedulingPriority = 7;
diff --git a/custom/btrfs-snapshots.nix b/custom/btrfs-snapshots.nix
index 39e0bf0c..96d2b2ba 100644
--- a/custom/btrfs-snapshots.nix
+++ b/custom/btrfs-snapshots.nix
@@ -5,21 +5,16 @@ with lib;
 let
   cfg = config.services.btrfs-snapshots;
 
-  snapshotMount = str: "${cfg.mountPoint}/${cfg.mountPrefix}${str}";
+  snapshotMount = str: "${str}${cfg.mountSuffix}";
 in {
   options = {
 
     services.btrfs-snapshots = {
       enable = mkEnableOption "a systemd unit for btrfs snapshots";   
 
-      mountPoint = mkOption {
-        type = types.path;
-        default = "/mnt";
-      };
-
-      mountPrefix = mkOption {
+      mountSuffix = mkOption {
         type = types.str;
-        default = "snapshot-";
+        default = ".snapshot";
       };
 
       readOnly = mkOption {
@@ -37,25 +32,19 @@ in {
 
   
   config = mkIf cfg.enable {
-
-    system.activationScripts."btrfs-snapshots" = ''
-      mkdir -p ${cfg.mountPoint}
-    '';
-
     systemd.services."btrfs-snapshot@" = {
       enable = true;
 
       unitConfig = {
-        AssertPathIsDirectory = cfg.mountPoint;
         StopWhenUnneeded = !cfg.persist;
       };
 
       serviceConfig = with pkgs; {
         Type = "oneshot";
-        ExecStartPre = "-${btrfs-progs}/bin/btrfs subvolume delete -c ${snapshotMount "%i"}";
-        ExecStart = "${btrfs-progs}/bin/btrfs subvolume snapshot ${optionalString cfg.readOnly "-r"} %f ${snapshotMount "%i"}";
+        ExecStartPre = "-${btrfs-progs}/bin/btrfs subvolume delete -c ${snapshotMount "%f"}";
+        ExecStart = "${btrfs-progs}/bin/btrfs subvolume snapshot ${optionalString cfg.readOnly "-r"} %f ${snapshotMount "%f"}";
         RemainAfterExit = true;
-        ExecStop = "${btrfs-progs}/bin/btrfs subvolume delete -c ${snapshotMount "%i"}";
+        ExecStop = "${btrfs-progs}/bin/btrfs subvolume delete -c ${snapshotMount "%f"}";
       };
     };
 
diff --git a/custom/lvm-snapshots.nix b/custom/lvm-snapshots.nix
index 98c64330..13cbf421 100644
--- a/custom/lvm-snapshots.nix
+++ b/custom/lvm-snapshots.nix
@@ -7,7 +7,7 @@ let
   cfg = config.services.lvm-snapshots;
 
   snapshotMount = name: "${cfg.mountPoint}/${if isNull cfg.snapshots."${name}".mountName then name else cfg.snapshots."${name}".mountName}";
-  snapshotName = name: "${name}-snapshot";
+  snapshotName = name: "${name}-${cfg.mountSuffix}";
 
   snapshotConfig = {
     options = {
@@ -53,6 +53,11 @@ in {
         type = types.path;
         default = "/mnt";
       };
+
+      mountSuffix = mkOption {
+        type = types.str;
+        default = "-snapshot";
+      };
     };
   };