From fe9beaa67b4bdaff779289d5d16b56b5ccec0cbe Mon Sep 17 00:00:00 2001
From: Alexander Szczepanski <alexander@szczepan.ski>
Date: Sun, 24 Nov 2024 22:18:47 +0100
Subject: [PATCH] mini-2024-11-24-22-18-47

---
 flake.lock                          | 30 ++++++++++++++---------------
 fs-diff.sh                          |  4 ++--
 machine/framework/configuration.nix | 21 +++++++++++++++-----
 machine/mini/configuration.nix      |  2 +-
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5d45ea4..5ada787 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1732047192,
-        "narHash": "sha256-QVvcbiOgQIMLM5+NrpKxpB3IRKH4ZbP7+WKBISKO1zM=",
+        "lastModified": 1732150710,
+        "narHash": "sha256-H6ps/jlPn3kkGtrZeduLtfMnV8htI117/qUgMtUzJBM=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "d3ec352824dbec68aa0c17851f7424fdc735ecc4",
+        "rev": "4621aec08aa50869a305e275c2b8a0c766f3b59b",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732025103,
-        "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
+        "lastModified": 1732303962,
+        "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
+        "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c",
         "type": "github"
       },
       "original": {
@@ -215,11 +215,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731676054,
-        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
+        "lastModified": 1732014248,
+        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
         "type": "github"
       },
       "original": {
@@ -231,11 +231,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1732007104,
-        "narHash": "sha256-qaWPxgLAvtIHTDcm0qJuc+WNYjcy4ZKigOyn2ag4ihM=",
+        "lastModified": 1732310578,
+        "narHash": "sha256-kk5Cv6wB20ujrB8w2ny5Co20xCHYOjUSyk2VRuP0sZw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0705964c881cea8896474610188905ba41b59b08",
+        "rev": "72f68849662579c8d4e5d13bd4d400723a1d8edd",
         "type": "github"
       },
       "original": {
@@ -264,11 +264,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731954233,
-        "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=",
+        "lastModified": 1732186149,
+        "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=",
         "owner": "mic92",
         "repo": "sops-nix",
-        "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e",
+        "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699",
         "type": "github"
       },
       "original": {
diff --git a/fs-diff.sh b/fs-diff.sh
index bd581d0..ef450df 100755
--- a/fs-diff.sh
+++ b/fs-diff.sh
@@ -2,10 +2,10 @@
 # fs-diff.sh
 set -euo pipefail
 
-OLD_TRANSID=$(sudo btrfs subvolume find-new /mnt/root-blank 9999999)
+OLD_TRANSID=$(sudo btrfs subvolume find-new /fs-diff/root-blank 9999999)
 OLD_TRANSID=${OLD_TRANSID#transid marker was }
 
-sudo btrfs subvolume find-new "/mnt/root" "$OLD_TRANSID" |
+sudo btrfs subvolume find-new "/fs-diff/root" "$OLD_TRANSID" |
 sed '$d' |
 cut -f17- -d' ' |
 sort |
diff --git a/machine/framework/configuration.nix b/machine/framework/configuration.nix
index 1f8f1e6..e95c87f 100644
--- a/machine/framework/configuration.nix
+++ b/machine/framework/configuration.nix
@@ -224,22 +224,33 @@ in {
     };
 
     borgbackup.jobs.home = rec {
+      repo = "ssh://u278697-sub9@u278697.your-storagebox.de:23/./borg";
+      
       compression = "auto,zstd";
       encryption = {
         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_ed25519";
-      paths = ["/home/alex" "/var/lib"];
-      repo = "ssh://u278697-sub9@u278697.your-storagebox.de:23/./borg";
+      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_ed25519";
+        BORG_BASE_DIR = "/persist/borg";
+      };
+      readWritePaths = ["/persist/borg"];
+      paths = ["/home/alex" "/persist"];
       startAt = "daily";
       prune.keep = {
         daily = 7;
         weekly = 4;
         monthly = 6;
       };
-      extraPruneArgs = "--save-space --list --stats";
       exclude = map (x: "/home/alex/" + x) be.borg-exclude;
     };
   };
diff --git a/machine/mini/configuration.nix b/machine/mini/configuration.nix
index 9af85cc..4fa213d 100644
--- a/machine/mini/configuration.nix
+++ b/machine/mini/configuration.nix
@@ -27,7 +27,7 @@
     defaultSopsFile = ../../secrets.yaml;
     validateSopsFiles = true;
     age = {
-      sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
+      sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"];
       keyFile = "/var/lib/sops-nix/key.txt";
       generateKey = true;
     };