From a2486cab219e690c6f2d01b779b18c523958c7a3 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Mon, 23 Sep 2024 13:53:21 -0700 Subject: [PATCH] move options around in borgmatic and add ustop --- home/dot_config/borgmatic.d/common.yaml | 1 - home/dot_config/borgmatic.d/kestrel_common.yaml | 1 + home/dot_config/borgmatic.d/torus_apps.yaml | 2 ++ home/dot_config/borgmatic.d/torus_bulk.yaml | 2 ++ home/dot_config/borgmatic.d/torus_media.yaml | 8 ++++++++ home/dot_config/borgmatic.d/usage.md | 13 +++++++++++++ provision/modules/services/peripherals.nix | 1 + 7 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 home/dot_config/borgmatic.d/torus_media.yaml create mode 100644 home/dot_config/borgmatic.d/usage.md diff --git a/home/dot_config/borgmatic.d/common.yaml b/home/dot_config/borgmatic.d/common.yaml index 781677a6..12bd65d4 100644 --- a/home/dot_config/borgmatic.d/common.yaml +++ b/home/dot_config/borgmatic.d/common.yaml @@ -3,7 +3,6 @@ keep_weekly: 4 keep_monthly: 6 encryption_passcommand: cat /run/agenix/borg/torus/password -compression: zstd,22 checks: - name: repository - name: spot diff --git a/home/dot_config/borgmatic.d/kestrel_common.yaml b/home/dot_config/borgmatic.d/kestrel_common.yaml index d39baaa6..39b72bba 100644 --- a/home/dot_config/borgmatic.d/kestrel_common.yaml +++ b/home/dot_config/borgmatic.d/kestrel_common.yaml @@ -1,3 +1,4 @@ +compression: zstd,22 repositories: - path: ssh://tstarr@torus//engi/store/kestrel.borg label: torus diff --git a/home/dot_config/borgmatic.d/torus_apps.yaml b/home/dot_config/borgmatic.d/torus_apps.yaml index dee39861..e76cab7e 100644 --- a/home/dot_config/borgmatic.d/torus_apps.yaml +++ b/home/dot_config/borgmatic.d/torus_apps.yaml @@ -14,4 +14,6 @@ after_backup: archive_name_format: 'torus_apps.borg-{now}' +compression: zstd,22 + <<: !include torus_common.yaml diff --git a/home/dot_config/borgmatic.d/torus_bulk.yaml b/home/dot_config/borgmatic.d/torus_bulk.yaml index 2663b29d..983446e6 100644 --- a/home/dot_config/borgmatic.d/torus_bulk.yaml +++ b/home/dot_config/borgmatic.d/torus_bulk.yaml @@ -8,4 +8,6 @@ before_backup: archive_name_format: 'torus_bulk.borg-{now}' +compression: zstd,22 + <<: !include torus_common.yaml diff --git a/home/dot_config/borgmatic.d/torus_media.yaml b/home/dot_config/borgmatic.d/torus_media.yaml new file mode 100644 index 00000000..287b3336 --- /dev/null +++ b/home/dot_config/borgmatic.d/torus_media.yaml @@ -0,0 +1,8 @@ +source_directories: + - /engi/media + +archive_name_format: 'torus_media.borg-{now}' + +compression: lz4 + +<<: !include torus_common.yaml diff --git a/home/dot_config/borgmatic.d/usage.md b/home/dot_config/borgmatic.d/usage.md new file mode 100644 index 00000000..29c9c451 --- /dev/null +++ b/home/dot_config/borgmatic.d/usage.md @@ -0,0 +1,13 @@ +# Usage + +# Example commands for rsync.net repos +``` +sudo borgmatic init --repository {repo} --encryption repokey --override remote_path=borg1 --config {config_file} +sudo borgmatic create --repository {repo} --list --stats --override remote_path=borg1 --config {config_file} +``` + +# Example commands for local repos +``` +sudo borgmatic init --repository {repo} --encryption repokey --config {config_file} +sudo borgmatic create --repository {repo} --list --stats --config {config_file} +``` diff --git a/provision/modules/services/peripherals.nix b/provision/modules/services/peripherals.nix index 52a13cc1..caacaa65 100644 --- a/provision/modules/services/peripherals.nix +++ b/provision/modules/services/peripherals.nix @@ -11,6 +11,7 @@ in { pavucontrol # Simple GTK based mixer for the PulseAudio sound server libimobiledevice # Library to support iPhone, iPod Touch and iPad devices on Linux ifuse # fuse filesystem implementation to access the contents of iOS devices + usbtop ]; security.rtkit.enable = true;