Merge branch 'master' of github.com:starr-dusT/dotfiles

home/dot_aliases

@@ -57,3 +57,6 @@ alias dr='docker run --rm --name $(date +%Y%m%d%k%M%S) -p 8082:8082 -v $(pwd):/r
 
 # applications
 alias google-chrome-stable="google-chrome-stable --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'"
+
+# rsync
+alias rsync.net="ssh fm2120@fm2120.rsync.net"

home/dot_config/borgmatic.d/common.yaml

@@ -0,0 +1,12 @@
+keep_daily: 7
+keep_weekly: 4
+keep_monthly: 6
+
+encryption_passcommand: cat /run/agenix/borg/torus/password 
+compression: zstd,22
+checks:
+  - name: repository
+  - name: spot
+    count_tolerance_percentage: 10
+    data_sample_percentage: 1
+    data_tolerance_percentage: 0.5

home/dot_config/borgmatic.d/kestrel_common.yaml

@@ -0,0 +1,15 @@
+source_directories:
+    - "/home/tstarr"
+
+exclude_patterns:
+    - "/home/tstarr/.?*"
+    - "/home/tstarr/mnt"
+    - "/home/tstarr/tmp"
+    - "/home/tstarr/sync"
+    - "/home/tstarr/media/roms"
+    - "/home/tstarr/box"
+    - "/home/tstarr/Downloads"
+
+archive_name_format: 'kestrel.borg-{now}'
+
+<<: !include common.yaml

home/dot_config/borgmatic.d/kestrel_rsync.yaml

@@ -0,0 +1,7 @@
+repositories:
+  - path: ssh://fm2120@fm2120.rsync.net//data2/home/fm2120/store/kestrel.borg
+    label: rsync
+
+remote_path: borg1
+
+<<: !include kestrel_common.yaml

home/dot_config/borgmatic.d/kestrel_torus.yaml

@@ -0,0 +1,5 @@
+repositories:
+  - path: ssh://tstarr@torus//engi/store/kestrel.borg
+    label: torus
+
+<<: !include kestrel_common.yaml

home/dot_config/borgmatic.d/torus_common.yaml

@@ -10,15 +10,4 @@ exclude_patterns:
 
 archive_name_format: 'torus.borg-{now}'
 
-keep_daily: 7
-keep_weekly: 4
-keep_monthly: 6
-
-encryption_passcommand: cat /run/agenix/borg/torus/password 
-compression: zstd,22
-checks:
-  - name: repository
-  - name: spot
-    count_tolerance_percentage: 10
-    data_sample_percentage: 1
-    data_tolerance_percentage: 0.5
+<<: !include common.yaml

provision/hosts/kestrel/backup.nix

@@ -25,6 +25,11 @@
     owner = "${user}";
     group = "users";
   };
+  age.secrets."borg/torus/password" = {
+    file = ../../secrets/borg/torus/password.age;
+    owner = "${user}";
+    group = "users";
+  };
 
   # Password-less logins for backup
   users.users."${user}".openssh.authorizedKeys.keyFiles = [