From 51597caaf5ea88f11df2377b41816fc0d929cd79 Mon Sep 17 00:00:00 2001
From: Alexander Heldt <me@alexanderheldt.se>
Date: Sat, 20 Jul 2024 20:03:02 +0200
Subject: [PATCH] sombrero: Move secrets for `codeberg.org` to the correct host
 directory

---
 hosts/sombrero/modules/ssh/default.nix              |   7 +++----
 secrets/secrets.nix                                 |   4 ++--
 .../alex.sombrero-codeberg.org.age                  | Bin
 .../alex.sombrero-codeberg.org.pub.age              | Bin
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename secrets/{pinwheel => sombrero}/alex.sombrero-codeberg.org.age (100%)
 rename secrets/{pinwheel => sombrero}/alex.sombrero-codeberg.org.pub.age (100%)

diff --git a/hosts/sombrero/modules/ssh/default.nix b/hosts/sombrero/modules/ssh/default.nix
index e0d5fad..5e348e2 100644
--- a/hosts/sombrero/modules/ssh/default.nix
+++ b/hosts/sombrero/modules/ssh/default.nix
@@ -66,7 +66,6 @@ in
       };
     };
 
-
     age.secrets = {
       "alex.pinwheel-sombrero.pub" = {
         file = ../../../../secrets/pinwheel/alex.pinwheel-sombrero.pub.age;
@@ -74,13 +73,13 @@ in
       };
 
       "alex.sombrero-codeberg.org" = {
-        file = ../../../../secrets/pinwheel/alex.sombrero-codeberg.org.age;
+        file = ../../../../secrets/sombrero/alex.sombrero-codeberg.org.age;
         path = "/home/alex/.ssh/alex.sombrero-codeberg.org";
         owner = "alex";
         group = "users";
       };
-      "alex.pinwheel-codeberg.org.pub" = {
-        file = ../../../../secrets/pinwheel/alex.sombrero-codeberg.org.pub.age;
+      "alex.sombrero-codeberg.org.pub" = {
+        file = ../../../../secrets/sombrero/alex.sombrero-codeberg.org.pub.age;
         path = "/home/alex/.ssh/alex.sombrero-codeberg.org.pub";
         owner = "alex";
         group = "users";
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index cf626dc..d3a26d4 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -27,6 +27,6 @@ in {
   "sombrero/syncthing-key.age".publicKeys = [ sombrero alex ];
   "sombrero/alex.sombrero-github.com.age".publicKeys = [ sombrero alex ];
   "sombrero/alex.sombrero-github.com.pub.age".publicKeys = [ sombrero alex ];
-  "pinwheel/alex.sombrero-codeberg.org.age".publicKeys = [ sombrero alex ];
-  "pinwheel/alex.sombrero-codeberg.org.pub.age".publicKeys = [ sombrero alex ];
+  "sombrero/alex.sombrero-codeberg.org.age".publicKeys = [ sombrero alex ];
+  "sombrero/alex.sombrero-codeberg.org.pub.age".publicKeys = [ sombrero alex ];
 }
diff --git a/secrets/pinwheel/alex.sombrero-codeberg.org.age b/secrets/sombrero/alex.sombrero-codeberg.org.age
similarity index 100%
rename from secrets/pinwheel/alex.sombrero-codeberg.org.age
rename to secrets/sombrero/alex.sombrero-codeberg.org.age
diff --git a/secrets/pinwheel/alex.sombrero-codeberg.org.pub.age b/secrets/sombrero/alex.sombrero-codeberg.org.pub.age
similarity index 100%
rename from secrets/pinwheel/alex.sombrero-codeberg.org.pub.age
rename to secrets/sombrero/alex.sombrero-codeberg.org.pub.age