From 7e6dd3a8d63fe168dd94d8d0a12c5f2e7ba9f06e Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 18 Dec 2024 22:11:22 +0100 Subject: [PATCH] Update btrfs items --- home-manager/common/software/cli/fish.nix | 4 ++-- nixos/common/software/cli/scripts/btrfs-backup.sh | 2 +- nixos/hosts/nixos-framework/disks.nix | 4 ++-- wallpapers | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix index a93366b5..d363ea0a 100644 --- a/home-manager/common/software/cli/fish.nix +++ b/home-manager/common/software/cli/fish.nix @@ -126,9 +126,9 @@ # BTRFS Related clean-boot-snapshots = '' - echo -e "Deleting boot snapshots...." + echo -en "Deleting boot snapshots...." for i in $(sudo snapper -c root list | grep boot | awk {'print $1'}); - echo -e " $i," + echo -en " $i," sudo snapper -c root delete $i; end echo -e " done." diff --git a/nixos/common/software/cli/scripts/btrfs-backup.sh b/nixos/common/software/cli/scripts/btrfs-backup.sh index 4362ef53..015af71c 100755 --- a/nixos/common/software/cli/scripts/btrfs-backup.sh +++ b/nixos/common/software/cli/scripts/btrfs-backup.sh @@ -39,7 +39,7 @@ BASE_DEST_PATH="/volume1/BTRFS_Receives/`hostname`/${SNAPPER_CONFIG}" DEST_PATH="/volume1/BTRFS_Receives/`hostname`/${SNAPPER_CONFIG}/${NEW_SNAPSHOT}" STATE_FILE="/var/lib/snapper-backup-${SNAPPER_CONFIG}.state" LOG_FILE="/var/log/snapper-backup-${SNAPPER_CONFIG}.log" -KEEP_SNAPSHOTS=5 +KEEP_SNAPSHOTS=14 # Get latest successful transfer number from snapshots with backup description LAST_TRANSFERRED=$(cat "$STATE_FILE" 2>/dev/null || echo "") diff --git a/nixos/hosts/nixos-framework/disks.nix b/nixos/hosts/nixos-framework/disks.nix index 122beb12..20cef485 100644 --- a/nixos/hosts/nixos-framework/disks.nix +++ b/nixos/hosts/nixos-framework/disks.nix @@ -4,8 +4,8 @@ services.cron = { systemCronJobs = [ # Back up Local-Storage to NFS Storage - "0 0 * * 3 albert sudo btrfs-backup root" - "0 2 * * 3 albert sudo btrfs-backup nix" + "0 17 * * * albert sudo btrfs-backup root" + "0 17 * * * albert sudo btrfs-backup nix" # "0 4 * * 3 albert sudo btrfs-backup home" ]; }; diff --git a/wallpapers b/wallpapers index 26552d8b..8ed82c9a 160000 --- a/wallpapers +++ b/wallpapers @@ -1 +1 @@ -Subproject commit 26552d8bade6fa39188ebf68e9ffa1a8dcd75108 +Subproject commit 8ed82c9afaac6359cf4603196f7a5bd4b399a4b5