From 349ab6df42d49706f176327ca78d3625135338ba Mon Sep 17 00:00:00 2001
From: Frank LoTurco <floturcocantsee@protonmail.com>
Date: Fri, 23 Oct 2026 16:03:21 -0400
Subject: [PATCH] refactor: replace buildkey with personal key

---
 features/sops.nix                              | 16 ----------------
 hosts/nero/configuration.nix                   |  4 +++-
 hosts/vergil/configuration.nix                 |  8 ++------
 hosts/vergil/keys/personal_ssh_key_ed25519.pub |  1 +
 hosts/vergil/keys/remotebuild_ssh_key_rsa.pub  |  1 -
 secrets/remotebuild-ssh-key.yaml               | 17 -----------------
 6 files changed, 6 insertions(+), 41 deletions(-)
 create mode 100644 hosts/vergil/keys/personal_ssh_key_ed25519.pub
 delete mode 100644 hosts/vergil/keys/remotebuild_ssh_key_rsa.pub
 delete mode 100644 secrets/remotebuild-ssh-key.yaml

diff --git a/features/sops.nix b/features/sops.nix
index 81e56cc..5653d84 100644
--- a/features/sops.nix
+++ b/features/sops.nix
@@ -70,22 +70,6 @@ in
         group = grp;
         mode = "0644";
       };
-
-      "remotebuild_ssh_key_rsa" = {
-        sopsFile = ../secrets/remotebuild-ssh-key.yaml;
-        key = "remotebuild_ssh_key_rsa";
-        owner = "root";
-        group = admgrp;
-        mode = "0400";
-      };
-
-      "remotebuild_ssh_key_rsa.pub" = {
-        sopsFile = ../secrets/remotebuild-ssh-key.yaml;
-        key = "remotebuild_ssh_key_rsa_pub";
-        owner = "root";
-        group = admgrp;
-        mode = "0644";
-      };
     };
   };
 
diff --git a/hosts/nero/configuration.nix b/hosts/nero/configuration.nix
index 03cf090..8297f0a 100644
--- a/hosts/nero/configuration.nix
+++ b/hosts/nero/configuration.nix
@@ -88,7 +88,9 @@
       {
         hostName = "vergil.cfl.rr.com";
         sshUser = "remotebuild";
-        sshKey = config.sops.secrets."remotebuild_ssh_key_rsa".path;
+
+        sshKey = config.sops.secrets."personal_ssh_key_ed25519".path;
+
         system = pkgs.stdenv.hostPlatform.system;
         protocol = "ssh-ng";
         maxJobs = 24;
diff --git a/hosts/vergil/configuration.nix b/hosts/vergil/configuration.nix
index b579eef..0fa3d88 100644
--- a/hosts/vergil/configuration.nix
+++ b/hosts/vergil/configuration.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}:
+{ pkgs, ... }:
 {
   imports = [
     ../shared/nixos-server.nix
@@ -37,7 +33,7 @@
       isSystemUser = true;
       group = "remotebuild";
       shell = pkgs.bashInteractive;
-      openssh.authorizedKeys.keyFiles = [ ./keys/remotebuild_ssh_key_rsa.pub ];
+      openssh.authorizedKeys.keyFiles = [ ./keys/personal_ssh_key_ed25519.pub ];
     };
   };
 
diff --git a/hosts/vergil/keys/personal_ssh_key_ed25519.pub b/hosts/vergil/keys/personal_ssh_key_ed25519.pub
new file mode 100644
index 0000000..381c9dd
--- /dev/null
+++ b/hosts/vergil/keys/personal_ssh_key_ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ5+RJOhvamBpEptCRv90E+8bVWKn6Mep61wDpPYgKP3 floturcocantsee@daguerro.net
diff --git a/hosts/vergil/keys/remotebuild_ssh_key_rsa.pub b/hosts/vergil/keys/remotebuild_ssh_key_rsa.pub
deleted file mode 100644
index 107fe53..0000000
--- a/hosts/vergil/keys/remotebuild_ssh_key_rsa.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDPhZEpbnriVL4DJ3Rd+V1rY52tEEpYkPJsUx713Jsz5U5n8cyZm3JfzpOiplaqG+WyQCwMrqww0axOLF43KICdWVHA2y2PLeq6d32mM42R0XBB7RQg+OKltFuJTC/Nj2VpXOkuBDAulytxVuniiQ8MTJbiG6vo6y7jG90Ja+H9SPF2nuTRbcOrai/tNvHq99g3tU7QadtwYzyk6vCU+WYzE1JsBUwfhtstBPBr5qUn2MtDZUAsc3F+yDemleX+PfbIVGID1bXSAkB+O1OYN9N128qRDA0wXDA9Sa0UPZdG4V2BWYINDAikhBnTffNz3U9qfi5l037buLuhjy7O9lYk64dMTsMLgep9PiHjpbINKdBTaVx1fl9je7jP9+1STKoK0EI8x6Hrn7+U5x9vuB24Dbl1l2JkXx88hwytAh6yJ4jwU5EiOdCoSP7ICzSz/nEQozAUpXl5xxsmDbVa7quAK5KxqPirezOurIyVRzgJVUmd5OIq9y8pVUllgc0EKaU=
diff --git a/secrets/remotebuild-ssh-key.yaml b/secrets/remotebuild-ssh-key.yaml
deleted file mode 100644
index 0684a28..0000000
--- a/secrets/remotebuild-ssh-key.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-remotebuild_ssh_key_rsa: ENC[AES256_GCM,data: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,iv:9Yh0lkWT+Mz9yEtNOq2M2QBrklqYaPQbQh+e7fWprcQ=,tag:h8PgLqzBwOfMjngt2X+60Q==,type:str]
-remotebuild_ssh_key_rsa_pub: ENC[AES256_GCM,data:HAbKREwLpXptlDsZyPqtQrwBjl/kBKW5ySTIuTyyQKyMxOlO8Vy8veh6O5On6stEbZi5K/1A19Xy2dLUFm13ZUTA9Z2UtQ/BS5+FlRf8W0pvCTjS0TzoThN7r6GpSIZ7Xe/PF3G/lYM5oto/NKGIYxh26fqAdShx87neFvpkP7pUC9lEAVH2Gik2Jei9KmNeGibXl+v2oMvmBUuxVHxBFMeKOY6JP9eQDOfhULeoQtE648Hol61bVibLT4F62f93owKru1CREXcVMm/Ewiow7WxUw4UB4UTRig7vDqc5YXilC4pKIhqj5ABJUUUzmDtyizmA3tLE7/q7z4Af/Tn8nMOvZNRMiz9mKVW9XKJktqEFRB1nnmvunos8CrfNk2vNaLHWAvM0ojCGaaaIKg2wMhzz+a39flyrg7oGZMZ0/4Ghm8lUDKEv+FMOJIfhdR3yfefIzxZ4vT4dQ4GEVZ2FkoNkNQ0nE4FgwOb2aNxkBi0YK0osMY7Nm5Qv5BvKma/wcrkD6l/fv0l6A/kSmKvE9/K7VOQ4wroJ+UUMWW1TKHjbbDaspGjbmfgsBO3G563Knb1dGc0/zxjsAMb3ezSCNiRti8hpnfo3NZ8UX2pV1BsXRu9EO8QBNJOjTfZfK2ouZHj1hvRU5512wFXj5smA1/1fEcpp9/hoiqItAbOatk9eOWxJkFtXzi5sH2ePVpGZTpT36mQTbvXh3jtUs7nrtlRMvRk0Vywwd5cueD8z98Dyfro=,iv:ls3PLfXEfF7vVBSpba8gijZTbWBmvd2XU2b/4W5JeQ0=,tag:Obkg9QAV7BIelKsD20jMcg==,type:str]
-sops:
-    age:
-        - enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhRy9UaGJCRXVwcG53Sk95
-            RFhOT2lPRWdoc0preFVnUVlHWWRNeTc1cEIwClZxYUR3Y2RhRi9HSUZpLzNyQ0hU
-            eHpCUHJlZS9NQUJsRjlpNTJ4Nk1paTgKLS0tIGJjMnYzOGdma3ZGak1aZFB2elpl
-            dGlxdDNJK3M1elRoU1hMa05VSUwvbEkK4Q7ml9+aeT6ViOqvs/OaYcZifnSmm31n
-            oHhzwqWUfgkjZrdV041YX61UEnjeOwei8stMwxsOsXnJzDyrhXyHmA==
-            -----END AGE ENCRYPTED FILE-----
-          recipient: age1s6zlweaxqu6sldlhaxg24tqqwhcp7kvc3rr6h6895chk2ndaas6qdyj5gl
-    lastmodified: "2026-10-23T19:33:43Z"
-    mac: ENC[AES256_GCM,data:W7I+vIP3/7TRucprzI3FNUf2M2sV77qzLhPzZxoirxNOBnHdCzQQuRuPHZvSJdWEpwq/7hYci/kG9WAIH1lI+rCDQ1AvEZDNl1MOmGHj4Vdlq3GZHn8hs8P1fmWd8u429PHPAZe3ih0ZelKkSCzZZqbLszkRsLvYFuCWJmQYPnw=,iv:CxxcPgZensmjLv7XrzTnPGCdRqdIy77K9E190wJlRfw=,tag:3C+5TLUzzfkZrEnY30I0Nw==,type:str]
-    unencrypted_suffix: _unencrypted
-    version: 3.13.3