1 files changed, 13 insertions, 41 deletions

diff --git a/hel.nix b/hel.nix
index 06a0e466..89d15a5a 100644
--- a/hel.nix
+++ b/hel.nix
@@ -15,6 +15,7 @@
       ./custom/tinc/yggdrasil.nix
       ./custom/uucp.nix
       ./custom/btrfs-snapshots.nix
+      ./custom/borgbackup.nix
     ];
 
   system.stateVersion = "16.09";
@@ -524,47 +525,18 @@
 
   systemd.services."NetworkManager-wait-online".enable = true;
 
-  services.btrfs-snapshots.enable = true;
-
-  systemd.timers."backup-odin@home-gkleen" = {
-    enable = true;
-
-    wantedBy = [ "timers.target" ];
-
-    timerConfig = {
-      Persistent = true;
-      OnUnitInactiveSec = "6h";
-    };
-  };
-  systemd.services."backup-odin@" = {
-    enable = true;
-
-    bindsTo = [ "btrfs-snapshot@%i.service" "network-online.target" ];
-    after = [ "btrfs-snapshot@%i.service" "network-online.target" ];
-
-    path = with pkgs; [borgbackup];
-
-    script = ''
-      borg create \
-        --stats \
-        --list \
-        --filter 'AME' \
-        --exclude-caches \
-        --keep-exclude-tags \
-        --patterns-from .backup \
-        --one-file-system \
-        --compression auto,lzma \
-        borg.odin:/srv/backup/borg::yggdrasil.midgard.hel.$1-{utcnow}
-    '';
-    scriptArgs = "%i";
-
-    serviceConfig = {
-      Type = "oneshot";
-      WorkingDirectory = "/mnt/snapshot-%i";
-      Nice = 15;
-      IOSchedulingClass = 2;
-      IOSchedulingPriority = 7;
-      SuccessExitStatus = [1 2];
+  services.backup = {
+    snapshots = "btrfs";
+    prefix = "automatic.yggdrasil.midgard.hel.";
+    targets = {
+      "odin" = {
+        repo = "borg.odin:/srv/backup/borg";
+        paths = [ "home-gkleen" ];
+      };
+      "munin" = {
+        repo = "borg.munin:borg";
+        paths = [ "home-gkleen" ];
+      };
     };
   };
 }