diff --git a/hosts/bluetop/default.nix b/hosts/bluetop/default.nix index 7f13e2f..ec8fe02 100644 --- a/hosts/bluetop/default.nix +++ b/hosts/bluetop/default.nix @@ -70,7 +70,7 @@ btrbk = { enable = true; - snapshotDir = "/nix/btrbk"; + snapshotDir = "/btrbk"; }; openssh.enable = true; diff --git a/hosts/bluetop/disko.nix b/hosts/bluetop/disko.nix index c66aa79..0ca444e 100644 --- a/hosts/bluetop/disko.nix +++ b/hosts/bluetop/disko.nix @@ -22,6 +22,11 @@ extraArgs = ["-f"]; subvolumes = { + "/btrbk" = { + mountpoint = "/btrbk"; + mountOptions = ["compress=zstd" "noatime"]; + }; + "/persistent" = { mountpoint = "/persistent"; mountOptions = ["compress=zstd" "noatime"]; diff --git a/hosts/masterplan/default.nix b/hosts/masterplan/default.nix index b5f1339..b60f844 100644 --- a/hosts/masterplan/default.nix +++ b/hosts/masterplan/default.nix @@ -71,7 +71,7 @@ btrbk = { enable = true; - snapshotDir = "/nix/btrbk"; + snapshotDir = "/btrbk"; }; openssh.enable = true; diff --git a/hosts/masterplan/disko.nix b/hosts/masterplan/disko.nix index 0a56276..39110a6 100644 --- a/hosts/masterplan/disko.nix +++ b/hosts/masterplan/disko.nix @@ -22,6 +22,11 @@ extraArgs = ["-f"]; subvolumes = { + "/btrbk" = { + mountpoint = "/btrbk"; + mountOptions = ["compress=zstd" "noatime"]; + }; + "/persistent" = { mountpoint = "/persistent"; mountOptions = ["compress=zstd" "noatime"]; diff --git a/modules/nixos/services/btrbk/default.nix b/modules/nixos/services/btrbk/default.nix index 009443b..c7a5581 100644 --- a/modules/nixos/services/btrbk/default.nix +++ b/modules/nixos/services/btrbk/default.nix @@ -8,7 +8,7 @@ snapshotDir = lib.mkOption { description = "Path to Btrbk's snapshot directory."; - example = "/nix/btrbk"; + example = "/btrbk"; type = lib.types.str; }; }; @@ -27,7 +27,5 @@ subvolume = "/home"; }; }; - - systemd.tmpfiles.rules = ["d ${cfg.snapshotDir} 700"]; }; }