From a416a9fb83def3bc00c04d57ef9d2284c2c1df4e Mon Sep 17 00:00:00 2001
From: Mel <einebeere@gmail.com>
Date: Mon, 30 Dec 2024 16:31:02 +0100
Subject: Move secrets folder into configuration

Signed-off-by: Mel <einebeere@gmail.com>
---
 configuration/secrets/keys.nix    | 22 ++++++++++++++++++++++
 configuration/secrets/name.age    |  9 +++++++++
 configuration/secrets/secrets.nix | 13 +++++++++++++
 configuration/specimen.nix        |  2 +-
 secrets/keys.nix                  | 22 ----------------------
 secrets/name.age                  |  9 ---------
 secrets/secrets.nix               | 13 -------------
 7 files changed, 45 insertions(+), 45 deletions(-)
 create mode 100644 configuration/secrets/keys.nix
 create mode 100644 configuration/secrets/name.age
 create mode 100644 configuration/secrets/secrets.nix
 delete mode 100644 secrets/keys.nix
 delete mode 100644 secrets/name.age
 delete mode 100644 secrets/secrets.nix

diff --git a/configuration/secrets/keys.nix b/configuration/secrets/keys.nix
new file mode 100644
index 0000000..6f3a57d
--- /dev/null
+++ b/configuration/secrets/keys.nix
@@ -0,0 +1,22 @@
+let
+  # machines and their host key that are included in this configuration,
+  # in this case, just one.
+  machines = {
+    specimen = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMuIJFXse7iSMaOoBdr/WGqbNBwWLQTpFw6R8ram89gB";
+  };
+
+  # users that can sign secrets, with all of their keys.
+  admins = {
+    mel = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEDujTul5wWyGnidLnNuJDRze0Up29l2cDpyKdmvW2Ls"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEK96G1n31aJsZOrux3BKM0ztzi/SFAVHn0MsGkPDdqY"
+    ];
+    philip = [ ];
+  };
+in
+{
+  inherit machines admins;
+
+  allAdminKeys = with builtins; concatLists (attrValues admins);
+  allMachineKeys = builtins.attrValues machines;
+}
diff --git a/configuration/secrets/name.age b/configuration/secrets/name.age
new file mode 100644
index 0000000..fb89666
--- /dev/null
+++ b/configuration/secrets/name.age
@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> ssh-ed25519 3ri8RA 37aWnYSkaK31gtnFvqJUJ3iMdv3EYrUPXjrMzAmvOiI
+Xxw9Qpjs/FHAzAe6RtFQlDAvN+bVCQByo+wJK0vxfqg
+-> ssh-ed25519 bykYHg N5cM6Qk3gUfXsOLS4qPmCqntWPxR9YyOLu4U7e1SGH4
+WJej54hr1S4tUhG3HSsIUqb3fzaIQp84Q3ppEbJ/MCU
+-> ssh-ed25519 Ke+vKw Kdypreok2UzZshzuJVIfpIX+yVDq/GMH2gDVG84tcxA
+iunEfk3Vbg/Y9TIG8qNxIH/0BNsHWbRi9l2+OcYl1iY
+--- mYsf5UMHGgU02prC56f9WlKnR/I6EeVzWXvDEAXh47A
+šQ±O`@÷È’tGP•-£Ü‹ÔZ[ÄŸC½†6v*€OY…Ë–ÐܓUX]
\ No newline at end of file
diff --git a/configuration/secrets/secrets.nix b/configuration/secrets/secrets.nix
new file mode 100644
index 0000000..2dab9d1
--- /dev/null
+++ b/configuration/secrets/secrets.nix
@@ -0,0 +1,13 @@
+let
+  keys = import ./keys.nix;
+
+  inherit (keys) machines allAdminKeys;
+in
+{
+  "name.age".publicKeys =
+    with machines;
+    [
+      specimen
+    ]
+    ++ allAdminKeys;
+}
diff --git a/configuration/specimen.nix b/configuration/specimen.nix
index 4620e47..9e994ef 100644
--- a/configuration/specimen.nix
+++ b/configuration/specimen.nix
@@ -2,7 +2,7 @@
 
 {
   age.secrets.name = {
-    file = ../secrets/name.age;
+    file = ./secrets/name.age;
     owner = "specimen";
     group = "specimen";
     mode = "440";
diff --git a/secrets/keys.nix b/secrets/keys.nix
deleted file mode 100644
index 6f3a57d..0000000
--- a/secrets/keys.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-let
-  # machines and their host key that are included in this configuration,
-  # in this case, just one.
-  machines = {
-    specimen = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMuIJFXse7iSMaOoBdr/WGqbNBwWLQTpFw6R8ram89gB";
-  };
-
-  # users that can sign secrets, with all of their keys.
-  admins = {
-    mel = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEDujTul5wWyGnidLnNuJDRze0Up29l2cDpyKdmvW2Ls"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEK96G1n31aJsZOrux3BKM0ztzi/SFAVHn0MsGkPDdqY"
-    ];
-    philip = [ ];
-  };
-in
-{
-  inherit machines admins;
-
-  allAdminKeys = with builtins; concatLists (attrValues admins);
-  allMachineKeys = builtins.attrValues machines;
-}
diff --git a/secrets/name.age b/secrets/name.age
deleted file mode 100644
index fb89666..0000000
--- a/secrets/name.age
+++ /dev/null
@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 3ri8RA 37aWnYSkaK31gtnFvqJUJ3iMdv3EYrUPXjrMzAmvOiI
-Xxw9Qpjs/FHAzAe6RtFQlDAvN+bVCQByo+wJK0vxfqg
--> ssh-ed25519 bykYHg N5cM6Qk3gUfXsOLS4qPmCqntWPxR9YyOLu4U7e1SGH4
-WJej54hr1S4tUhG3HSsIUqb3fzaIQp84Q3ppEbJ/MCU
--> ssh-ed25519 Ke+vKw Kdypreok2UzZshzuJVIfpIX+yVDq/GMH2gDVG84tcxA
-iunEfk3Vbg/Y9TIG8qNxIH/0BNsHWbRi9l2+OcYl1iY
---- mYsf5UMHGgU02prC56f9WlKnR/I6EeVzWXvDEAXh47A
-šQ±O`@÷È’tGP•-£Ü‹ÔZ[ÄŸC½†6v*€OY…Ë–ÐܓUX]
\ No newline at end of file
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
deleted file mode 100644
index 2dab9d1..0000000
--- a/secrets/secrets.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-let
-  keys = import ./keys.nix;
-
-  inherit (keys) machines allAdminKeys;
-in
-{
-  "name.age".publicKeys =
-    with machines;
-    [
-      specimen
-    ]
-    ++ allAdminKeys;
-}
-- 
cgit 1.4.1