BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mini-2024-11-24-22-18-47

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-11-24 22:18:47 +01:00
parent 0a36644ff6
commit fe9beaa67b
4 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
flake.lock generated
View File

@ -8,11 +8,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1732047192, "lastModified": 1732150710,
"narHash": "sha256-QVvcbiOgQIMLM5+NrpKxpB3IRKH4ZbP7+WKBISKO1zM=", "narHash": "sha256-H6ps/jlPn3kkGtrZeduLtfMnV8htI117/qUgMtUzJBM=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "d3ec352824dbec68aa0c17851f7424fdc735ecc4", "rev": "4621aec08aa50869a305e275c2b8a0c766f3b59b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -102,11 +102,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732025103, "lastModified": 1732303962,
"narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a46e702093a5c46e192243edbd977d5749e7f294", "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -215,11 +215,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731676054, "lastModified": 1732014248,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -231,11 +231,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1732007104, "lastModified": 1732310578,
"narHash": "sha256-qaWPxgLAvtIHTDcm0qJuc+WNYjcy4ZKigOyn2ag4ihM=", "narHash": "sha256-kk5Cv6wB20ujrB8w2ny5Co20xCHYOjUSyk2VRuP0sZw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0705964c881cea8896474610188905ba41b59b08", "rev": "72f68849662579c8d4e5d13bd4d400723a1d8edd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -264,11 +264,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731954233, "lastModified": 1732186149,
"narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=", "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e", "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
fs-diff.sh
View File

@ -2,10 +2,10 @@
# fs-diff.sh # fs-diff.sh
set -euo pipefail 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 } 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' | sed '$d' |
cut -f17- -d' ' | cut -f17- -d' ' |
sort | sort |

21
machine/framework/configuration.nix
View File

@ -224,22 +224,33 @@ in {
}; };
borgbackup.jobs.home = rec { borgbackup.jobs.home = rec {
repo = "ssh://u278697-sub9@u278697.your-storagebox.de:23/./borg";
compression = "auto,zstd"; compression = "auto,zstd";
encryption = { encryption = {
mode = "repokey-blake2"; mode = "repokey-blake2";
passCommand = "cat ${config.sops.secrets.borg-key.path}"; passCommand = "cat ${config.sops.secrets.borg-key.path}";
}; };
extraCreateArgs = "--stats --verbose --checkpoint-interval 600 --exclude-caches"; extraCreateArgs = "--stats --verbose --checkpoint-interval=600 --exclude-caches";
environment.BORG_RSH = "ssh -i /home/alex/.ssh/id_borg_ed25519"; extraPruneArgs = [
paths = ["/home/alex" "/var/lib"]; "--save-space"
repo = "ssh://u278697-sub9@u278697.your-storagebox.de:23/./borg"; "--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"; startAt = "daily";
prune.keep = { prune.keep = {
daily = 7; daily = 7;
weekly = 4; weekly = 4;
monthly = 6; monthly = 6;
}; };
extraPruneArgs = "--save-space --list --stats";
exclude = map (x: "/home/alex/" + x) be.borg-exclude; exclude = map (x: "/home/alex/" + x) be.borg-exclude;
}; };
}; };

2
machine/mini/configuration.nix
View File

@ -27,7 +27,7 @@
defaultSopsFile = ../../secrets.yaml; defaultSopsFile = ../../secrets.yaml;
validateSopsFiles = true; validateSopsFiles = true;
age = { age = {
sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"];
keyFile = "/var/lib/sops-nix/key.txt"; keyFile = "/var/lib/sops-nix/key.txt";
generateKey = true; generateKey = true;
}; };