From 6daa32c22244748a3f7a6ff468baf6d75f3fae81 Mon Sep 17 00:00:00 2001
From: wi11-holdsworth <83637728+wi11-holdsworth@users.noreply.github.com>
Date: Wed, 1 Oct 2025 15:16:14 +1000
Subject: [PATCH] style: run pre-commit hook

---
 modules/nixos/features/borgmatic.nix | 34 ++++++++++++++--------------
 secrets/secrets.nix                  |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/nixos/features/borgmatic.nix b/modules/nixos/features/borgmatic.nix
index e0bf694..d7c60b6 100644
--- a/modules/nixos/features/borgmatic.nix
+++ b/modules/nixos/features/borgmatic.nix
@@ -14,24 +14,11 @@ in
       settings = {
         # keep-sorted start block=yes
         compression = "auto,zlib";
-        keep_daily = 7;
-        keep_weekly = 4;
-        keep_monthly = 6;
-        keep_yearly = 1;
-        repositories = [
-          {
-            path = "/backup/repo";
-            label = "onsite";
-            # encryption = "repokey-blake2";
-          }
-          {
-            path = "ssh://vuc5c3xq@vuc5c3xq.repo.borgbase.com/./repo";
-            label = "offsite";
-            # encryption = "repokey-blake2";
-          }
-        ];
         encryption_passcommand = "cat ${config.age.secrets.borgmatic.path}";
-        ssh_command = "ssh -i /home/srv/.ssh/id_ed25519";
+        keep_daily = 7;
+        keep_monthly = 6;
+        keep_weekly = 4;
+        keep_yearly = 1;
         ntfy = {
           topic = "backups";
           server = config.services.ntfy-sh.settings.base-url;
@@ -50,8 +37,21 @@ in
             "fail"
           ];
         };
+        repositories = [
+          {
+            path = "/backup/repo";
+            label = "onsite";
+            # encryption = "repokey-blake2";
+          }
+          {
+            path = "ssh://vuc5c3xq@vuc5c3xq.repo.borgbase.com/./repo";
+            label = "offsite";
+            # encryption = "repokey-blake2";
+          }
+        ];
         retries = 3;
         retry_wait = 10;
+        ssh_command = "ssh -i /home/srv/.ssh/id_ed25519";
         # keep-sorted end
       };
     };
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 181d565..4186baa 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -15,8 +15,8 @@ let
 in
 {
   # keep-sorted start
-  "borgmatic.age".publicKeys = users;
   "borgmatic-pg.age".publicKeys = users;
+  "borgmatic.age".publicKeys = users;
   "copyparty-will.age".publicKeys = users;
   "immich.age".publicKeys = users;
   "jellyfin.age".publicKeys = users;