From 7a31516be1db5524329cacee83fa55bbb66f1213 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Tue, 1 Jul 2025 16:47:08 +0200 Subject: [PATCH 1/3] chore(temp): set address for dandelion --- modules/services/borg.nix | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/modules/services/borg.nix b/modules/services/borg.nix index b318cec..49f8dc4 100644 --- a/modules/services/borg.nix +++ b/modules/services/borg.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: let hostname = "violet"; - repo = "ssh://dandelion.booping.local:${toString config.services.openssh.ports}/spinners/rootvol/backups/${hostname}"; + repo = "ssh://dandelion:${toString config.services.openssh.ports}/spinners/rootvol/backups/${hostname}"; in { services.borgbackup.jobs = { @@ -10,6 +10,7 @@ in "/home/liv/MinecraftDocker" ]; repo = "${repo}/MinecraftDocker-tulip"; + encryption.mode = "none"; compression = "auto,zstd"; startAt = "daily"; postHook = '' @@ -25,6 +26,7 @@ in "/var/lib" ]; repo = "${repo}/var-lib"; + encryption.mode = "none"; compression = "auto,zstd"; startAt = "daily"; postHook = '' @@ -35,29 +37,5 @@ in fi ''; }; - # "violet-random" = { - # paths = [ - # "/random" - # ]; - # exclude = [ - # "/random/a" - # "/random/a" - # ]; - # encryption = { - # mode = ""; - # passCommand = ""; - # }; - # environment.BORG_RSH = "ssh -i ${config.sops.secrets."ssh_private_key_violet".path}"; - # repo = "${repo}/violet/random"; - # compression = "auto,zstd"; - # startAt = "daily"; - # postHook = '' - # if [ $exitStatus -eq 2 ]; then - # ${pkgs.ntfy-sh}/bin/ntfy send https://ntfy.${domain}/nixbox "BorgBackup: nixbox backup failed with errors" - # else - # ${pkgs.ntfy-sh}/bin/ntfy send https://ntfy.${domain}/nixbox "BorgBackup: nixbox backup completed succesfully with exit status $exitStatus" - # fi - # ''; - # }; }; } From e5556c99a181a7c2f98db4149f5ca71d8a85fa0e Mon Sep 17 00:00:00 2001 From: Ahwx Date: Tue, 1 Jul 2025 20:29:55 +0200 Subject: [PATCH 2/3] chore: update, still doesn't work --- modules/services/borg.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/services/borg.nix b/modules/services/borg.nix index 49f8dc4..2b9e9af 100644 --- a/modules/services/borg.nix +++ b/modules/services/borg.nix @@ -1,7 +1,12 @@ -{ pkgs, config, ... }: +{ + pkgs, + config, + username, + ... +}: let hostname = "violet"; - repo = "ssh://dandelion:${toString config.services.openssh.ports}/spinners/rootvol/backups/${hostname}"; + baseRepo = "ssh://liv@dandelion:9123/spinners/rootvol/backups/${hostname}"; in { services.borgbackup.jobs = { @@ -9,10 +14,10 @@ in paths = [ "/home/liv/MinecraftDocker" ]; - repo = "${repo}/MinecraftDocker-tulip"; + repo = "${baseRepo}/MinecraftDocker-tulip"; encryption.mode = "none"; - compression = "auto,zstd"; - startAt = "daily"; + compression = "auto,zstd,10"; + startAt = [ "3:00" ]; postHook = '' if [ $exitStatus -eq 2 ]; then ${pkgs.ntfy-sh}/bin/ntfy send https://ntfy.liv.town/${hostname} "borgbackup: ${hostname} backup (violet-minecraft) failed with errors" @@ -20,12 +25,13 @@ in ${pkgs.ntfy-sh}/bin/ntfy send https://ntfy.liv.town/${hostname} "borgbackup: ${hostname} backup (violet-minecraft) completed succesfully with exit status $exitStatus" fi ''; + user = "${username}"; }; "violet-lib" = { paths = [ "/var/lib" ]; - repo = "${repo}/var-lib"; + repo = "${baseRepo}/var-lib"; encryption.mode = "none"; compression = "auto,zstd"; startAt = "daily"; @@ -36,6 +42,7 @@ in ${pkgs.ntfy-sh}/bin/ntfy send https://ntfy.liv.town/${hostname} "borgbackup: ${hostname} backup (violet-lib) completed succesfully with exit status $exitStatus" fi ''; + user = "${username}"; }; }; } From 9594c6f928b83939cc39f59b1bbba1dff3c9c30d Mon Sep 17 00:00:00 2001 From: Ahwx Date: Tue, 1 Jul 2025 20:30:00 +0200 Subject: [PATCH 3/3] feat: import borg --- modules/services/violet.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/violet.nix b/modules/services/violet.nix index 804e1b0..d09612b 100644 --- a/modules/services/violet.nix +++ b/modules/services/violet.nix @@ -3,6 +3,7 @@ imports = [ (import ./invidious.nix) ] ++ [ (import ./anubis.nix) ] + ++ [ (import ./borg.nix) ] ++ [ (import ./binternet-proxy.nix) ] ++ [ (import ./docker.nix) ] ++ [ (import ./frp.nix) ]