fix conflict in osprey hardware

This commit is contained in:
Tyler Starr 2024-10-16 10:39:51 -07:00
commit 47e30db847
16 changed files with 33 additions and 31 deletions

View File

@ -1,9 +1,10 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-ed25519 Fz/sQw eWmbN5fQHK2Af4PsSY24Yo4rviqcMc1841KZEdn/ezQ -> ssh-ed25519 Fz/sQw uRPe6lrPzIntOBzSYR+zM2xBihHCAsdOtix9L9221FI
/N3I6mOuUShNlzr2c/TnB6ax6TtkrFJQxFIaJ4STrXQ 6i0DsOZhZdi0ZmKJAuG9xEX7dtK5+daGule506UNsRQ
-> ssh-ed25519 47GzQA 7ut3vn6lXxz58Tj/OXWuueqaxRGckhpVj4Z/N8b34XU -> ssh-ed25519 47GzQA etB0mmw8g4t0mfzBEv6Dr6V9IdoJegAjgbOY/t3M9ik
SBecD52O2UsCOOLQrxA/+E7VcXOj88Sdg0yA+i7bQ7s FgN9DrAotYJ2rvvEh80+Wp5BxoEHe3W4LgCLld0G9v8
-> ssh-ed25519 wcI7nQ isqztqV9KZjY/CUW4+I2yHfCeZmo2IKG9g5lfQkB/V4 -> ssh-ed25519 wcI7nQ a3seigr8UNpEeUil+OSbf5RyjArSm03ygNw5AjtJYQ0
ppd2WJLTLyoEp5bS+oP6bT2gVkc+J3e7tlInx5326d4 Sc9J4LQI9kFUFDzFjLS8Zwo9Z/HTawBsrv4qRxftwMg
--- 4n4s3HSUR089Q2VqEmoxUnqrhlZ+cSvl9FXvrwTAkqc --- sGLvBOkszi11u/ukhK9iQ/FYHuqW52UXIY9kswVF7Tk
Ççc)¼ù?à÷ÿ7»2,gõ™Ñ… Mc1ü&éûÍH _®!¶g.[»•eTs%’Åó­løFд®] SºaÈòüÜ2ðMÍ$õã7<C3A3>Ö´ßVÙÑ2³Ü)|QˆŽØÂC<rP¤ iMëú<8û³7?¹ßB¾Ú8(
"A_}é÷øM¤tLÿ

View File

@ -6,7 +6,8 @@ let
tstarr_kestrel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINr2BUUToMswbAbxZMXarl2pQEomM+jADyZbEK31VGu/"; tstarr_kestrel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINr2BUUToMswbAbxZMXarl2pQEomM+jADyZbEK31VGu/";
tstarr_torus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKhxsVgd8DH8c0zckjMUxSJrTimU709JLCgDGBMFoNxQ"; tstarr_torus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKhxsVgd8DH8c0zckjMUxSJrTimU709JLCgDGBMFoNxQ";
users = [ tstarr_kestrel tstarr_torus ]; tstarr_osprey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGQEjr+yK4zdnV9kBUMo9fopsJbvF+TfQlVQexBCwuwB";
users = [ tstarr_kestrel tstarr_torus tstarr_osprey ];
in in
{ {
"git/github_personal.age".publicKeys = users ++ systems; "git/github_personal.age".publicKeys = users ++ systems;

View File

@ -1,14 +1,15 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-ed25519 c/r/0Q 7SZ3i1/YN6bomMnpPpC2E/qiPFa9YM3dWVSUKQVJCxY -> ssh-ed25519 c/r/0Q 2KtEwngUw7ZA/rEEaXHMwRC9JZcWrIrmdDlP0lN9tS0
dSc/zPCGsJ6t0v7KFqKOYxxTeXM+7zKB0QHtHOakajo ZAKUTyCKtf2EVG6qhSWn8aXUkNfAXgrMBwUiLWx7iOA
-> ssh-ed25519 6UNP1Q ZvbWPwHL8NfgbyRLoEsVkGdD0NmA3w8tarkiJGaqtxw -> ssh-ed25519 6UNP1Q 3AG6l3q1Hgv4Cj7z2a31b3g9AW1sowV71em9QSZnD2A
B5GNn9oJpHIEfXo6hBSh5FbrMXKWPmAWdigC1prox10 +Q8/nr1yz6nZviV7srRTW0LnoNrYxW1x7gjhZwvvmOo
-> ssh-ed25519 Fz/sQw kA9TGqMf/8tpTTIBKjxslnhBV3SYy7x9rLUEMZNYZWo -> ssh-ed25519 oOIlAg RPVxwWRbDSOpyRD34uPX8vQYzOKwbc/6WQ3miIpsWnc
cxFmMBMwKerh50a13dkXyUVuXiMB1aemskJXfbeg8Kc QQfR/w+kh8/6WIUogDlX/iL4Y2Idw8hOQOEUHQgTwes
-> ssh-ed25519 47GzQA K7lrG9mj/dy+L9FDV+/PxIjxoWAnuXxmx5SNFYO2b0g -> ssh-ed25519 Fz/sQw u2KqeUEobIWwbKT61etUYeY2LFRk6l8EYJ5dnuvmDDI
SutKPqVSJ7XYoC0T25jOMATTC2NG7eWVfjxaFvO45Rc bCpGnuJf+qPG+f2N04zATwngB6nwJDMSpz8mFUfkawU
-> ssh-ed25519 wcI7nQ QlzNUT20/KqoBOcvPoGQwQWXcROddPUTjo6VcrKJ92w -> ssh-ed25519 47GzQA e3x/3uULmh7FLg6eiATdvbG/kUfrCKOHrph1tw0HRk0
lDvscDynwkQiMkxDy2wXNjvB6zK3sOu4bLyXFtmcNZk jOVO2Irq1NxzzK+O2Lo4/bip9IFqvvzi+bIaD8Z0rqs
--- M4JBRY+oWI4rqCvUZSaiA+DitbFX5k/5Ad7gEx7XxLY -> ssh-ed25519 wcI7nQ RIgZP4y5FqqmUJDc/emKdO2laRHxNer+db+TgbybLVA
ńÜB'á­Žy®ž ĺá1<C3A1>Ú ŕ K61Q/TxQtX30Z2m3N0sHBHqBIuH7Q0QHmWVwMxthAMM
Ő<EFBFBD>Ę2 z>*K‰®üJ°śÇ<C59B>Ú1{1ν0xÍLç;Á'0Hć'ĘĆeŃčuá]çA0 --- dlNFmAoD84TcOlyWRGjvx29SPHaC7FGiYgrJkQAsOMg
©rÁº+{œŸè ¡Ó¶¥Æ£¨yUD ?Ò¶û%MϤó‘ã ¿†ùÝB®NÎyË'mÊ óVÄãV¸¦þ&«­é&ïs¦Œ®«2@H<>

View File

@ -1,10 +1,9 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-ed25519 Fz/sQw sTJYlfFdSBl+xqi0+Yysl6NNWH8IABznrbF1MLi8p0c -> ssh-ed25519 Fz/sQw 7/YCPJS/50qCCQjXo2FzANZ6CMqX05DP4Qk+qCgXjyU
xp0OvKeTPOK7CEUlPJOF9ZT3G55jYzGx/KI311YXzIM BAMi2jaNirVy0SiKecdKbKIQn+TUzZOeykRoRmxg0PQ
-> ssh-ed25519 47GzQA Dc5kR+oUGLMcL5V+ul8NQTw4xr/ihd4qItpwlVDcLj8 -> ssh-ed25519 47GzQA eEojsbTRfeimfI1ZFFk1Na/CVBdDd0xr3iQrMFHxiBE
RZFPMVRFxBaosGvXRLcJA8gLIeaI8i2QIWflcsHY8uQ vPfgDfYoYmZ64cUIwIFXsoUj0Tc/jvpSmml7IoCd3+o
-> ssh-ed25519 wcI7nQ 1lgpi/CuZpYLgjEnWYBD/2x5EMfPLfyR+9xJVqbfGEc -> ssh-ed25519 wcI7nQ 8rWj9DNjix0FynR0itooK6h9B3OokzGYzcZskNi6gSU
wmzNKHObcWs9tbU8nIZ6/iP3cJKusAIRwsoPnszxdbM 58WsoNAWUBz1lXSXWasaqXBzVC4e3+SqpCIEwQyHVj4
--- BAh4R0xMUi7v8eoI6R9aW5YHbGULsZR+lBw6JnGKsbQ --- c9NO0AuVc8azutlxHEp9WEJEKkMK/5ygbZF++5ovQeQ
I:®B.±ÛN+žN”.qŽjÀŒœi?}©¿ ûÁš¿Ð†i8\_ç¾Jà~<7E>åá‰þæ‡J@è.øZâšÁût½±r.‰ê`Çø×ó
魺稩3<E7A8A9>S脍镶H璇|v贩假际鴎稾斩l舖ㄈ<E88896>b<>V圁C湉gM廤i蕜z;狢|鞄詧桘琓}?fr