fix(backups): fix & improve ripgrep matching

services/restic/common.nix

@@ -8,7 +8,8 @@ with lib;
 with builtins;
 let hasAnyAttr = flip (attrset: any (flip hasAttr attrset));
 in {
-  resticConfig = args@{ name, extraPruneOpts ? [ ], ... }:
+  resticConfig = args@{ name, ripgrep ? false, paths ? [ ], ignorePatterns ? [ ]
+    , extraPruneOpts ? [ ], ... }:
     assert !hasAnyAttr [
       "initialize"
       "repository"
@@ -16,21 +17,39 @@ in {
       "passwordFile"
       "pruneOpts"
     ] args;
-    (removeAttrs args [ "name" "extraPruneOpts" ]) // {
+    assert (args ? paths);
+    assert (ripgrep || (!ripgrep && !(args ? ignorePatterns)));
+    {
       initialize = true;
       repository = "b2:felschr-backups:/${name}";
       environmentFile = "/etc/nixos/secrets/restic/b2";
       passwordFile = "/etc/nixos/secrets/restic/password";
-      timerConfig = if (args ? timerConfig) then
+      timerConfig.OnCalendar = "daily";
-        args.timerConfig
+      paths = if ripgrep then null else paths;
-      else {
+      dynamicFilesFrom = if ripgrep then
-        OnCalendar = "daily";
+        let
-      };
+          files = foldl (a: b: "${a} ${b}") "" paths;
+          ignoreFile = builtins.toFile "ignore"
+            (foldl (a: b: a + "\n" + b) "" ignorePatterns);
+        in ''
+          ${pkgs.ripgrep}/bin/rg \
+            --files ${files} \
+            --ignore-file ${ignoreFile} \
+            | sed "s/\[/\\\[/" | sed "s/\]/\\\]/"
+        ''
+      else
+        null;
       pruneOpts = [
         "--keep-daily 7"
         "--keep-weekly 4"
         "--keep-monthly 3"
         "--keep-yearly 1"
       ] ++ extraPruneOpts;
-    };
+    } // (removeAttrs args [
+      "name"
+      "ripgrep"
+      "paths"
+      "ignorePatterns"
+      "extraPruneOpts"
+    ]);
 }

services/restic/home-pc.nix

@@ -12,27 +12,25 @@ in {
 
   services.restic.backups.full = common.resticConfig {
     name = "home-pc";
-    dynamicFilesFrom = let
+    ripgrep = true;
-      ignore = builtins.toFile "excludes" ''
+    paths = [ "/etc/nixos" "/var/lib" "/home" ];
-        /var/lib/lxcfs
+    ignorePatterns = [
-        /var/lib/docker
+      "/var/lib/systemd"
-        /home/*/.local/share/Trash
+      "/var/lib/lxcfs"
-        /home/*/.cache
+      "/var/lib/docker"
-        /home/*/Downloads
+      "/var/lib/flatpak"
-        /home/*/.npm
+      "/home/*/.local/share/Trash"
-        /home/*/Games
+      "/home/*/.cache"
-        /home/*/.steam
+      "/home/*/Downloads"
-        /home/*/.local/share/Steam
+      "/home/*/.npm"
-        /home/*/.local/share/lutris
+      "/home/*/Games"
-        /home/felschr/media
+      "/home/*/.steam"
-        /home/felschr/sync
+      "/home/*/.local/share/Steam"
-        /home/felschr/keybase
+      "/home/*/.local/share/lutris"
-      '';
+      "/home/felschr/media"
-    in ''
+      "/home/felschr/sync"
-      ${pkgs.ripgrep}/bin/rg \
+      "/home/felschr/keybase"
-        --files /etc/nixos /var/lib /home \
+    ];
-        --ignore-file ${ignore}
-    '';
     timerConfig.OnCalendar = "0/4:00:00";
     extraPruneOpts = [ "--keep-last 6" ];
   };

services/restic/rpi4.nix

@@ -12,17 +12,18 @@ in {
 
   services.restic.backups.full = common.resticConfig {
     name = "rpi4";
+    ripgrep = true;
     paths = [ "/etc/nixos" "/var/lib" "/home" ];
+    ignorePatterns = [
+      "/var/lib/lxcfs"
+      "/var/lib/docker"
+      "/var/lib/flatpak"
+      "/var/lib/systemd"
+      "/home/*/.local/share/Trash"
+      "/home/*/.cache"
+      "/var/lib/jellyfin/transcodes"
+    ];
     timerConfig.OnCalendar = "0/4:00:00";
     extraPruneOpts = [ "--keep-last 6" ];
-    extraOptions = let
-      exclude = ''
-        /var/lib/lxcfs
-        /var/lib/docker
-        /home/*/.local/share/Trash
-        /home/*/.cache
-        /var/lib/jellyfin/transcodes
-      '';
-    in [ "--exclude=/var/lib/jellyfin/transcodes" ];
   };
 }