diff --git a/disko/hetzner-zfs-impermanence.nix b/disko/hetzner-zfs-impermanence.nix index 0f6e361..556e61c 100644 --- a/disko/hetzner-zfs-impermanence.nix +++ b/disko/hetzner-zfs-impermanence.nix @@ -41,12 +41,6 @@ compression = "zstd"; }; datasets = { - root = { - type = "zfs_fs"; - mountpoint = "/"; - options.mountpoint = "legacy"; - postCreateHook = "zfs snapshot zroot/root@blank"; - }; nix = { type = "zfs_fs"; mountpoint = "/nix"; @@ -60,14 +54,11 @@ }; mountpoint = "/persist"; }; - home = { + root = { type = "zfs_fs"; - options = { - mountpoint = "legacy"; - "com.sun:auto-snapshot" = "true"; - }; - mountpoint = "/home"; - postCreateHook = "zfs snapshot zroot/home@blank"; + mountpoint = "/"; + options.mountpoint = "legacy"; + postCreateHook = "zfs snapshot zroot/root@blank"; }; }; }; diff --git a/disko/zfs-impermanence-backup.nix b/disko/zfs-impermanence-backup.nix index cdc63a4..1d28f79 100644 --- a/disko/zfs-impermanence-backup.nix +++ b/disko/zfs-impermanence-backup.nix @@ -45,12 +45,6 @@ compression = "zstd"; }; datasets = { - root = { - type = "zfs_fs"; - mountpoint = "/"; - options.mountpoint = "legacy"; - postCreateHook = "zfs snapshot zroot/root@blank"; - }; nix = { type = "zfs_fs"; mountpoint = "/nix"; @@ -64,14 +58,11 @@ }; mountpoint = "/persist"; }; - home = { + root = { type = "zfs_fs"; - options = { - mountpoint = "legacy"; - "com.sun:auto-snapshot" = "true"; - }; - mountpoint = "/home"; - postCreateHook = "zfs snapshot zroot/home@blank"; + mountpoint = "/"; + options.mountpoint = "legacy"; + postCreateHook = "zfs snapshot zroot/root@blank"; }; backups = { type = "zfs_fs"; diff --git a/disko/zfs-impermanence.nix b/disko/zfs-impermanence.nix index c56f72c..60a0eff 100644 --- a/disko/zfs-impermanence.nix +++ b/disko/zfs-impermanence.nix @@ -45,12 +45,6 @@ compression = "zstd"; }; datasets = { - root = { - type = "zfs_fs"; - mountpoint = "/"; - options.mountpoint = "legacy"; - postCreateHook = "zfs snapshot zroot/root@blank"; - }; nix = { type = "zfs_fs"; mountpoint = "/nix"; @@ -64,14 +58,11 @@ }; mountpoint = "/persist"; }; - home = { + root = { type = "zfs_fs"; - options = { - mountpoint = "legacy"; - "com.sun:auto-snapshot" = "true"; - }; - mountpoint = "/home"; - postCreateHook = "zfs snapshot zroot/home@blank"; + mountpoint = "/"; + options.mountpoint = "legacy"; + postCreateHook = "zfs snapshot zroot/root@blank"; }; }; }; diff --git a/modules/platform/impermanence.nix b/modules/platform/impermanence.nix index 1c94524..6da3661 100644 --- a/modules/platform/impermanence.nix +++ b/modules/platform/impermanence.nix @@ -21,9 +21,9 @@ in ]; directories = [ - "/var/lib/systemd/timers" "/var/lib/nixos" - "/var/log" + "/var/lib/systemd" + "/var/log/journal" ]; }; @@ -43,7 +43,6 @@ in boot.initrd.postResumeCommands = lib.mkAfter '' zfs rollback -r zroot/root@blank - zfs rollback -r zroot/home@blank ''; }; }