From eca35498575b5b76bc2e56d045cf73e266fb815a Mon Sep 17 00:00:00 2001
From: TheWanderingCrow <contact@wanderingcrow.net>
Date: Tue, 18 Mar 2025 09:20:33 -0400
Subject: [PATCH] update restic key layout

---
 flake.lock                         | 8 ++++----
 modules/users/overseer/backups.nix | 8 ++++++--
 modules/users/overseer/secrets.nix | 4 ----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 337078d..88e8334 100644
--- a/flake.lock
+++ b/flake.lock
@@ -172,11 +172,11 @@
     },
     "nix-secrets": {
       "locked": {
-        "lastModified": 1741374154,
-        "narHash": "sha256-O/51DBBSrqx8yD9iQ5q1UBRwFTHdwrvng873h/KtPeU=",
+        "lastModified": 1742303949,
+        "narHash": "sha256-JFJmE1hnIfmUIqTQH3JoTtf5/Bws5TAEOcMviVl0QT8=",
         "ref": "refs/heads/master",
-        "rev": "8f0feec3a43a68641fa85d95b05ec3f4bd4468a3",
-        "revCount": 50,
+        "rev": "16ceae4d06702a6ddbca2e86175b308703a7f477",
+        "revCount": 51,
         "type": "git",
         "url": "ssh://git@github.com/TheWanderingCrow/nix-secrets"
       },
diff --git a/modules/users/overseer/backups.nix b/modules/users/overseer/backups.nix
index 1a60a5e..344db5b 100644
--- a/modules/users/overseer/backups.nix
+++ b/modules/users/overseer/backups.nix
@@ -7,6 +7,10 @@ in
     ...
   }:
     lib.mkIf config.user.overseer.enable {
+      # Restic secrets
+      sops.secrets."restic/borg-base/url" = {};
+      sops.secrets."restic/borg-base/key" = {};
+
       services.restic.backups.borg-base = {
         user = "root";
         timerConfig = {
@@ -27,7 +31,7 @@ in
           # trilium.nix
           "/var/lib/trilium/backup"
         ];
-        repositoryFile = config.sops.secrets."restic/url".path;
-        passwordFile = config.sops.secrets."restic/key".path;
+        repositoryFile = config.sops.secrets."restic/borg-base/url".path;
+        passwordFile = config.sops.secrets."restic/borg-base/key".path;
       };
     }
diff --git a/modules/users/overseer/secrets.nix b/modules/users/overseer/secrets.nix
index 5995322..b1ba101 100644
--- a/modules/users/overseer/secrets.nix
+++ b/modules/users/overseer/secrets.nix
@@ -11,8 +11,4 @@ lib.mkIf config.user.overseer.enable {
     age.keyFile = "/var/lib/sops-nix/key.txt";
     age.generateKey = true;
   };
-
-  # Restic secrets
-  sops.secrets."restic/url" = {};
-  sops.secrets."restic/key" = {};
 }