Compare commits

..

No commits in common. "db0040dcf4ed26fda32f029bc0f1123282c72862" and "d06acb4f551b885e66839a8c6008d45f881050a8" have entirely different histories.

4 changed files with 12 additions and 62 deletions

24
flake.lock generated
View file

@ -356,11 +356,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1756217674, "lastModified": 1755922037,
"narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -372,11 +372,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1756266583, "lastModified": 1756125398,
"narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -392,11 +392,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1756332267, "lastModified": 1756270534,
"narHash": "sha256-SBiHiR+Y074U9OZhnIrIgu/6iLZPxYhlBOmnP7ymBME=", "narHash": "sha256-ao6Bmp1ktX933EEGVEk22Poi2FwimF/GROZf2kioB5o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "1f693539e1da901a6da002555d5480e887a5adc1", "rev": "9824fee9eb7676a3624d8dcf8e36879fdbe5ccf6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -566,11 +566,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1756266583, "lastModified": 1756125398,
"narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,48 +0,0 @@
{
config,
pkgs,
lib,
flakes,
...
}: {
services.borgbackup.jobs = {
rsync = {
paths = [
"/var/lib/forgejo"
"/var/lib/mealie"
"/var/lib/trilium"
];
exclude = [
];
user = "root";
group = "root";
doInit = true;
startAt = [
"hourly"
];
inhibitsSleep = true;
persistentTimer = true;
repo = "zh5777@zh5777.rsync.net:vps";
encryption = {
mode = "repokey-blake2";
passCommand = "cat /var/trust/borg/vps_passphrase";
};
compression = "auto,lz4";
prune = {
keep = {
hourly = 24;
daily = 7;
weekly = 4;
monthly = 12;
yearly = 99;
};
};
extraArgs = [
"--remote-path=borg14"
];
};
};
environment.sessionVariables.BORG_REMOTE_PATH = "borg14";
}

View file

@ -15,7 +15,6 @@ with lib; {
./hardware-configuration.nix ./hardware-configuration.nix
./srv ./srv
./networkMap.nix ./networkMap.nix
./borg.nix
]; ];
local.sys = { local.sys = {

View file

@ -22,7 +22,6 @@ with lib; {
host = "127.0.0.1"; host = "127.0.0.1";
port = 8458; port = 8458;
noAuthentication = false; noAuthentication = false;
noBackup = true; # I already backup the whole dataDir, so no need for this
instanceName = "posixlycorrect"; instanceName = "posixlycorrect";
dataDir = "/var/lib/trilium"; dataDir = "/var/lib/trilium";
nginx = { nginx = {