diff --git a/home/Mallorea.nix b/home/Mallorea.nix index 8a43da2..c81b06a 100644 --- a/home/Mallorea.nix +++ b/home/Mallorea.nix @@ -23,30 +23,30 @@ let ${pkgs.notmuch}/bin/notmuch new ''); }; - sync_vault = { - when = "*-*-* 02:00:00"; - script = toString (pkgs.writeShellScript "script" '' - source $HOME/.secrets/Backup/env.sh - for _ in {1..2}; do - OUTPUT=$(echo "$ZFS_PASSPHRASE" | ssh 10.4.0.1 zfs load-key Vault/Thomas/Encrypted 2>&1); - if [ "$OUTPUT" == "Key load error: Key already loaded for 'Vault/Thomas/Encrypted'." ]; then - echo "Key successfully loaded, starting syncoid" - syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas/Workspace 10.4.0.1:Vault/Thomas/Encrypted/Storage/Workspace - syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas 10.4.0.1:Vault/Thomas/Encrypted/Storage/T - syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Emily 10.4.0.1:Vault/Thomas/Encrypted/Storage/N - syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Yolande 10.4.0.1:Vault/Thomas/Encrypted/Storage/Y - syncoid --no-privilege-elevation --no-sync-snap tank/Containers 10.4.0.1:Vault/Thomas/Encrypted/Containers - ssh 10.4.0.1 zfs unload-key Vault/Thomas/Encrypted - ${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/s39pIIrB0R - exit 0 - fi - done - - echo "Found output instead: $OUTPUT" - echo "Failed to load key: $OUTPUT" | sendmail - exit 1 - ''); - }; + # sync_vault = { + # when = "*-*-* 02:00:00"; + # script = toString (pkgs.writeShellScript "script" '' + # source $HOME/.secrets/Backup/env.sh + # for _ in {1..2}; do + # OUTPUT=$(echo "$ZFS_PASSPHRASE" | ssh 10.4.0.1 zfs load-key Vault/Thomas/Encrypted 2>&1); + # if [ "$OUTPUT" == "Key load error: Key already loaded for 'Vault/Thomas/Encrypted'." ]; then + # echo "Key successfully loaded, starting syncoid" + # syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas/Workspace 10.4.0.1:Vault/Thomas/Encrypted/Storage/Workspace + # syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas 10.4.0.1:Vault/Thomas/Encrypted/Storage/T + # syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Emily 10.4.0.1:Vault/Thomas/Encrypted/Storage/N + # syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Yolande 10.4.0.1:Vault/Thomas/Encrypted/Storage/Y + # syncoid --no-privilege-elevation --no-sync-snap tank/Containers 10.4.0.1:Vault/Thomas/Encrypted/Containers + # ssh 10.4.0.1 zfs unload-key Vault/Thomas/Encrypted + # ${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/s39pIIrB0R + # exit 0 + # fi + # done + # + # echo "Found output instead: $OUTPUT" + # echo "Failed to load key: $OUTPUT" | sendmail + # exit 1 + # ''); + # }; backup = { when = "*-*-* 04:00:00"; script = toString (pkgs.writeShellScript "script" '' diff --git a/home/scripts/files/backup.sh b/home/scripts/files/backup.sh index 7e21d84..21dfd96 100755 --- a/home/scripts/files/backup.sh +++ b/home/scripts/files/backup.sh @@ -93,8 +93,8 @@ borg create -s --progress \ echo -e '\n\n\n' echo "Running Workspace Backups" borg create -s --progress \ - 10.4.0.1:Storage/Thomas/Borg/Workspace::'{hostname}-{now}' \ --exclude /home/server/Workspace/TrackBox/Resources \ + 10.4.0.1:Storage/Thomas/Borg/Workspace::'{hostname}-{now}' \ /home/server/Workspace/ borg prune --keep-daily 7 --keep-weekly 4 --keep-monthly -1 --save-space 10.4.0.1:Storage/Thomas/Borg/Workspace borg compact 10.4.0.1:Storage/Thomas/Borg/Workspace diff --git a/home/utils/common.nix b/home/utils/common.nix index db69c3e..3fbe943 100644 --- a/home/utils/common.nix +++ b/home/utils/common.nix @@ -25,12 +25,6 @@ gocryptfs sshfs ]; - programs.nh = { - enable = true; - clean.enable = true; - flake = "/home/user/.dotfiles"; - }; - home.sessionVariables = { XDG_CONFIG_HOME = "${config.xdg.configHome}"; XDG_CACHE_HOME = "${config.xdg.cacheHome}";