diff --git a/hosts/pinwheel/modules/age/default.nix b/hosts/pinwheel/modules/age/default.nix index 097acaa..6b9c99c 100644 --- a/hosts/pinwheel/modules/age/default.nix +++ b/hosts/pinwheel/modules/age/default.nix @@ -6,7 +6,7 @@ age = { identityPaths = [ "/etc/ssh/pinwheel" - "/home/alex/.ssh/alex.pinwheel" + "/home/alex/.ssh/alex" ]; }; diff --git a/secrets/pinwheel/alex.pinwheel-andromeda.age b/secrets/pinwheel/alex.pinwheel-andromeda.age index cd31015..4169b3c 100644 Binary files a/secrets/pinwheel/alex.pinwheel-andromeda.age and b/secrets/pinwheel/alex.pinwheel-andromeda.age differ diff --git a/secrets/pinwheel/alex.pinwheel-andromeda.pub.age b/secrets/pinwheel/alex.pinwheel-andromeda.pub.age index 2493c30..bb8dc17 100644 Binary files a/secrets/pinwheel/alex.pinwheel-andromeda.pub.age and b/secrets/pinwheel/alex.pinwheel-andromeda.pub.age differ diff --git a/secrets/pinwheel/alex.pinwheel-codeberg.org.age b/secrets/pinwheel/alex.pinwheel-codeberg.org.age index c8d3fe5..e1d6066 100644 Binary files a/secrets/pinwheel/alex.pinwheel-codeberg.org.age and b/secrets/pinwheel/alex.pinwheel-codeberg.org.age differ diff --git a/secrets/pinwheel/alex.pinwheel-codeberg.org.pub.age b/secrets/pinwheel/alex.pinwheel-codeberg.org.pub.age index 7aa5945..a75f0d7 100644 Binary files a/secrets/pinwheel/alex.pinwheel-codeberg.org.pub.age and b/secrets/pinwheel/alex.pinwheel-codeberg.org.pub.age differ diff --git a/secrets/pinwheel/alex.pinwheel-github.com.age b/secrets/pinwheel/alex.pinwheel-github.com.age index e358686..a62bfbd 100644 Binary files a/secrets/pinwheel/alex.pinwheel-github.com.age and b/secrets/pinwheel/alex.pinwheel-github.com.age differ diff --git a/secrets/pinwheel/alex.pinwheel-github.com.pub.age b/secrets/pinwheel/alex.pinwheel-github.com.pub.age index 6e8ee6a..718f3f0 100644 --- a/secrets/pinwheel/alex.pinwheel-github.com.pub.age +++ b/secrets/pinwheel/alex.pinwheel-github.com.pub.age @@ -1,10 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 vxPbZg HPO9NYmepA0lCri9TVTTcp2apFvQuc7fFU2idHPLzz4 -ECmTH3SYsediAFadp5Pl46mdRVQzsEQM38ZFsaJpGzw --> ssh-ed25519 ek+b7Q W+dvQYztKQMEFj53Dd59RL2e/C3jNZ4qKHct0y/WjX8 -4cJyOi55wlooJ/puKelE4ySAzk917lA/q0Xo7DlJvyA --> KF|.~}-grease qqCSua t-1 -lCikma3fCC6OplhD ---- T2XTYO4YGHm/kkMzGpyBvpktosrp/08S0imkA6HSyy0 -`cH%:z-$RKn# &UA -j Og6>2F$녠u Rk"BN ( ~8IBiłLC2$O4 >6FOFAEwOZ}Y2c4=Ȕx \ No newline at end of file +-> ssh-ed25519 vxPbZg AkmOs/7tQAOpL9QJkr8xhwG8RczAyBfQQhj/K2ODeFU +LdVX8Wk2xFxVYz6392lvF2LJyYjGwjTWeBnG86ejPjs +-> ssh-ed25519 +oNaHQ Vt6ylw7pk15XsdVnaFBr7KSCUArq/RbLIutnLRkqslc +MGYeQwruIKOjJ3JQ+LSNEFmLTF/2or9aoGQkz/DMD58 +--- AxN4ZHABGNPZzeq8Iv1pZ6hMhdZSVqHqJnqVFVnjlZ4 +~(LT^(J4Rg8 N+ynAm2!DupjʭstTi]' f#]'D}TuT#Y'߿μoU5JbɉWRtҮ \O+ e!5p?r,D؅ \ No newline at end of file diff --git a/secrets/pinwheel/alex.pinwheel-sombrero.age b/secrets/pinwheel/alex.pinwheel-sombrero.age index b804c6b..f3268ee 100644 Binary files a/secrets/pinwheel/alex.pinwheel-sombrero.age and b/secrets/pinwheel/alex.pinwheel-sombrero.age differ diff --git a/secrets/pinwheel/alex.pinwheel-sombrero.pub.age b/secrets/pinwheel/alex.pinwheel-sombrero.pub.age index 49036c3..e9fa1b1 100644 --- a/secrets/pinwheel/alex.pinwheel-sombrero.pub.age +++ b/secrets/pinwheel/alex.pinwheel-sombrero.pub.age @@ -1,12 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 vxPbZg 1xoU/lpkuPdG+UQW1D9VrAnSSEpK+b6pu+wflgvRQFs -7jupzfqRmH5wzcVX3VCqQAghHZNXHiPc6YP8es8NYic --> ssh-ed25519 MxZlmA QUqt2gwCtIUv8nFTr8LSinLt7hD05EH/N6Yobew6GEI -JuzbNQrpONfKkIUgi//p8LhwxjCka/SQGYimglCueCU --> ssh-ed25519 ek+b7Q AfW7nec0E1vtg72C1f2Qp7RM/qNf19x5eEZgsonXbCs -joytWP1pp8lAgm2ORh88ETi8giGwPfCo9mwtlqTQ0U8 --> M,fSDC$-grease {.x R26(e2' v5Y -5JMhlzqPlW0vBFTe/5gBoSqxHesiKDi9BZp7Ckf+c6P2NiJHe3yurg+l8XoxEjN9 -GQrQTg ---- luPA8khtSQv2Kg8v+GWx8BPXPqeqcnoiGfghMJqDFuE -픖~&l+I9xϞ߼DVrWAX riY H<8oe<Хv- ~ZN=2/f9@vsGz_ܠC=?iZ[eU&B \ No newline at end of file +-> ssh-ed25519 vxPbZg QDNG5PLSEfsJMi7xM6+k3VjULmtexN3GOHVejYH2RDE +G7gtZW7O5baVr4TUMks3kj/wr7Hgt3vwV1VEot/pc98 +-> ssh-ed25519 MxZlmA /x8I1isr72FJbvR9iwHCrdry+e1h3b5hgPW+BXwdhWI +270j6yM6rC1iSFc+x96PI4mBoTd5J1flS4jVVfAfr6s +-> ssh-ed25519 +oNaHQ 52ph6ka1U6PSUOgen67dMydNHOaN9Bu306tPO/2AThY +KhZv1Qm/gAM+CtsJhiiEcORdfSwmIJE8Cv0CPnNNyOU +--- TnFtHnuoCQt1r2NWsjzOjO53piDlyr12tcrjKNJ2Eyk +t3ѭX]%P@wSYr? R']6 $ JBr`ߓ3Qj-}D:R{B!\&)/͛J))vW oq~ \ No newline at end of file diff --git a/secrets/pinwheel/alex.pinwheel-tadpole.age b/secrets/pinwheel/alex.pinwheel-tadpole.age index 273c39e..708cc2a 100644 Binary files a/secrets/pinwheel/alex.pinwheel-tadpole.age and b/secrets/pinwheel/alex.pinwheel-tadpole.age differ diff --git a/secrets/pinwheel/alex.pinwheel-tadpole.pub.age b/secrets/pinwheel/alex.pinwheel-tadpole.pub.age index 9881070..014c222 100644 Binary files a/secrets/pinwheel/alex.pinwheel-tadpole.pub.age and b/secrets/pinwheel/alex.pinwheel-tadpole.pub.age differ diff --git a/secrets/pinwheel/mullvad-account-history.age b/secrets/pinwheel/mullvad-account-history.age index a6c4b26..a8224ce 100644 Binary files a/secrets/pinwheel/mullvad-account-history.age and b/secrets/pinwheel/mullvad-account-history.age differ diff --git a/secrets/pinwheel/mullvad-device.age b/secrets/pinwheel/mullvad-device.age index f23c925..9dd7a51 100644 Binary files a/secrets/pinwheel/mullvad-device.age and b/secrets/pinwheel/mullvad-device.age differ diff --git a/secrets/pinwheel/syncthing-cert.age b/secrets/pinwheel/syncthing-cert.age index efc1f92..b7ef5b6 100644 Binary files a/secrets/pinwheel/syncthing-cert.age and b/secrets/pinwheel/syncthing-cert.age differ diff --git a/secrets/pinwheel/syncthing-key.age b/secrets/pinwheel/syncthing-key.age index 3cec64b..2419c67 100644 Binary files a/secrets/pinwheel/syncthing-key.age and b/secrets/pinwheel/syncthing-key.age differ diff --git a/secrets/pinwheel/work-gitconfig.age b/secrets/pinwheel/work-gitconfig.age index f3a69f1..8978b53 100644 --- a/secrets/pinwheel/work-gitconfig.age +++ b/secrets/pinwheel/work-gitconfig.age @@ -1,7 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 vxPbZg ns/Hd7mkx1YbuUfP8AUzFLMy8Zps531/kL+1LsyDmzY -8UIeOcgDWqW7h2rQFVZB1DuAi2rxY141VQgfIyJqfmQ --> ssh-ed25519 ek+b7Q KBS99VZ03/1C35EZtWoo96+NZFZhW/TESyXwhOkR924 -qG5bq6hkrcU0fX3mbb787A/cy4VCkytjDsD5EXHowR4 ---- FGygGCVoZ2LWY5guhe/LOjihpJTYk0neLqMSwZnoI0k -5rDMXAQOC1l\9q7Xw/bu9zp~`W:UB ,^vVqmàIJg`"l QM \ No newline at end of file +-> ssh-ed25519 vxPbZg bCF+MdTMA8jH26XEosgyd5N0RsTa9WT/VAIZGsVemHg +1DNCO2mpsJ68osmFZIzAlY6kjoxCbThpSI4XNEyUNjY +-> ssh-ed25519 +oNaHQ L91QfGk0r81Df5fHWHdrvXJ54FJ+3S30vus/h4v/H2k +Vi/5VdJhl72cwLiD2qxbmQiKD0RPb4vv6VddGWrPvF4 +--- F8ff4nu9K9cXId34L2RMBzH4vE3efIuzISN1spbvDHo +Kٌ˭eyz%]msbUqX{!(u|!_}<#޺XU^sWwNUD + \ No newline at end of file diff --git a/secrets/pinwheel/work-github-token.age b/secrets/pinwheel/work-github-token.age index 71eae54..009a348 100644 Binary files a/secrets/pinwheel/work-github-token.age and b/secrets/pinwheel/work-github-token.age differ diff --git a/secrets/pinwheel/work-go-private.age b/secrets/pinwheel/work-go-private.age index b037199..ec99d09 100644 --- a/secrets/pinwheel/work-go-private.age +++ b/secrets/pinwheel/work-go-private.age @@ -1,8 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 vxPbZg 8QovjrbJr0uZHNSgQXyf1qQamlUYTgjLIShj+ut9ZSo -5uLXL9SbVx7iBCtkDIx3PZ62BFprY/iLrUrzL9nZpJM --> ssh-ed25519 ek+b7Q 0bOd4IKJ4b9HoEJ3pJSbfyoz4vXCqocbkNGdw8xS4Fg -cAKDDmYEo1PpkpqRJBACxFxm0qiMDBV4UXqFDWrCcmY ---- Sh0Krr1Tn6t7izUn1TRG1maiRjCQtPridpYNhcfslMM -{2_٭U,H )OߩUpiS6ܫ` -I{~U8xs^ '<  \ No newline at end of file +-> ssh-ed25519 vxPbZg 8jksNocfYqMUDo5Dats6iwHrHtVifjpEe6t2S+vCNhM +wBhnozUW4BB47xF8u2aDCLlI8WITDLitfAiQ9EDmX54 +-> ssh-ed25519 +oNaHQ C3Tt/j5y76kkxJcUitiuRWapFmcNLgXvOZDtCQK2Jls +JSasOdLKJ2KQo+H6Ig6cKLWPJnU4Us66TQ8mCEsRCvQ +--- i3zVOAuB/6jSMj+e7Rz4A+wzxfxbfo4qEqAK4+XmuEM +!e&1a̍fHtqzc,L:DWZW}A,o1rE~T \ No newline at end of file diff --git a/secrets/pinwheel/work-production-ovpn.age b/secrets/pinwheel/work-production-ovpn.age index efd3f2c..78dd17f 100644 Binary files a/secrets/pinwheel/work-production-ovpn.age and b/secrets/pinwheel/work-production-ovpn.age differ diff --git a/secrets/pinwheel/work-staging-ovpn.age b/secrets/pinwheel/work-staging-ovpn.age index 2b34a5c..462c9cf 100644 Binary files a/secrets/pinwheel/work-staging-ovpn.age and b/secrets/pinwheel/work-staging-ovpn.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index c8171cd..aa9f70e 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -3,7 +3,7 @@ let pinwheel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMoI7Q4zT2AGXU+i8fLmzcNLdfMkEnfHYh4PmaEmo2QW root@pinwheel"; sombrero = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO/NltCo1L+X1OIBfIKzfrbxLpCOerQ4vTIs+QPTXkf/ root@sombrero"; tadpole = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDbyj/vYafqpJH33jFz5HV+gwCiEIJTpxKrEFrBWx73A root@tadpole"; - alex = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINjSFvlbdy5D59UaVWjRMyBndiAT2MtCeT+6GuemkuYe alex.pinwheel"; + alex = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTgiHYcdhS87pPnduLunZVEgLVj4EtbG9XVSZP1l5s5 alex"; in { "pinwheel/syncthing-cert.age".publicKeys = [ pinwheel alex ]; "pinwheel/syncthing-key.age".publicKeys = [ pinwheel alex ]; diff --git a/secrets/sombrero/alex.sombrero-codeberg.org.age b/secrets/sombrero/alex.sombrero-codeberg.org.age index 47428e5..c48a4e9 100644 Binary files a/secrets/sombrero/alex.sombrero-codeberg.org.age and b/secrets/sombrero/alex.sombrero-codeberg.org.age differ diff --git a/secrets/sombrero/alex.sombrero-codeberg.org.pub.age b/secrets/sombrero/alex.sombrero-codeberg.org.pub.age index c5c8c8b..ef4d102 100644 Binary files a/secrets/sombrero/alex.sombrero-codeberg.org.pub.age and b/secrets/sombrero/alex.sombrero-codeberg.org.pub.age differ diff --git a/secrets/sombrero/alex.sombrero-github.com.age b/secrets/sombrero/alex.sombrero-github.com.age index a689e23..011dd74 100644 Binary files a/secrets/sombrero/alex.sombrero-github.com.age and b/secrets/sombrero/alex.sombrero-github.com.age differ diff --git a/secrets/sombrero/alex.sombrero-github.com.pub.age b/secrets/sombrero/alex.sombrero-github.com.pub.age index d8ad8c1..77b967c 100644 Binary files a/secrets/sombrero/alex.sombrero-github.com.pub.age and b/secrets/sombrero/alex.sombrero-github.com.pub.age differ diff --git a/secrets/sombrero/syncthing-cert.age b/secrets/sombrero/syncthing-cert.age index 899f988..3b7ec64 100644 Binary files a/secrets/sombrero/syncthing-cert.age and b/secrets/sombrero/syncthing-cert.age differ diff --git a/secrets/sombrero/syncthing-key.age b/secrets/sombrero/syncthing-key.age index cdc5431..879ae40 100644 Binary files a/secrets/sombrero/syncthing-key.age and b/secrets/sombrero/syncthing-key.age differ diff --git a/secrets/tadpole/alex.tadpole-codeberg.org.age b/secrets/tadpole/alex.tadpole-codeberg.org.age index b1ad75e..e7262a4 100644 Binary files a/secrets/tadpole/alex.tadpole-codeberg.org.age and b/secrets/tadpole/alex.tadpole-codeberg.org.age differ diff --git a/secrets/tadpole/alex.tadpole-codeberg.org.pub.age b/secrets/tadpole/alex.tadpole-codeberg.org.pub.age index cf63ecb..843b43f 100644 Binary files a/secrets/tadpole/alex.tadpole-codeberg.org.pub.age and b/secrets/tadpole/alex.tadpole-codeberg.org.pub.age differ