From c658047e5989ab995e4ee8741da46440a9c8ca8f Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Mon, 8 Jul 2024 19:16:28 +0900
Subject: [PATCH] Update ssh keys

---
 keys/ssh/keys.txt                 | 33 ++++++++++++++++++++-----------
 nixos/common/modules/ssh-luks.nix |  3 +++
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/keys/ssh/keys.txt b/keys/ssh/keys.txt
index 225628ee..873efddc 100644
--- a/keys/ssh/keys.txt
+++ b/keys/ssh/keys.txt
@@ -2,36 +2,45 @@
 # REMINDER:  When you update this file, also update ../../nixos/modules/ssh_luks.nix
 #
 
+#################
+# Forgejo Actions 
+#################
+# (Fri Dec 15 09:34:02 AM UTC 2023) forgejo-runner (nix)
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJJE7z4JlohTe2TfB5ovsDWMT+M+V9AyQ6dXNelX6oGU nix-forgejo-runner
+
+# (Mon Jul 8 19:07:00 PM JST 2024) forgejo-runner (docker-compose)
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxM5Hqqw1jKzSpMGm3UQCISoWBsFzRGa+JnvlW0Eh9X docker-compose-forgejo-runner
+
+#################
+# Non-Nix Infra
+#################
+# (Tue Jan 09 21:06:13 PM JST 2024) albert@win10-desktop
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLHGSk3WffS/mrSeehcM4O9eBx5cp7IMNYc842xprr3 albert@win10-desktop
+
+# (Fri Feb 02 08:17:00 AM JST 2024) Pixel 8
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBui9k0ByK4ldcfJCTaEyoQoltcZ3w07B/5WBxvz7Nzd Pixel 8
+
 # (Tue Jan 02 11:31:45 AM JST 2024) Work Laptop 
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDpUCskQThd/1FQpJRZFT7ZSW+gOHjuSLoxtY75Ra49D us\1137815@AJ095738
 
 # (Thu Dec 28 19:55:09 AM UTC 2023) root@nuc-docker01
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHjYe++b4XbN1XOZU+Cm9iNby3Goq66EA48D7gh9AnDE root@nuc-docker01
 
+#################
+# Nix Infrastructure
+#################
 # (Thu Dec 28 19:30:06 AM UTC 2023) albert@framework-server
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAODamRCvyVOGmMSMXWdUzjcM2GsApizCvXEWKHiKhGk albert@framework-server
 
 # (Thu Dec 28 19:34:47 AM UTC 2023) albert@osaka-linode-01
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdXi5P2xPXHH1dJ7l2DBhQ3NaJTC4RTwvk6i6IWfVsC albert@osaka-linode-01
 
-# (Fri Dec 15 09:34:02 AM UTC 2023) forgejo-runner 
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJJE7z4JlohTe2TfB5ovsDWMT+M+V9AyQ6dXNelX6oGU forgejo-runner
-
 # (Fri Dec 15 09:34:02 AM UTC 2023) albert@piaware-rpi4
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINR8PCfKOTArLemqmnHom4vWJ6u8wrlpG6/gSqeYo/qD albert@piaware-rpi4
 
 # (Fri Dec 15 11:40:53 AM UTC 2023) albert@backups-rpi4
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNkKoS32K487JaFza9TUFwrjwe9P7SNIHbVNxhzmRcI albert@backups-rpi4
 
-# (Tue Dec 26 10:33:58 AM UTC 2023) abc@rdesktop
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKa86iTPkRDwga4/T3XdyWfu5xH8oL/AWWWozz3rUyuA abc@rdesktop
-
-# (Tue Jan 09 21:06:13 PM JST 2024) albert@win10-desktop
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLHGSk3WffS/mrSeehcM4O9eBx5cp7IMNYc842xprr3 albert@win10-desktop
-
-# (Fri Feb 02 08:17:00 AM JST 2024) Pixel 8
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBui9k0ByK4ldcfJCTaEyoQoltcZ3w07B/5WBxvz7Nzd Pixel 8
-
 # (Tue Feb 20 09:20:39 PM JST 2024) albert@nixos-framework
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMAJLaC+NJQYfrWlerUj8yMkAIofBGMOWQB4mU/ncDpz albert@nixos-framework
 
diff --git a/nixos/common/modules/ssh-luks.nix b/nixos/common/modules/ssh-luks.nix
index 7ca7517e..b996b8a5 100644
--- a/nixos/common/modules/ssh-luks.nix
+++ b/nixos/common/modules/ssh-luks.nix
@@ -24,6 +24,9 @@
                 ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLHGSk3WffS/mrSeehcM4O9eBx5cp7IMNYc842xprr3 albert@win10-desktop''
                 # (Tue Feb 20 09:20:39 PM JST 2024) albert@nixos-framework
                 ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMAJLaC+NJQYfrWlerUj8yMkAIofBGMOWQB4mU/ncDpz albert@nixos-framework''
+                # (Sat Apr 27 05:28:13 PM PDT 2024) albert@bakersfield-rpi4
+                ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJm3bTcalJgoZt7t5FqFrJl7ZYlC09ew2QWUVF6w1Iih albert@bakersfield-rpi4''
+
             ];
             hostKeys = [ 
                 # Generate new keys with: