From 585bd0df2a5f591d9cbc571e241bc6e71fae8975 Mon Sep 17 00:00:00 2001 From: Alexander Szczepanski Date: Fri, 22 Nov 2024 19:23:45 +0100 Subject: [PATCH] vps-arm-2024-11-22-19-23-45 --- machine/vps-arm/configuration.nix | 23 +++++++++++++++++------ services/nextcloud.nix | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/machine/vps-arm/configuration.nix b/machine/vps-arm/configuration.nix index 9bd0305..d76d1f1 100755 --- a/machine/vps-arm/configuration.nix +++ b/machine/vps-arm/configuration.nix @@ -317,20 +317,31 @@ in { mode = "repokey-blake2"; passCommand = "cat ${config.sops.secrets.borg-key.path}"; }; - extraCreateArgs = "--stats --verbose --checkpoint-interval 600 --exclude-caches"; - environment.BORG_RSH = "ssh -i /home/alex/.ssh/id_borg_rsa"; + extraCreateArgs = "--stats --verbose --checkpoint-interval=600 --exclude-caches"; + extraPruneArgs = [ + "--save-space" + "--stats" + ]; + extraCompactArgs = [ + "--cleanup-commits" + ]; + environment = { + BORG_RSH = "ssh -i /home/alex/.ssh/id_borg_rsa"; + BORG_BASE_DIR = "/persist/borg"; + }; + readWritePaths = ["/persist/borg"]; paths = ["/home/alex" "/persist"]; repo = "ssh://u278697-sub3@u278697.your-storagebox.de:23/./borg-arm"; startAt = "daily"; prune.keep = { - daily = 4; - weekly = 2; - monthly = 2; + daily = 7; + weekly = 4; + monthly = 6; }; - extraPruneArgs = "--save-space --stats"; exclude = [ "/home/alex/mounted" "/home/alex/.cache" + "/persist/borg" ]; }; }; diff --git a/services/nextcloud.nix b/services/nextcloud.nix index 8473805..154e412 100644 --- a/services/nextcloud.nix +++ b/services/nextcloud.nix @@ -29,7 +29,7 @@ }; nextcloud = { - enable = false; + enable = true; hostName = "nextcloud.szczepan.ski"; # Need to manually increment with every major upgrade.