diff --git a/secrets/coturn-secret.age b/secrets/coturn-secret.age index 4a9e9ec..ed606dd 100644 Binary files a/secrets/coturn-secret.age and b/secrets/coturn-secret.age differ diff --git a/secrets/duckdns.age b/secrets/duckdns.age index 37a1153..ef73634 100644 --- a/secrets/duckdns.age +++ b/secrets/duckdns.age @@ -1,10 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 su0Eyw abgbb/Gl03Gkn8FXt8OWvsQZIIkmp+9OJYJBARfuMHE -C6btapYsEstmrPfOSzApBxo88PCVG0ECbJJ9ATvHwSo --> ssh-ed25519 IV3DkQ r1h8O7eotpWQ7R2MC/EgWsndd+V+YNJs6SEQqxY4DHk -FRuoj1KMLoHYGYk+78cgQbtH6QN0LQX69LzS72zTeLA --> ssh-ed25519 DCzi1A S5japvaVIvNF8gB8d6lDMniYvWDhPXKxdHIypoYQiho -us1sOKs3YwTQZEbgh3YgN6GgRDP7Na3KGdzTSqzENrA ---- Nq1cKNge2TngWd41zf1sTneHozmQzGrFQ6y6qtXzRDs -91 -U 6eد0n׹v[fZ(~sY'SGfc$#yDk \ No newline at end of file +-> ssh-ed25519 su0Eyw o68gGsP73GV1X0O9fxC10Ch+tKkRozMVhbdCjqxAnRE +UaH+SsHwD7soVZHRxqddtdeYoeN5Hzr09mf3z3qdITk +-> ssh-ed25519 IV3DkQ bzmylmwHbXJrEvKBM9Be+FiLJ+hydiTN/5Gb44pgDEc +aAXgH117bwJcBybdA3uNhtixGIPoQOi0xQw7YbPl0Lg +-> ssh-ed25519 DCzi1A 9pbmJ3NzrcuZ94eFhDLFegBEm+ET3JZA0/kPKxILmUk ++ODpabvMmupX9yQEWcfkzdLdPd7LoHgK0Hcs9ZREk1I +--- JIMYZ0nutcLGf9CrevH36atF1McYWmDzP6eqqT7MTk0 +<OJα-ƽ@P}qEdR +'@XюolҹԈ/hd}O9lYԸ. \ No newline at end of file diff --git a/secrets/fileshelter-conf.age b/secrets/fileshelter-conf.age index b207686..f45811a 100644 Binary files a/secrets/fileshelter-conf.age and b/secrets/fileshelter-conf.age differ diff --git a/secrets/github-runner-pw.age b/secrets/github-runner-pw.age index 5ff3cf1..331b35b 100644 Binary files a/secrets/github-runner-pw.age and b/secrets/github-runner-pw.age differ diff --git a/secrets/github-runner-token.age b/secrets/github-runner-token.age index a6ad2e7..bd401a2 100644 Binary files a/secrets/github-runner-token.age and b/secrets/github-runner-token.age differ diff --git a/secrets/grafana-contact-points.age b/secrets/grafana-contact-points.age index dffcfec..f627fe5 100644 Binary files a/secrets/grafana-contact-points.age and b/secrets/grafana-contact-points.age differ diff --git a/secrets/kavita.age b/secrets/kavita.age index 3f561b1..f379408 100644 --- a/secrets/kavita.age +++ b/secrets/kavita.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 su0Eyw rnsgxSg5JfkNdPR+aLkzFQPOlI4u6P4V8OC1wfnngUY -2r0/8va4Oe+QhHqjqVB6/TJJhr7rd1H20MNTniPruOw --> ssh-ed25519 IV3DkQ /P32hgm1UOgA9bICEce7grbf7FF5o25Lth8Pk7BEyiY -/7fPDRjB4gz914tqwpnIBL5JiUQPJ7ZbpEz+Mgol5X4 --> ssh-ed25519 DCzi1A 1UvTKf9muY2w9Fh841QmDe6B0q6754K7PMCyc9waGGc -COlVeGacNRs7Pu1zJ+OppGCe9zrU36jvj2eEOpJFh0w ---- D4G8PgZQJAhCMUtHuGzAc4BdQatgTagjFbZJhuU11lM -a1z_p-Z]P {Zrd #75 Vc8Qα(5=x 8FfxǖQ7}/8>Erh9BMp~fe2ġ⭔g+P \ No newline at end of file +-> ssh-ed25519 su0Eyw C6QMmoLtpPWGId5dnaTKTD5dpez2WkOP5g0olCIgxg0 +UJaXBsU8bJqFZtvxbZnqeSPCh0CU0YR0Pi8D6rAmgAw +-> ssh-ed25519 IV3DkQ qpcnzcdgJQ3GS5oJp1q7t5yE9T9t/F0NGECWOyupnB0 +N5ZxGE0NFn+GiTefBpuAglBo8//i0Bhk3slmUlFlDNo +-> ssh-ed25519 DCzi1A DHqvq17DpFm5GFLxM7N52MIEZHlp4E6DeLyJALEHPSs +n7A5YETPfpmmxa6nPBwy+v4NpTQHbmwItruNL9+pUkk +--- 7KZGB7b5P0AZyDoUdVS2nMG4+3FAO48Fyt2PeHDNwC8 +r h+ HS"U«e8f},扼'u* }U$.z8G,Zױ9~#$nU͂,v57NY3kp1? \ No newline at end of file diff --git a/secrets/matrix-registration.age b/secrets/matrix-registration.age index 721af66..a59d2c4 100644 Binary files a/secrets/matrix-registration.age and b/secrets/matrix-registration.age differ diff --git a/secrets/nextcloud-admin.age b/secrets/nextcloud-admin.age index 36b10c0..7479cd1 100644 Binary files a/secrets/nextcloud-admin.age and b/secrets/nextcloud-admin.age differ diff --git a/secrets/nextcloud-cert.age b/secrets/nextcloud-cert.age index 00570c1..55877a3 100644 Binary files a/secrets/nextcloud-cert.age and b/secrets/nextcloud-cert.age differ diff --git a/secrets/nextcloud-key.age b/secrets/nextcloud-key.age index 0336400..bf8f74f 100644 Binary files a/secrets/nextcloud-key.age and b/secrets/nextcloud-key.age differ diff --git a/secrets/paperless.age b/secrets/paperless.age index 2795016..a404e5a 100644 --- a/secrets/paperless.age +++ b/secrets/paperless.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 su0Eyw IJckEJYxrvloHDQdVvbiP6fYWrS/xfuaMAeRyj0dFV4 -PmV7VRNBH/Iosid4iwcpfXrql6I+C8nwE28Fxg5f0/Q --> ssh-ed25519 IV3DkQ f0iJsNmpp5u2nLZ0HR0EQ6e2jx+CmQhBzc5h6WOIqig -MBchVvruWoY7E1f3Ygr5ECESThh8jIzbM8F4G57RCSE --> ssh-ed25519 DCzi1A rbazzLlsA0uPTAkJQdY5xzsS+3H1J7yamqYQf+56zjY -GEaO8Ol2+F2/JOym8QOt0y5LbO+ZgtSlEj5NnGeRp8I ---- vMgCDGoVicI4R8UlGQcFktPc5fsNHmJZ5HX+Uf2ggwk -|NI1jHs,gU[".7CKHl& PBׄ؞r'k_:d5"9^3 \ No newline at end of file +-> ssh-ed25519 su0Eyw p70ChNpm3kt/8rv5PuWmdD6rZhn8GvlTp+Zt8smlAUw +y7lTWfvpzAtSJ9KJtslhZL4E7eAkVtLthECqWiaWDd4 +-> ssh-ed25519 IV3DkQ HLAXcTBhn9ZnXeWSNTLjMrVAlqvOBSB7Qlq1vARVaV4 +X951Ke7yCfy9apjaAUSZX0hhX4sFV2IWjbDxixHUYE0 +-> ssh-ed25519 DCzi1A XuIY4DLwkgY1ErbT3D7f/XEKTrfmywU26WoAiowcdSU +rDuYnccPFARdQTIlY1qgyUVMkhaLFBXNQ8WwcwnAP/A +--- FQIhF+LuZ5/+c7T9DkiURH2d5IL9Ijwfgitsa/vUFWE +LJ)R-3lVFLC[rv nᵅIE@ ;/8HL'R1޲w< .i{屼 \ No newline at end of file diff --git a/secrets/restic-gdrive.age b/secrets/restic-gdrive.age index 65a3384..8be5fda 100644 Binary files a/secrets/restic-gdrive.age and b/secrets/restic-gdrive.age differ diff --git a/secrets/restic-pw.age b/secrets/restic-pw.age index ee59339..19fbb29 100644 Binary files a/secrets/restic-pw.age and b/secrets/restic-pw.age differ diff --git a/secrets/restic-s3.age b/secrets/restic-s3.age index e7efad6..f4a33ad 100644 --- a/secrets/restic-s3.age +++ b/secrets/restic-s3.age @@ -1,10 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 su0Eyw V+07TRO3WYLUNMz38i2Fkpk1k7zBKpxLlybm+f0S6E8 -roRenLBDPXSgPLJNHhyQTcp4hXkwFfzJ2/FNqbSgWHU --> ssh-ed25519 IV3DkQ 2Rf8H/BHCMj3wxUYLxDjTl9AAxNTiw2Uw4PlrpW3iTA -l8CjI/jKZSWffmxf+/N0/Y7sZF48RUDzkilc6fe/EXQ --> ssh-ed25519 DCzi1A yFjC6OYvwj4uOmgeZObUBQh9bz81G3eJr9HVWL+HBDI -njH3qJRpWUfpvktKpjpe3ox7+3DthkpHzb5HruAU1KM ---- lWu7jwVi9ywuj/rsGMcA6n0en84HVfFBe1PzNd5aFh0 -׋S θH,\('%8'իa[Q, -s:$ĮQβ_^&H]7uyy[CGYjGSTDLu)\hf{CO H:9( \ No newline at end of file +-> ssh-ed25519 su0Eyw ixfqFQTk8nZJxYR+p3ekBgYpfEzp8lPCOpSFz9xFwhI +MY8stjHQHG11Hk5zCec6YCWRRG48d6+pgiSJxKJgyXk +-> ssh-ed25519 IV3DkQ uZqemVuJNWOfRfHFwYSym0ENGt8p+e/aPTBNefi4kiM +zPiGpUerZ5h6WlvLpIKfUCiqeH5HAV7W2AuNBYfbaRo +-> ssh-ed25519 DCzi1A zmB9/BqL9e8Swi4+KdTogyHneLQvLjeYIC73+JkSDTo +HqtXqVzzTwMM+Dw5XgRgZ0oP12fGIiw7ECM21fh7phs +--- JWAg0bAFaKPKaJf1CEowiqgSCcISuk0mfbiWIIh9jC4 +G Iū}EO.!)_J I1 ZiFp*FH%kCROhЊegrŮy5P:#T|{\qVY3Xč=͛$#r#h1).3Թ \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 6b31f85..b5bf342 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,9 +1,10 @@ let kop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeP6qtVqE/gu72ZUZE8cdRi3INiUW9NqDR7SjXIzTw2 lukas@Kopatz-PC2"; server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUA7uVKXAF2UcwaIDSJP2Te8Fi++2zkKzSPoRx1vQrI root@server"; + laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDqcphdDEJhnSBkAZzQXZJDCzsyb/Tqpcf0pUADFpbd1 root@nix-laptop"; mini-pc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKla9+Gj2i9Ax7cIdnTM6zsmze3g1N/qCPqhga0P+toU root@mini-pc"; users = [ kop ]; - systems = [ mini-pc server ]; + systems = [ mini-pc server laptop ]; in { "github-runner-token.age".publicKeys = [ mini-pc server kop ]; @@ -16,7 +17,7 @@ in "restic-s3.age".publicKeys = [ mini-pc server kop ]; "restic-gdrive.age".publicKeys = [ mini-pc server kop ]; "wireguard-private.age".publicKeys = [ mini-pc server kop ]; - "wireguard-client.age".publicKeys = [ kop ]; + "wireguard-client.age".publicKeys = [ kop laptop ]; "coturn-secret.age".publicKeys = [ mini-pc server kop ]; "matrix-registration.age".publicKeys = [ mini-pc server kop ]; "paperless.age".publicKeys = [ mini-pc server kop ]; diff --git a/secrets/step-ca-key.age b/secrets/step-ca-key.age index ca7244c..f678860 100644 Binary files a/secrets/step-ca-key.age and b/secrets/step-ca-key.age differ diff --git a/secrets/step-ca-pw.age b/secrets/step-ca-pw.age index 418e6b2..55fbbf4 100644 Binary files a/secrets/step-ca-pw.age and b/secrets/step-ca-pw.age differ diff --git a/secrets/wireguard-client.age b/secrets/wireguard-client.age index 319a86b..afb3d33 100644 Binary files a/secrets/wireguard-client.age and b/secrets/wireguard-client.age differ diff --git a/secrets/wireguard-private.age b/secrets/wireguard-private.age index 16dc233..63c7dee 100644 --- a/secrets/wireguard-private.age +++ b/secrets/wireguard-private.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 su0Eyw 9mpUnyWpauqdSlrjHZb2uyTG5U7wyWesQz0WfNms1nc -652z/tIinaCwhBQitxSLWMl1n9FCEaRKC6F/h9c4rzk --> ssh-ed25519 IV3DkQ esDKdA6+78STpPx2kCRbRCjJ7w5+YCRwR9G5IHusRl8 -cFc2EJE+gfY7YJzindI+3Q7Eum/D02GetqjHjaZUQzk --> ssh-ed25519 DCzi1A meR8aXi4kq1xxSdGvieMZ0tcrgT4Ifo2fRoR6v7wP1U -rULzoIdJyh/MwDXGfI9Nh3nPfqdUBoQHV7s15cYpKsw ---- 6cTo396+lzrd+YrQnEU3GvW6gPLo4rVaukpx48QdGGY -hдfF8F ~0^| u_aIvy!eVCdj2v?+*8g0FCZr7K \ No newline at end of file +-> ssh-ed25519 su0Eyw /r64m356E4kG8YDaHQaWoA71sTKJHZthRE7+0Cac+HA +gY6BCSJEQHihmP7KgDCe/EXMpDY5fNEfj5+5VTHE/0o +-> ssh-ed25519 IV3DkQ 4Fykka5lWq0r4W9p9xATS5POGT6y2eNm6bbTtGAPaTg +9+2mqpgrn8sh4urj441TGRdhYFjRV/q1V+acxeXvoM4 +-> ssh-ed25519 DCzi1A nmHtpGA/d3JF5MkY2YY0ik70GPQCY/cNRyq+OW+/73M +JvUlKZXq7sZ4bnWU0WlZgp+2LC11CVGRQ0ucUHnhnwc +--- 9h3SMFjxRMQhWZ0OAY/EIW9oRLDfHkQtsH2nmiuxLmQ +*_=9љ 7rgekQjl3@Y vtoTzg5sOJPw%ܛD \ No newline at end of file diff --git a/systems/laptop/configuration.nix b/systems/laptop/configuration.nix index 93c3398..0c86b0c 100644 --- a/systems/laptop/configuration.nix +++ b/systems/laptop/configuration.nix @@ -10,7 +10,7 @@ # ]; - age.identityPaths = [ /home/kopatz/.ssh/id_ed25519 ]; + age.identityPaths = [ /home/kopatz/.ssh/id_ed25519 "/etc/ssh/ssh_host_ed25519_key" ]; mainUser.layout = "at"; mainUser.variant = ""; # Bootloader.