From 3b27902fc0bf517bbc2b193b304ca5a1669f3d0c Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Sat, 24 May 2025 11:41:01 -0400 Subject: [PATCH] borg --- flake.lock | 24 ++++++------- homes/emenel/default.nix | 36 ++++++++++++++++++++ hosts/eddie/configuration.nix | 64 ++++++++++++++++++----------------- modules/home/music.nix | 4 +++ testpatterns.txt | 10 ++++++ 5 files changed, 95 insertions(+), 43 deletions(-) create mode 100644 testpatterns.txt diff --git a/flake.lock b/flake.lock index ca0259f..03d393a 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1748020806, - "narHash": "sha256-g14/YAdrO5KkWvXoltBgqNHt24jUxRraB79See08nhM=", + "lastModified": 1748078251, + "narHash": "sha256-wkuQa28OX+N/eJXokvau7yOF0rKEUfKHtN6YvB7z4AA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d818fd9717043b794d0012fbc9f6422e12915eaf", + "rev": "972d48193efde5e8618d907e0a4d2751a329a434", "type": "github" }, "original": { @@ -1560,11 +1560,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1747573338, - "narHash": "sha256-L5pVi8lvf916b/eQh4iIOK53kz/hgBmiNZSeFImMHHo=", + "lastModified": 1748097989, + "narHash": "sha256-5i53CqWRUyQZpEWLi848GUon7CcZIM++1k/EiKcd/Qg=", "owner": "wez", "repo": "wezterm", - "rev": "5663e749948df3ed3c2d8ee0bfea6c85226310d9", + "rev": "f150ade689a0daae2658c01e3ae91227a1d1fc74", "type": "github" }, "original": { @@ -1583,11 +1583,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1747111562, - "narHash": "sha256-GAqhWoxaBIk0tgoecZPa8gTHDHxNc0JtlwWHZN2iOOo=", + "lastModified": 1748057133, + "narHash": "sha256-t9XPqehcZYDh4YVDq6w/c/L+MhoE/9MIQSYTQOwMwp8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ec9ff64c1e0cbec42710b580b7c0f759b1694e72", + "rev": "572fa4a2bfe920daacdefc7e564b49115413306a", "type": "github" }, "original": { @@ -1659,11 +1659,11 @@ ] }, "locked": { - "lastModified": 1747998984, - "narHash": "sha256-G5UvtOKD3fmVTnVTh1XCZVoD0HsKO8QI18sMWlYxjLs=", + "lastModified": 1748090150, + "narHash": "sha256-WrcGLv4Q94B2eG+jj5EckQfItR4zTAz/8uX2to4bU4g=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e48b7105d570f5e66e1891292525e585eeffa58d", + "rev": "d25f7e7fc5a2ebcb4c41924b4755eec642e6f18d", "type": "github" }, "original": { diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index f246a85..daf9b13 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -91,9 +91,45 @@ in rclone = { enable = true; }; + + borgmatic = { + enable = true; + backups = { + eddie = { + location = { + excludeHomeManagerSymlinks = true; + patterns = [ + "R /home/emenel" + "- .cache" + "- .nix*" + "- .steam*" + "- Sync" + "- Mounts" + "- .BitwigStudio" + "- .local/share/bitwig" + "- .local/share/flatpak" + ]; + repositories = [ + { + "path" = "ssh://oyi3ydnz@oyi3ydnz.repo.borgbase.com/./repo"; + "label" = "eddie on borgbase"; + } + ]; + }; + retention = { + keepDaily = 7; + keepHourly = 3; + keepMonthly = 6; + }; + }; + }; + }; }; services = { + borgmatic = { + enable = true; + }; gpg-agent = { enable = true; }; diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 2700945..b15dc8e 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -614,37 +614,39 @@ users.groups.uinput = { }; - services.borgmatic = { - enable = true; - configurations = { - eddie = { - patterns = [ - "R /home/emenel" - "- .cache" - "- .nix*" - "- .steam*" - "- Sync" - "- Mounts" - "- .BitwigStudio" - "- .local/share/bitwig" - "- .local/share/flatpak" - "- .local/share/Steam" - ]; - repositories = [ - { - "path" = "ssh://oyi3ydnz@oyi3ydnz.repo.borgbase.com/./repo"; - "label" = "eddie on borgbase"; - } - ]; - keep_daily = 3; - keep_hourly = 3; - keep_monthly = 2; - # btrfs = { - # btrfs_command = "${pkgs.btrfs-progs}/bin/btrfs"; - # }; - }; - }; - }; + # services.borgmatic = { + # enable = true; + # configurations = { + # eddie = { + # source_directories = [ + # "/home/emenel" + # ]; + # exclude_patterns = [ + # "- .cache" + # "- .nix*" + # "- .steam*" + # "- Sync" + # "- Mounts" + # "- .BitwigStudio" + # "- .local/share/bitwig" + # "- .local/share/flatpak" + # "- .local/share/Steam" + # ]; + # repositories = [ + # { + # "path" = "ssh://oyi3ydnz@oyi3ydnz.repo.borgbase.com/./repo"; + # "label" = "eddie on borgbase"; + # } + # ]; + # keep_daily = 3; + # keep_hourly = 3; + # keep_monthly = 2; + # # btrfs = { + # # btrfs_command = "${pkgs.btrfs-progs}/bin/btrfs"; + # # }; + # }; + # }; + # }; #do not change diff --git a/modules/home/music.nix b/modules/home/music.nix index 059ef66..91a4525 100644 --- a/modules/home/music.nix +++ b/modules/home/music.nix @@ -17,6 +17,10 @@ (with pkgs; [ + reaper + reaper-reapack-extension + reaper-sws-extension + bitwig-studio5-3 # needed for bitwigh drivenbymoss extension zenity diff --git a/testpatterns.txt b/testpatterns.txt new file mode 100644 index 0000000..6b2c55e --- /dev/null +++ b/testpatterns.txt @@ -0,0 +1,10 @@ +R /home/emenel +- .cache" +- .nix*" +- .steam*" +- Sync" +- Mounts" +- .BitwigStudio" +- .local/share/bitwig" +- .local/share/flatpak" +- .local/share/Steam"