diff --git a/modules/users.nix b/modules/users.nix index cefe20c..7f83d40 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -16,6 +16,7 @@ extraGroups = [ "wheel" ]; openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDGMOAuXpGQcwZDOiAbqnVOkBB4jjSs+awGa0WHpDhuZFo61mQNIoE3lozAO58HikY49+JwJccL+oJgA7VNzpy1hl711wbqj8CV3wjJflpnTla86XnXI30w6dlx7qd07JDoXYr6JvCOCk0nbwomXeekxm8Yw1hwjb476ryvZJDvFhIpSx+7j8oP+qlsUDKOhaMdpiDN71b8YihS7jTZvyw9958XB2AH1WjjV1foWk1ux0KIfkqTTZTPkvbkKBsuHFhHzp08OVXTNaROBz+iDcOm8JUodAO/Qbjcaw2pwENjThxwtuXDCYwYv9CN1rQ3lTXo5zC+8MqvGCZBbnhgIvTV8C5W1nRTpOC1d07r0CrNqq4PVPPW1FKBkhUhbuhJCawNjxgQvK2fwP9hZYstrYiXHVgGNmnv9Utg8ENB4fXYKHgFktGhWXMb8oYJkV9wSQuh86hnr3WAjmQu7dIRT02Sp+KPYskFIGQkDoC79PjUVGJC0HZAFLPIBozliF0u/58= ye-lw21-laptop@YLW-LAPTOP" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtRkddBvOX+uSeWBbKzYPRSkTSGAwZox2WiQLV5yVUv ylw-laptop@YLW-LAPTOP" ]; }; diff --git a/secrets/influxdb-token.age b/secrets/influxdb-token.age index 147b09e..6c4ae86 100644 --- a/secrets/influxdb-token.age +++ b/secrets/influxdb-token.age Binary files differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index ce381f5..0aac171 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,10 +1,9 @@ let # Admin keys ldx = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMNHFTC5HMO3IsggHpA+eVSCyhZSmDZz7aV62IFt7sj"; - # TODO: ylw to provide ed25519 SSH public key (RSA keys cannot be used with age) - # ylw = "ssh-ed25519 AAAA..."; + ylw = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtRkddBvOX+uSeWBbKzYPRSkTSGAwZox2WiQLV5yVUv"; - admins = [ ldx ]; # Add ylw here once key is provided + admins = [ ldx ylw ]; # Host keys skydick = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDnuvNClEXwMEP0IVNZ8GM1V93eU+QMmBqM5R8TM1Sx2"; diff --git a/secrets/skydick-ldap-bind.age b/secrets/skydick-ldap-bind.age index e229a77..daa152d 100644 --- a/secrets/skydick-ldap-bind.age +++ b/secrets/skydick-ldap-bind.age Binary files differ diff --git a/secrets/skydick-samba-ldap-admin.age b/secrets/skydick-samba-ldap-admin.age index 4eb23ba..25d9362 100644 --- a/secrets/skydick-samba-ldap-admin.age +++ b/secrets/skydick-samba-ldap-admin.age Binary files differ diff --git a/secrets/skydick-wg.age b/secrets/skydick-wg.age index 8b5e6fa..6232d3d 100644 --- a/secrets/skydick-wg.age +++ b/secrets/skydick-wg.age Binary files differ diff --git a/secrets/xlab-wg-skyworks.age b/secrets/xlab-wg-skyworks.age index f366ffd..5585ead 100644 --- a/secrets/xlab-wg-skyworks.age +++ b/secrets/xlab-wg-skyworks.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 p6tzjw hyLTyij78DANhbt349l7zuRXUUHePs/hAynKZw+dWhI -yax4D/c70gd1zwU9ooUWmjGkp1areiX4IKp1CkQ4DL0 --> ssh-ed25519 U++4eQ 6IgefjlPRVqK0eeJYDYwaUKWuT1nsuPbHXv46JTQ4T0 -DrreZlfHYrP9FPkU6K+sOi2QyWxoPzt9cwN8+DmuSfo ---- nlwhaLlAJlX3sA72t5/pdQ+5w+uilPg4LY0i0AQaFP8 -�� -\�B� -'L;��J��o�����Y�-��Ӎ*Ө��6t��롡��w_a01E���2��-����5MpW��[ \ No newline at end of file +-> ssh-ed25519 p6tzjw YUX0Zr1OgNafU5vANwRU9vxJsjvTTPVU3r21ml21liY +ZRYiu2LwdlMs4GdjsqLW63ne4oXQQRHBFY1u8caxk5g +-> ssh-ed25519 UHvpBA ZOAOdYIzS8tQD4uZPW6pKuOcDpzes9qQH0ZNF01LuUU +TDxc867dvRmZ7zrUzf7oXWjHHf72WoY5CnuyqoHzKhw +-> ssh-ed25519 u2YEAQ XUy3za4VYAyF2CP5gK7WV1QoRx8YDc0S+aK7N7qov0w +2DA5cef3xi2mTpp3uptbQYV7AwtINYW9iACzxTRoFR4 +--- hiq38nomRlxrlNZ4LBAM87UC9IMYftLbfB+bvg8hbmM +����*�s������_���C��`GF)��>�^EoڌD!���� "x�i�nq;���Z��*Z�Z��I \ No newline at end of file diff --git a/secrets/xlab-wg-warp.age b/secrets/xlab-wg-warp.age index 3812ac0..318596d 100644 --- a/secrets/xlab-wg-warp.age +++ b/secrets/xlab-wg-warp.age Binary files differ diff --git a/secrets/xlab-wg-wgnet-psk.age b/secrets/xlab-wg-wgnet-psk.age index b63cb38..d5a0e99 100644 --- a/secrets/xlab-wg-wgnet-psk.age +++ b/secrets/xlab-wg-wgnet-psk.age @@ -1,7 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 p6tzjw xTVc/7gL3Ljh1yviD5og7MPn72Sqr2uZpTYjBXxWK08 -3RGrOQ8KiOTzJjabDAjCVsRfM2ZFYPiJnwhIVTBJjuM --> ssh-ed25519 U++4eQ fBX9CawWwPua1RlrxukmtRF+dWexLs2T4vXew/BuUAg -S//E0E2DX/ui/IQsc4UiXNqO1362OHM80kP4qiwUnH0 ---- hSctvypZyBOXXfY9hiEWLWgzUyoMFKJTRE0PAZkvbRk -b{�(&J�܄e�5<���W6I�V�B���]���� �K١�"=���U�p�a�I�� }�4Gό�rC�U \ No newline at end of file +-> ssh-ed25519 p6tzjw Gi3QDVOhdyDvQREs0Pmb2SeCDKcImN07QPVnFOZkgXI +Hl7z1JngfGxCU3iJlNmmJCAa52NFn/3NS7gMmjIurZs +-> ssh-ed25519 UHvpBA 5ziG/QOQ0TU7OLn41f6rB2hlBeJhCf4yhuzJd8VZnCg +9IaI6Ivbmh+Q3QcQzAzBQdSFBRNrOhSnoy6DBv+zC4Y +-> ssh-ed25519 u2YEAQ Ikrhgd0i7EqohB6ZDendYpjWz7WdKxG5shQn+H422HI +sPRcgTtAtKR5pM/XyU1Vc7EW7SkD3twiNAbSgYaUo0Y +--- qNm4OM6CwIzLyD86/MDmOCHicYS+SLNzTT9rGNkY09I +-�ߨ�g�P���CQM�?Q ��)���;3� [�)�C�x�0ݱZ�ߜ�5[R���mqܜ� ��e���F�= \ No newline at end of file diff --git a/secrets/xlab-wg-wgnet.age b/secrets/xlab-wg-wgnet.age index df2893e..27096a7 100644 --- a/secrets/xlab-wg-wgnet.age +++ b/secrets/xlab-wg-wgnet.age Binary files differ