diff --git a/nixos/ninurta/configuration.nix b/nixos/ninurta/configuration.nix index 46562a8..d4eed97 100644 --- a/nixos/ninurta/configuration.nix +++ b/nixos/ninurta/configuration.nix @@ -237,38 +237,33 @@ in services.snapper = { cleanupInterval = "1d"; - snapshotInterval = "daily"; + snapshotInterval = "hourly"; configs.home = { SUBVOLUME = "/home"; TIMELINE_CREATE = true; TIMELINE_CLEANUP = true; - TIMELINE_MIN_AGE = "1800"; - TIMELINE_LIMIT_HOURLY = "5"; - TIMELINE_LIMIT_DAILY = "7"; - TIMELINE_LIMIT_WEEKLY = "0"; - TIMELINE_LIMIT_MONTHLY = "0"; - TIMELINE_LIMIT_YEARLY = "0"; + TIMELINE_LIMIT_HOURLY = "24"; + TIMELINE_LIMIT_DAILY = "13"; + TIMELINE_LIMIT_WEEKLY = "6"; + TIMELINE_LIMIT_MONTHLY = "3"; }; configs.var = { SUBVOLUME = "/var"; TIMELINE_CREATE = true; TIMELINE_CLEANUP = true; - TIMELINE_MIN_AGE = "1800"; - TIMELINE_LIMIT_HOURLY = "5"; - TIMELINE_LIMIT_DAILY = "7"; - TIMELINE_LIMIT_WEEKLY = "0"; - TIMELINE_LIMIT_MONTHLY = "0"; - TIMELINE_LIMIT_YEARLY = "0"; + TIMELINE_LIMIT_HOURLY = "24"; + TIMELINE_LIMIT_DAILY = "13"; + TIMELINE_LIMIT_WEEKLY = "6"; + TIMELINE_LIMIT_MONTHLY = "3"; }; configs.storage = { SUBVOLUME = "/mnt/storage"; TIMELINE_CREATE = true; TIMELINE_CLEANUP = true; - TIMELINE_LIMIT_HOURLY = "10"; - TIMELINE_LIMIT_DAILY = "10"; - TIMELINE_LIMIT_WEEKLY = "10"; - TIMELINE_LIMIT_MONTHLY = "10"; - TIMELINE_LIMIT_YEARLY = "10"; + TIMELINE_LIMIT_HOURLY = "24"; + TIMELINE_LIMIT_DAILY = "13"; + TIMELINE_LIMIT_WEEKLY = "6"; + TIMELINE_LIMIT_MONTHLY = "3"; }; }; diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix index 9c98cbe..5f7dfaf 100644 --- a/nixos/stolas/default.nix +++ b/nixos/stolas/default.nix @@ -118,45 +118,6 @@ browsing = true; }; tlp.enable = false; - snapper = { - cleanupInterval = "1d"; - snapshotInterval = "hourly"; - configs = { - home = { - SUBVOLUME = "/dadada"; - ALLOW_USERS= "dadada"; - TIMELINE_CREATE = true; - TIMELINE_CLEANUP = true; - TIMELINE_MIN_AGE = "1800"; - TIMELINE_LIMIT_HOURLY = "5"; - TIMELINE_LIMIT_DAILY = "7"; - TIMELINE_LIMIT_WEEKLY = "0"; - TIMELINE_LIMIT_MONTHLY = "0"; - TIMELINE_LIMIT_YEARLY = "0"; - }; - var = { - SUBVOLUME = "/var"; - TIMELINE_CREATE = true; - TIMELINE_CLEANUP = true; - TIMELINE_MIN_AGE = "1800"; - TIMELINE_LIMIT_HOURLY = "5"; - TIMELINE_LIMIT_DAILY = "7"; - TIMELINE_LIMIT_WEEKLY = "0"; - TIMELINE_LIMIT_MONTHLY = "0"; - TIMELINE_LIMIT_YEARLY = "0"; - }; - paperless = { - SUBVOLUME = "/paperless"; - TIMELINE_CREATE = true; - TIMELINE_CLEANUP = true; - TIMELINE_MIN_AGE = "3600"; - TIMELINE_LIMIT_HOURLY = "10"; - TIMELINE_LIMIT_DAILY = "10"; - TIMELINE_LIMIT_WEEKLY = "10"; - TIMELINE_LIMIT_MONTHLY = "10"; - TIMELINE_LIMIT_YEARLY = "10"; - }; - }; }; system = { @@ -172,12 +133,6 @@ HibernateDelaySec=1h ''; - systemd.tmpfiles.rules = [ - "v /var/.snapshots 0755 root root - -" - "v /var/paperless/.snapshots 0755 root root - -" - "v /home/dadada/.snapshots 0755 root root - -" - ]; - virtualisation.libvirtd.enable = true; users = {