1 files changed, 6 insertions, 17 deletions

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"}";
       };
     };