From b5566128957c1a2cc3b3365f29ca4912dfc133c8 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 10 Apr 2026 14:15:55 -0400
Subject: [PATCH] [marvin] reorder service secrets

---
 hosts/marvin/services/secrets/secrets.nix | 39 +++++++++++++----------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/hosts/marvin/services/secrets/secrets.nix b/hosts/marvin/services/secrets/secrets.nix
index 706c463f..e13e2bf7 100644
--- a/hosts/marvin/services/secrets/secrets.nix
+++ b/hosts/marvin/services/secrets/secrets.nix
@@ -11,11 +11,26 @@ in
 {
   "anubis-key.age".publicKeys = marvinDefault;
   "authentik-env.age".publicKeys = marvinDefault;
-  # "buildbot/gitea-token.age".publicKeys = marvinDefault;
-  # "buildbot/oauth-secret.age".publicKeys = marvinDefault;
-  # "buildbot/worker-password.age".publicKeys = marvinDefault;
-  # "buildbot/workers.age".publicKeys = marvinDefault;
   "cache-key.age".publicKeys = marvinDefault;
+  "golink-authkey.age".publicKeys = marvinDefault;
+  "jellyfin-exporter-config.age".publicKeys = marvinDefault;
+  "mail-archiver-secrets.age".publicKeys = marvinDefault;
+  "minio-root.age".publicKeys = marvinDefault;
+  "miniflux-admin.age".publicKeys = marvinDefault;
+  "../nextcloud/nextcloud-admin-pw.age".publicKeys = marvinDefault;
+  "nix-serve-priv.age".publicKeys = marvinDefault;
+  "pinchflat-secrets.age".publicKeys = marvinDefault;
+  "planka-env.age".publicKeys = marvinDefault;
+  "pocket-id-secrets.age".publicKeys = marvinDefault;
+  "shelfmark-secrets.age".publicKeys = marvinDefault;
+  "vaultwarden-vars.age".publicKeys = marvinDefault;
+  "webmentiond-env.age".publicKeys = marvinDefault;
+
+  "buildbot/gitea-token.age".publicKeys = marvinDefault;
+  "buildbot/oauth-secret.age".publicKeys = marvinDefault;
+  "buildbot/worker-password.age".publicKeys = marvinDefault;
+  "buildbot/workers.age".publicKeys = marvinDefault;
+
   "forgejo/aux-docs-runner-token.age".publicKeys = marvinDefault;
   "forgejo/db-pw.age".publicKeys = marvinDefault;
   "forgejo/default-runner-token.age".publicKeys = marvinDefault;
@@ -25,25 +40,15 @@ in
   "forgejo/mail-pw.age".publicKeys = marvinDefault;
   "forgejo/oauth2-jwt-secret.age".publicKeys = marvinDefault;
   "forgejo/secret-key.age".publicKeys = marvinDefault;
-  "golink-authkey.age".publicKeys = marvinDefault;
+
   "grafana/admin-password.age".publicKeys = marvinDefault;
   "grafana/oidc-secret.age".publicKeys = marvinDefault;
   "grafana/smtp-password.age".publicKeys = marvinDefault;
   "grafana/secret-key.age".publicKeys = marvinDefault;
+
   "immich/oauth-secret.age".publicKeys = marvinDefault;
   "immich/mail-pw.age".publicKeys = marvinDefault;
-  "jellyfin-exporter-config.age".publicKeys = marvinDefault;
-  "mail-archiver-secrets.age".publicKeys = marvinDefault;
-  "minio-root.age".publicKeys = marvinDefault;
-  "miniflux-admin.age".publicKeys = marvinDefault;
-  "../nextcloud/nextcloud-admin-pw.age".publicKeys = marvinDefault;
-  "nix-serve-priv.age".publicKeys = marvinDefault;
+
   "paperless/admin-password.age".publicKeys = marvinDefault;
   "paperless/secrets.age".publicKeys = marvinDefault;
-  "pinchflat-secrets.age".publicKeys = marvinDefault;
-  "planka-env.age".publicKeys = marvinDefault;
-  "pocket-id-secrets.age".publicKeys = marvinDefault;
-  "shelfmark-secrets.age".publicKeys = marvinDefault;
-  "vaultwarden-vars.age".publicKeys = marvinDefault;
-  "webmentiond-env.age".publicKeys = marvinDefault;
 }
-- 
2.51.2