diff --git a/agenix/hosts/all/nix/netrc.age b/agenix/hosts/all/nix/netrc.age index 5973008..8e63e7a 100644 Binary files a/agenix/hosts/all/nix/netrc.age and b/agenix/hosts/all/nix/netrc.age differ diff --git a/agenix/hosts/argon/acme/credentials.age b/agenix/hosts/argon/acme/credentials.age index d947f22..30c2d38 100644 Binary files a/agenix/hosts/argon/acme/credentials.age and b/agenix/hosts/argon/acme/credentials.age differ diff --git a/agenix/hosts/argon/adguardhome-sync/environment.age b/agenix/hosts/argon/adguardhome-sync/environment.age index 1ddeae4..8d6555b 100644 Binary files a/agenix/hosts/argon/adguardhome-sync/environment.age and b/agenix/hosts/argon/adguardhome-sync/environment.age differ diff --git a/agenix/hosts/argon/forgejo-actions/token.age b/agenix/hosts/argon/forgejo-actions/token.age index 65451d4..9532902 100644 --- a/agenix/hosts/argon/forgejo-actions/token.age +++ b/agenix/hosts/argon/forgejo-actions/token.age @@ -1,11 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g 2aeA7xLMj0hZymmHrraODD6cXrtOQr7u3vwmaPOZBjo -1oNDL71COWKq8U/hFdcX4XaTZgy5yWhUvTCf3RfyXk8 --> ssh-ed25519 1fcLUQ OJFyVInANrMogQf94iCVuAlJisKtv2ptY63mHLFo410 -ooL//wWRrcgooWd3b7KhGqHKH/ACCJGg8R1YwYf+JQM --> bYz-grease H9Cwq{lN -UHsU9N680zD9h1akqUQ+028gPGOrpF2LoCMiP0cotBY8DWAPLToB7stuJ/ywv1Ck -dl/lVxS6m5h73nVU+al50MqvDKzdGn5PlDEYN0IhBY4gvfCAafiPrVoHqLFYYzYF -/F2h ---- yVoc4medj0Qix80bZ2umqJseBk4knt+1Fs90TKS9Y2E -+~ aJEu^Jף(oUb⭥Y#n ewH!6ĥ& \ No newline at end of file +-> ssh-ed25519 MtGp6g JJ1gPB6MsDhl88Uqmy7yOTUq3IMAaj8D6qBmH5nw+Qw +OTQMHWgQkQHfB0esVFSiUkr10PFbwz2/U8VDcGJNU2Y +-> ssh-ed25519 1fcLUQ ID/0P9r9EU4e6Y52mrgannG1/3/RUdZKCtc39399mEA +9IVPiXeieAPvEwIZq7Z/MZxF9tYV1t+zWz+I1QZwFWg +--- K3rjoML1rRCddmclzm5ZXta/UPZX64lRDb/vz9T73rU +)A^Gd +R mjP.A,1\;c{xXgش-H.bݡVE<,H \ No newline at end of file diff --git a/agenix/hosts/argon/tailscale/authkey.age b/agenix/hosts/argon/tailscale/authkey.age index 22c4d1a..e24503b 100644 Binary files a/agenix/hosts/argon/tailscale/authkey.age and b/agenix/hosts/argon/tailscale/authkey.age differ diff --git a/agenix/hosts/argon/user/danielPassword.age b/agenix/hosts/argon/user/danielPassword.age index d502704..fa4c063 100644 Binary files a/agenix/hosts/argon/user/danielPassword.age and b/agenix/hosts/argon/user/danielPassword.age differ diff --git a/agenix/hosts/argon/weewx-proxy/environment.age b/agenix/hosts/argon/weewx-proxy/environment.age index e24e628..5c76530 100644 Binary files a/agenix/hosts/argon/weewx-proxy/environment.age and b/agenix/hosts/argon/weewx-proxy/environment.age differ diff --git a/agenix/hosts/mediaserver/acme/credentials.age b/agenix/hosts/mediaserver/acme/credentials.age index eb2dee4..2e443bb 100644 Binary files a/agenix/hosts/mediaserver/acme/credentials.age and b/agenix/hosts/mediaserver/acme/credentials.age differ diff --git a/agenix/hosts/mediaserver/aria2/config.age b/agenix/hosts/mediaserver/aria2/config.age index 2ee5ac0..b9d044f 100644 Binary files a/agenix/hosts/mediaserver/aria2/config.age and b/agenix/hosts/mediaserver/aria2/config.age differ diff --git a/agenix/hosts/mediaserver/recyclarr/config.age b/agenix/hosts/mediaserver/recyclarr/config.age index 9a9c512..fb68bc4 100644 Binary files a/agenix/hosts/mediaserver/recyclarr/config.age and b/agenix/hosts/mediaserver/recyclarr/config.age differ diff --git a/agenix/hosts/mediaserver/smb/havenCredentials.age b/agenix/hosts/mediaserver/smb/havenCredentials.age index 85bbeb6..30b7560 100644 --- a/agenix/hosts/mediaserver/smb/havenCredentials.age +++ b/agenix/hosts/mediaserver/smb/havenCredentials.age @@ -1,10 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g JyVPhKnCixU8R0aldhBP8eVHzyxcG6Vjv9MOv2xdAGs -PRc+76W57uYZSUguYrOjvjZrsFy56nbgEyoQ1ahihK0 --> ssh-ed25519 Y94Yig v/9Ai3U8dxd2XP92gTMDHCeMoVTFhd9mrg95hpBjcR4 -8qu58IJSjpDeCoueo5REflCv3jYscmTFg0gJ9w2awJo --> _@pH\C-grease 2 VY p{rJ^5 -liHUI8M6Us9bJ5yF/hs57TZLArJIsKHZG+4azj4qiC47tCAH5RrbXzANrDk ---- WgjYpyvLq2DF1fG+1MwTV+tGijYBiIiO8XeB1wsumh0 -n/PU -,2S(u!$DXH[!'H{|+]5:4z:,1]E!-uNV=?@`W3u1\A \ No newline at end of file +-> ssh-ed25519 MtGp6g h5GOBBF2beIOvnl8w/CwgECH5oNuvNWWAkDKabRuWQI +usrDmkInaI9gzrOB9ijYSlQCrECnIjXzpk1DCHzLjmc +-> ssh-ed25519 Y94Yig 5kOW8xzErlI4pj+gwhcCtzlFazqHCRvh0Lm+pl70sBY +tDEU5tO681A2duNLRwnTRLHl2lM5zXbn/Z27rYIe5Ls +--- 6t/tMFOXfA/QsVgZ7LRIgArtFU95kaeaQQG2rgdTRco +\QzuVe׷Ep +mxGd. 2xbtuV%vE ]hYvCI9Z>r#xb+.0 ssh-ed25519 MtGp6g iPBhMI0tOa0yahpWa+AwEK9d56uBUPER7YCyLQEsSwE +HktRuvzshZ75SeklGMSMKhWrPisZJj2l5qR/fiVPf1A +-> ssh-ed25519 60lgJw ThmXYdTkvVL7vtVBYuW35Cr9o84yDHUJXTPA2pmzkWE +dteB7YkYXnPAX0uO8IakGuyNRCiYmxE84DS1KxVMEjQ +--- vrqL+o3G/o9XltkolyxW2/bmdYbG/1IolxDkhFo2Tek +Ӱ΀)A%9%]H +! ᬃC TSAf~K|!'Yb O& X[ \ No newline at end of file diff --git a/agenix/hosts/neon/mosquitto/passwordWeewxProxy.age b/agenix/hosts/neon/mosquitto/passwordWeewxProxy.age new file mode 100644 index 0000000..c430f56 --- /dev/null +++ b/agenix/hosts/neon/mosquitto/passwordWeewxProxy.age @@ -0,0 +1,7 @@ +age-encryption.org/v1 +-> ssh-ed25519 MtGp6g lmMpdnyCRpMHEHdtsbobHDwdmLloqzmnVtWa8MXpDgI +W5X+T4FSifdhUtqZJfCLZPl9OyEVFavT2Gu/wc8zB+Q +-> ssh-ed25519 60lgJw 5KdxUIiU1FuabCOlYS3vgKs01KG8V+CTw0++syUjojc +16RHU6meNsOInbTJqRKBPQc6vsYpXjlMFmG4NvnXHyI +--- MMWUvlkrz3GozuUZcPyMInV/3DVZdlH/PfFmWW7t+D4 +*7VCz:}M^W[n?ri:VH^vb_V,%[An[k>rijڎ)ʺ__dZISBϐ% ssh-ed25519 MtGp6g OES0bc+9FiKC+0Zr3gqRJbYPOa7xyUQxSvP6lxqCqSA +sJYxWzPKdPdIHx8zdhcSbexhEHg2EQcfQmpD8iW+9i0 +-> ssh-ed25519 60lgJw tNnXwS3vtSqssnJTe8s7NSFR97i6We5uXV5gUlRkfEg +3Vku9TyhFAIcTagF/uyRgfeZ38Gyzr+3PJc/+A6JqS0 +--- FalIpSsYo7ckQpWV43EYY8A57Kkpz5zsmLJ+s3SG85U +'3&u>e&zimZ< f`m\P2:Z0=V,zLyjʡ\PP!Z.fWq@2k@sS7{bp @sZ~ ¹e \ No newline at end of file diff --git a/agenix/hosts/tanker/acme/credentials.age b/agenix/hosts/tanker/acme/credentials.age index 33ef7a4..27d93e5 100644 Binary files a/agenix/hosts/tanker/acme/credentials.age and b/agenix/hosts/tanker/acme/credentials.age differ diff --git a/agenix/hosts/tanker/anonymous-overflow/config.age b/agenix/hosts/tanker/anonymous-overflow/config.age index 46d9e2c..c53ba0a 100644 Binary files a/agenix/hosts/tanker/anonymous-overflow/config.age and b/agenix/hosts/tanker/anonymous-overflow/config.age differ diff --git a/agenix/hosts/tanker/atticd/environment.age b/agenix/hosts/tanker/atticd/environment.age index ad6715b..615e368 100644 Binary files a/agenix/hosts/tanker/atticd/environment.age and b/agenix/hosts/tanker/atticd/environment.age differ diff --git a/agenix/hosts/tanker/fedifetcher/config.age b/agenix/hosts/tanker/fedifetcher/config.age index 101a145..979b4ce 100644 Binary files a/agenix/hosts/tanker/fedifetcher/config.age and b/agenix/hosts/tanker/fedifetcher/config.age differ diff --git a/agenix/hosts/tanker/forgejo-actions/token.age b/agenix/hosts/tanker/forgejo-actions/token.age index 8a30737..11b205c 100644 --- a/agenix/hosts/tanker/forgejo-actions/token.age +++ b/agenix/hosts/tanker/forgejo-actions/token.age @@ -1,12 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g I3WQex/smit8a4Isd02PK5wjcjy2hUed3UJpd0y33So -SyMzqODrDT5V8VEjp8ERWWa8f/LkJXOfB0I2v0/5xMk --> ssh-ed25519 iO8/4g 7HVKn8hYsADqVUoaJZQq+VsnLa3fwRsDNEuAe4HYBmM -ZZrHbVUtM0gKgIhSVARW7VhB3VVMd3kqu4aClviJYjE --> XGZy\BA-grease (7F_& -ogqkD7AyPLaMX7ZRC+MXIHSUR0pRYFGGpQzLse/J+Xfn+d8Fca+ORmdZ7hszVCYV -2+vZ3YeW5undYzkMjJuVyZf5qS/S5Mbp ---- rVstDRi//LFd7AO4GKNShRHipPHwPdl1B3pKqYoNZms -4Ah!qatV!r![P+Dv'%F ʝ$LPa -cikZ%@`㐓& -`[; \ No newline at end of file +-> ssh-ed25519 MtGp6g 5SaJ0PZtLRTpf+2MuSOed6rL4ZaMKqreDtrv6gtElzs +asYwkUnhGekO9EqX+bX0LFCTTFzpREv00brpJ+LsS9s +-> ssh-ed25519 iO8/4g MoJbSVMo2l8miiVeosQE17hCkgfsO3uC8hy5R4uPBUk +vUDuPV8O9JDFWijF+82yV5fDvIYwC24x72ZZrSqAuI0 +--- 0Pxxxw+6MJgiTnyUayU//4maIdQdgRdikFW857g9Dbc +F{7"Kk6eKw#LI2idP%.x W_B(T$ Bho0) 񹾠Β \ No newline at end of file diff --git a/agenix/hosts/tanker/headscale/acls.age b/agenix/hosts/tanker/headscale/acls.age index efe7356..e43ee99 100644 Binary files a/agenix/hosts/tanker/headscale/acls.age and b/agenix/hosts/tanker/headscale/acls.age differ diff --git a/agenix/hosts/tanker/headscale/dbPassword.age b/agenix/hosts/tanker/headscale/dbPassword.age index f9cf138..20af309 100644 --- a/agenix/hosts/tanker/headscale/dbPassword.age +++ b/agenix/hosts/tanker/headscale/dbPassword.age @@ -1,11 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g Ksx8IgaAlR47n4KH6gqrFa0/LTbJdng+Y4LyaIyUoHM -Us/MXus/dEo5z3q9Un44jGgAPOQmQABhSvEEFbSNZaY --> ssh-ed25519 iO8/4g bb5CMC4W+/8LqXV4wo5lL/pEPiDv8aTB2JTP4WAU8RI -zUDaW+pIBLWzNpeoRnSVTrs0FzCzGp88xOJQCJ23Abg --> 9Avzmsce-grease *| wURxw -N/PIH4VmQp68zcOwFozdd/46yiXa7YT3kughflU+PnxACswnu0r56YYEoU40lPqV -kIdUiACfIFkXByDvS4Xt/WlT4X9Ncu0LCEzMZhnT4HQtL8lVMMAWqm6BdDDn4yBs -VuA ---- EN7FwLG8kh/pxDa8gJyFwccM3ew8LqhmJDN7TTVMiSE -+l1cc:cnG=+޴ `'>A0q z*e0DD \ No newline at end of file +-> ssh-ed25519 MtGp6g jjyJUuIeF4kTlnpxV1UD7/Vf47Rklt8/wDGaXBob1ho +hmB9I+//919kNrIARykN+fagwpRxHM8sh4lbWlYxy38 +-> ssh-ed25519 iO8/4g j87vWpjBLfBaClT/VEsO4BZhqcuh/yCeDw7UNC97bnM +ZPVNFLEsNC0m3h/gYP1FxpSANbSp7C/Z/q4TJbUl4O0 +--- uyI52UkrdqR6ZjPdVTxL3pjI8IWUTu3zXqNKE7l+bFI +Ż N +h6afz7RH?`;uW)/#}nÝh%K \ No newline at end of file diff --git a/agenix/hosts/tanker/invidious/databasePassword.age b/agenix/hosts/tanker/invidious/databasePassword.age index dd6c563..18ce196 100644 --- a/agenix/hosts/tanker/invidious/databasePassword.age +++ b/agenix/hosts/tanker/invidious/databasePassword.age @@ -1,11 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g DZHI9LtTvwlKXyZw+fe33PwcgdWCze39MvWKKzkC8jc -R7GgrTzyF96GSzCbKmgzlB1k+JDeW3NGbFMVaPIeOBs --> ssh-ed25519 iO8/4g cN6H4tPW2+D4WWTTontl6zg3IPCcOTqzFqDYQMJVajY -Ewzk3VgyGJ18JyhC7WKA7PrZfmnZXfTHdsMPep9smKI --> ZOBXX:-grease +5eB!v) r#hU -U8ClN+91QW5mEodsaPx77H/9+W58LeV7AQ/Mm4v1Z5tlLy8uHQKR1lVDgApow6mI -EmbOatS3d62wpzz5Byd1n7acuORvgHkgFHhDWoOl6xLR ---- BxssSHOarZtYmAL9w+3NqJv3j5VO8Iu/+npamK1ujPI -1oUb$u}% yA>&s3F5_-T=g[j:Q+]qkTroQsÖ_y -Lb \ No newline at end of file +-> ssh-ed25519 MtGp6g s37ynyy/kvHuTAIjA+XYXD65W01y5/j60NYVKiqr324 +QMj5Mu3Ah9EzlR6U3dry4Hy/xdt9NjvJ5H0LATwp3Fc +-> ssh-ed25519 iO8/4g deh9nEc5YeKRXnyXL1Tdr0PXhr4K878wRhVz6nR8Y0g +TGheY5FXDgHtqUX3hDVCFmL7giuwhdc/P3ZN/xwZCKw +--- X0px8ZMkbUQWmRp8M+1WQC2doKDsQmQScgyo/kqFdE8 +'^7=-K꣓^CHS IT$/im'N荵7bEݖ*tpG \ No newline at end of file diff --git a/agenix/hosts/tanker/invidious/extraSettings.age b/agenix/hosts/tanker/invidious/extraSettings.age index f4d0094..18c6bc9 100644 Binary files a/agenix/hosts/tanker/invidious/extraSettings.age and b/agenix/hosts/tanker/invidious/extraSettings.age differ diff --git a/agenix/hosts/tanker/linkding/environment.age b/agenix/hosts/tanker/linkding/environment.age index 4d2620a..78ef3f2 100644 Binary files a/agenix/hosts/tanker/linkding/environment.age and b/agenix/hosts/tanker/linkding/environment.age differ diff --git a/agenix/hosts/tanker/mastodon/databasePassword.age b/agenix/hosts/tanker/mastodon/databasePassword.age index ec88b0c..24220cf 100644 --- a/agenix/hosts/tanker/mastodon/databasePassword.age +++ b/agenix/hosts/tanker/mastodon/databasePassword.age @@ -1,10 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g wAwIsd2n0Fqui061boqUxqp+uMgqde27zPJeQohN5ik -TvGOeXoL98QUyGJ0UrLB2nvqCe+nkmGtEHfvZ8DTJc4 --> ssh-ed25519 iO8/4g mbpwuiAKbj5ZbMxq2cYTpN0pRt5qfFcwxZNjRvKXqkU -bikCM08DQoCbocBWTOV4s5amEAO+gHlAJavfUWDMTTs --> pS6>-grease j$PHEqF mA0,x h~ov7sK -ygTukhyfp8i8TJYCZpCSn3lIU9QS+6SN1BUapf0kYQiBU0mggnp6ywwYVf9jDOjU -BA ---- xdDdjEkcETSSFi4MPxBC0Ffr+ToRplrry4moUEQMQpk ->^m/0q7\ۼ"5Bnr) I}IF \ No newline at end of file +-> ssh-ed25519 MtGp6g 3aSggyvFMN8aqkqekdzmKDjLZZZCXGlAyDY7QgdZ10c +CvpC6ddlq1cFixaT2YIUWGRs7FwjUTc/FHpVD1U+xoM +-> ssh-ed25519 iO8/4g xvYTjf6wC9GkzcAwIpzrt76TlyC5FjzuOL7bQ0pBZ3E +krlcA7fsAfTf7IvLmZnWe9OOtevtqBMLQ3BhapusLu0 +--- lUsLtpAmkNnCBYN4DW7Ovv5WatY77bxU8WzFxrDUT0k +čޭ%FF9V4X&kC \ No newline at end of file diff --git a/agenix/hosts/tanker/mastodon/extraConfig.age b/agenix/hosts/tanker/mastodon/extraConfig.age index a3c8c87..f5b9a5e 100644 Binary files a/agenix/hosts/tanker/mastodon/extraConfig.age and b/agenix/hosts/tanker/mastodon/extraConfig.age differ diff --git a/agenix/hosts/tanker/mastodon/otpSecret.age b/agenix/hosts/tanker/mastodon/otpSecret.age index 075924c..6593b10 100644 Binary files a/agenix/hosts/tanker/mastodon/otpSecret.age and b/agenix/hosts/tanker/mastodon/otpSecret.age differ diff --git a/agenix/hosts/tanker/mastodon/secretKeyBase.age b/agenix/hosts/tanker/mastodon/secretKeyBase.age index 33079fb..0b12bc4 100644 --- a/agenix/hosts/tanker/mastodon/secretKeyBase.age +++ b/agenix/hosts/tanker/mastodon/secretKeyBase.age @@ -1,10 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g JkpzXmNNBQMnFsTHq6LTGdqcnOuaoyuoHLEhZ1B1IE0 -48v3LSzdX0n6MKAyDFhKdTeZjzhmgW4lXOHX30oHNcQ --> ssh-ed25519 iO8/4g F9+dikSYBCq/mUOUrvoowMKRHvcI/K6XtSxlxtAMaU0 -b6Dx/C5vYNXdkzujLlnZQ3aEryKOrTRnUkn/0OIBsz0 --> )sx-grease S SY71l?&= -BccDaWVHeqAeMNWT3S+3X1sZiEodhot5jJPsGSdcBtOSy7+4xufrdX/B+z+QfuMo -rIXGmQ ---- 4sbs6kDby/Pt9s4GPe704cxmxYrYI2Naa1YjgMO6y70 -~&*o0pBgk>Lü%ʸD A/}ڶt}_|}v 0y$jL8״SMsA邋 BcxMي6nq<`j;Ok*Xǝ@XV \ No newline at end of file +-> ssh-ed25519 MtGp6g 93q5ZFFGPdXx7WNOKTb4hkowNMgkSPKQHBgLJlhWzmI +JftX5B3KbeY9s+i9knW2342VrOdxV2R0Mdjsb+p0bUk +-> ssh-ed25519 iO8/4g WsODmvvePjjeGYtH7+jxhVs4LXOh2LhcITfHFjfJvh8 +J+K3VlaU2EesG1qwyugB+iX3DTfOQm628pnL6rEBWSI +--- kTfUi7TPuMQ19ScUGDf4kC0+MxJ/uRoHNBaqLgTbUS4 +2DʼnrySኹ`+Cio<łvގf;ap2>UWcl |x&uĘ/H_WӦ9vXQ۫3,tfO^֭]o\SjCS1C8$ŊnJB\zq٭u?ԛ#Oz \ No newline at end of file diff --git a/agenix/hosts/tanker/mastodon/smtpPassword.age b/agenix/hosts/tanker/mastodon/smtpPassword.age index 028910e..0cf0bcb 100644 --- a/agenix/hosts/tanker/mastodon/smtpPassword.age +++ b/agenix/hosts/tanker/mastodon/smtpPassword.age @@ -1,9 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g UYcHcYsaMBFH6RS+TBDpT45/3+eVVlRx/JVpXDvJdUQ -QkdeRft5FX4kKRcGNZ+hH8sLuFcb2dQVFxiIAnDDJX4 --> ssh-ed25519 iO8/4g I3VCKLLgT+V8ehWhvYTcEDyj5fSAf+rhcFOpDDk5RnA -YnA8+ovbUDt7zsyhLiNYp6mBBRqmfdN3E/VAh/szdKI --> {xVn9&^-grease -KVC2owNNTYRwUKb9qQ9rG9RFMn9Jve8DYbkt0ek ---- ECbJ8V2BT+01+k0dMfYkxkyp0GMzrn/R1ZCN4Kd8DQo -яR%Q w&V*V4~hu\XYٔiKksMNӰn0(u'{T79PC \ No newline at end of file +-> ssh-ed25519 MtGp6g S59+7nBcwUqmONsoZVdj38AMFzUSBPIKlU/6BQCFbW0 +EpOmNgPcTvCBcCPM2ZdWKFASdyhPXrqc0xKxLzq1Lkg +-> ssh-ed25519 iO8/4g KHUD8PEe1p1AvLnCPivlZXo31kxEd0kKKI0mH2s7aRk +UYzLkfqxjfaAabMjvkqsQWTkpcxtW3X8cdPN7gg99oE +--- q/zcloAH4/+9eUCVyn4v0+nH+lBiWRJE6A5IVB+vdNY +qp#h;"|w 5-&J!RSf:TZb0DK>9t9rFur#'\ \ No newline at end of file diff --git a/agenix/hosts/tanker/mastodon/vapidPrivateKey.age b/agenix/hosts/tanker/mastodon/vapidPrivateKey.age index 9e71672..8ece4be 100644 --- a/agenix/hosts/tanker/mastodon/vapidPrivateKey.age +++ b/agenix/hosts/tanker/mastodon/vapidPrivateKey.age @@ -1,9 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g lQFP6XGVNeVhNW2GNvbhwB6Ioo1aGbSv1pTlH3oO3Hw -J7YCjWhzbL2bvy6BYx5catINr2WCi/lg6XsfhPuMm6c --> ssh-ed25519 iO8/4g 5r2bAlPLqTbtNZsXz5Gn7ncrRtXGpunp2t/GwSmhulg -4ydNTfRT0JDYc+iwYVDEdTJFoEiEifz6HxYJtVC3sn0 --> gC-N|-grease -xVkdxNoYdrK21FwLl6SQj4vuK2dte5l4 ---- 1cc/CKuc3QQVSA/7/Boof2VuaMMnrOH8TLZPIrzfa9s -<%ABMMLx$G4;#&{NcѦf@'p.ӽ 7;%Q ]ET \ No newline at end of file +-> ssh-ed25519 MtGp6g 6l7ucBDt2QaSxP7T1W0Jn+SOzA9vxXqWhn7ZohjRyWQ +4msxRKtsZocw++f6aZ2Cm2UrpMqMYg5cvr30ftATWYM +-> ssh-ed25519 iO8/4g 608PBe4+GKnCYRRBpQsPJ76d7RYm9bTutdBnHpMMFFk +Jo8oJnL1HOKCKJT+HJ2XEwMzFXuhmqe3AoBdV602emM +--- 3GgleiDXwamkb9QrotzMuLzr3MZeJ0BEvCY2LenNQOg ++xCϕ䌇!6ٮX^L O"aͷғo56Wupq[qN; \ No newline at end of file diff --git a/agenix/hosts/tanker/mastodon/vapidPublicKey.age b/agenix/hosts/tanker/mastodon/vapidPublicKey.age index 1187522..e1569d9 100644 Binary files a/agenix/hosts/tanker/mastodon/vapidPublicKey.age and b/agenix/hosts/tanker/mastodon/vapidPublicKey.age differ diff --git a/agenix/hosts/tanker/mautrix-signal/config.age b/agenix/hosts/tanker/mautrix-signal/config.age index 2a82a2f..bc2e1f4 100644 Binary files a/agenix/hosts/tanker/mautrix-signal/config.age and b/agenix/hosts/tanker/mautrix-signal/config.age differ diff --git a/agenix/hosts/tanker/mautrix-whatsapp/config.age b/agenix/hosts/tanker/mautrix-whatsapp/config.age index cff3194..ad3c18c 100644 Binary files a/agenix/hosts/tanker/mautrix-whatsapp/config.age and b/agenix/hosts/tanker/mautrix-whatsapp/config.age differ diff --git a/agenix/hosts/tanker/miniflux/credentials.age b/agenix/hosts/tanker/miniflux/credentials.age index 70e173c..5e9d358 100644 --- a/agenix/hosts/tanker/miniflux/credentials.age +++ b/agenix/hosts/tanker/miniflux/credentials.age @@ -1,10 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g qZGcazmYr0cVRxTug4vtakkBqgWm9QC5wQPVnLU5iwM -+tKPQhktikJSIjzW/kcg+izEwJEY3z6gckQb3DdW5Qs --> ssh-ed25519 iO8/4g pSIzsTaHkoV9WAjCSJIAr9uRNuVTiPTnyacfylF1y0o -oGXKk9SAnuUzGpdO5iOiaZvqtXmco+FAYIgyH89K+SA --> \@3Ti?[K-grease n[ qu\ 9?W -7NfUxbNE7d9Om27ckTLpoqygnue5pR5Epu7QWoMaR4CZDQx0KfkeGf6EuCeybfcz -6XSsjsAYkZDMsQXn7hMWiQ ---- S6oZE6vH8A8dVnWOpfU/5vIGb0pkCueIB7soIj2SqwU -ԴU]kvXD|94| x{_BrwO"=eKAP<{LZN%M t[DjErg \ No newline at end of file +-> ssh-ed25519 MtGp6g oZsl3PPvlAorrBUF/NTOMyh2KHVwKiECN0v/JkKjtC4 +d0dUtH3ccmUGKGasnJmgNPGgRX+m7ay2SZyTQmQnS9Q +-> ssh-ed25519 iO8/4g tLneEy5uxLTSQN7QfJg9qv4xlXnpvMlMOSJ5kVUDYx8 +AbC1zlEyHU6Ksv7UyBo0B/QDqtZndiQ9hoJqk8CHOmI +--- CC1Q4O2318hUxt3uyHomz7gtzob5VE3APnNP/or274Y +gXfN"$/` +eP$j M!$+EPق n"!-D0 >"$i>2;&vjàg6$ E \ No newline at end of file diff --git a/agenix/hosts/tanker/mosquitto/passwordWeewx.age b/agenix/hosts/tanker/mosquitto/passwordWeewx.age index f4241cf..27bee40 100644 Binary files a/agenix/hosts/tanker/mosquitto/passwordWeewx.age and b/agenix/hosts/tanker/mosquitto/passwordWeewx.age differ diff --git a/agenix/hosts/tanker/mosquitto/passwordWeewxProxy.age b/agenix/hosts/tanker/mosquitto/passwordWeewxProxy.age index c9da380..acc9534 100644 --- a/agenix/hosts/tanker/mosquitto/passwordWeewxProxy.age +++ b/agenix/hosts/tanker/mosquitto/passwordWeewxProxy.age @@ -1,10 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g DDKoUegvH8ay9AZet7JR5Fm5rlLbG+J8M3S95FYvtlQ -/Y+EVrGiGvLNXNx9auwYU3+X8sk7iwreBCq0FxznYCM --> ssh-ed25519 iO8/4g +OGDl9FY/C7bWx/BvsLurIlFfbcZ4gMTxwcn2PCuLRk -jNPfr5GtIpjpPRVu7CTqKFr+d0iktmbsYR4mYls3lnQ --> VTq6sn-grease -Hz3Jv4/CTn0KY0K+fczMLo1TA53IvBrbPuIpNLHUGu7lVE8jIaDMOTKIArWdbcrR -iPdv ---- pCIBj99TU5X4ZaJLTBeTf58TIXAHj3GP7P+AszQ3mfc -R18M:^1zYq.~$ʬk g嗟QЉibYwIjBuyWf$R7 s'S2˴]&rǠ$NrKP^o нɉ3VCӻ`3 \ No newline at end of file +-> ssh-ed25519 MtGp6g qq19PBr7tgpasCQQi8nSyV+3VShgoOkAwVRobYFkeDE +euICZSoSET5kikwN2JMkD6l5w26CPBoxTv+R7Uqkm7Y +-> ssh-ed25519 iO8/4g Qs98juX0VMLd4qeUZDlgx3KT8hkE/ksNNWQnEFBiJF0 +NaxDEXUo5F3Es59BCVUn5Qx7pxPDyQYTiggVGbTggI4 +--- LBAROexrrljIl9DHzIWLhB373SqiQVqr46/otLElagU +S}ӟ}5 +LRX1xTݔGk(Eu tWcj2GA%z򙎡g(TMá_3)Q뽵304#8Fr|e P \ No newline at end of file diff --git a/agenix/hosts/tanker/msmtp/password.age b/agenix/hosts/tanker/msmtp/password.age index 051b053..7ea8705 100644 --- a/agenix/hosts/tanker/msmtp/password.age +++ b/agenix/hosts/tanker/msmtp/password.age @@ -1,9 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g 5c/NSUkybDx2UKB5fJ9MJQo/C9jl6jF3QGZqZ5aOxAA -O6i3E3GW9D7XLkyH5YR/wLrbxdvuxHtT5HtJDW9bn18 --> ssh-ed25519 iO8/4g L/le4ctTqR6cy6WSJXW6xVZe4/UKW6ta2LEN9ePkUxk -J9ShrIEux+7c916xYKvnAHLjuTN0Kr0fP31bW6gdxdI --> &qro-grease -E1A9qzYNBDP3tUE8vw/ZDIwjaiibl4yH/qQe1UpF ---- 2uYCd8++YtmpoHjVat1DB67GC2bELX8Drbk0Y6KdJ+Y -.$c%WS ˏGXbR>'JhUjqITRwxq9FSPf70 \ No newline at end of file +-> ssh-ed25519 MtGp6g 9Pz3m08c3BUg8h+avLzN/A6T21ZjW5WJBjL7GFDBSX8 +SjuwIJLJoW11NpbHbZ9Le8KasiHXJx+VrylsxEys5AE +-> ssh-ed25519 iO8/4g fpMU+i751dqWlOWIuXM59bXWlK+inW+oiAChdZ3S0kg +PdaffaIeozO5gkwkZ10+TP8QO8+a4OgVQe3dDY7H/Ng +--- 69RuAcJ8zaLpDx0zNXQ/U7xxlVcc9GzgTvASVBMgg98 +z;@f߁0`>#j|CY!w?F [%d>] +*)s t`]ωx}mG5M \ No newline at end of file diff --git a/agenix/hosts/tanker/proxitok/environment.age b/agenix/hosts/tanker/proxitok/environment.age index f783d3f..4966f57 100644 Binary files a/agenix/hosts/tanker/proxitok/environment.age and b/agenix/hosts/tanker/proxitok/environment.age differ diff --git a/agenix/hosts/tanker/synapse/extraConfig.age b/agenix/hosts/tanker/synapse/extraConfig.age index 77a8825..01455f6 100644 Binary files a/agenix/hosts/tanker/synapse/extraConfig.age and b/agenix/hosts/tanker/synapse/extraConfig.age differ diff --git a/agenix/hosts/tanker/synapse/slidingSyncConfig.age b/agenix/hosts/tanker/synapse/slidingSyncConfig.age index 83c6999..9ff30aa 100644 --- a/agenix/hosts/tanker/synapse/slidingSyncConfig.age +++ b/agenix/hosts/tanker/synapse/slidingSyncConfig.age @@ -1,9 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 MtGp6g zhyMIQB98GvWL6S2Z6+rjOkwsfv5Fw1NbICtvbOz8HM -vZAh7I5xP8RobeVS8NIZ58I9tm+cpiOZ7m+gLFKenjo --> ssh-ed25519 iO8/4g QycwplaVdS9CfKWpc2YXe6CAKlCNekT3+4b/+I+Fv0Q -BHoeoRZr3MUbbrF5dSGWUtHOp5RGu6lImAFdcH+z4hE --> M-grease ssh-ed25519 MtGp6g IvxSpUKtTuZH2IaJu7lyzYj5CKbGdrpbJys/ycL4+Q0 +rI//+Mq9R/wu/kel9QIXqTzqf/OHYP/GoSVfbA1aaMA +-> ssh-ed25519 iO8/4g nzawzM0ENbMVQt+WU+gCGWAHJ0PxeUSOtOckZ6LwnAw +JxeYgKyFuIfDGiAEpzRpnZtLcdRfFkcoCSR5UYBkopQ +--- vMzq4rKzuNP7RPYDzUwMW0ndPi2kfuU/7HS1XDZFA4M +^?_4ACRɄ=XcG#%"6hQs!i6̱ p4ATNu?8z6>ݘj%ЋZێ9ŲP!Q \ No newline at end of file diff --git a/agenix/hosts/tanker/tailscale/authkey.age b/agenix/hosts/tanker/tailscale/authkey.age index c19e48c..8951417 100644 Binary files a/agenix/hosts/tanker/tailscale/authkey.age and b/agenix/hosts/tanker/tailscale/authkey.age differ diff --git a/agenix/hosts/tanker/user/danielPassword.age b/agenix/hosts/tanker/user/danielPassword.age index 40c2621..f0cd58d 100644 Binary files a/agenix/hosts/tanker/user/danielPassword.age and b/agenix/hosts/tanker/user/danielPassword.age differ diff --git a/agenix/hosts/tanker/weewx/config.age b/agenix/hosts/tanker/weewx/config.age index 1ce702e..6edaa9c 100644 Binary files a/agenix/hosts/tanker/weewx/config.age and b/agenix/hosts/tanker/weewx/config.age differ diff --git a/agenix/hosts/tanker/weewx/skin.age b/agenix/hosts/tanker/weewx/skin.age index 73dd6a4..2aecef8 100644 Binary files a/agenix/hosts/tanker/weewx/skin.age and b/agenix/hosts/tanker/weewx/skin.age differ diff --git a/agenix/hosts/weather-sdr/mosquitto/passwordWeewxProxy.age b/agenix/hosts/weather-sdr/mosquitto/passwordWeewxProxy.age deleted file mode 100644 index e60939d..0000000 Binary files a/agenix/hosts/weather-sdr/mosquitto/passwordWeewxProxy.age and /dev/null differ diff --git a/agenix/hosts/weather-sdr/user/danielPassword.age b/agenix/hosts/weather-sdr/user/danielPassword.age deleted file mode 100644 index 1467e29..0000000 Binary files a/agenix/hosts/weather-sdr/user/danielPassword.age and /dev/null differ diff --git a/flake.nix b/flake.nix index db22836..d29d7b1 100644 --- a/flake.nix +++ b/flake.nix @@ -99,10 +99,10 @@ inherit inputs; }; - weather-sdr = import ./system/flakes/weather-sdr.nix { + neon = import ./system/flakes/neon.nix { nixpkgs = inputs.nixos-unstable; - inherit (inputs) home-manager agenix; + inherit (inputs) nixos-hardware home-manager agenix; inherit inputs; }; @@ -122,7 +122,7 @@ tanker = tanker.system; mediaserver = mediaserver.system; argon = argon.system; - weather-sdr = weather-sdr.system; + neon = neon.system; adsb-antenna = adsb-antenna.system; }; @@ -144,7 +144,7 @@ tanker = tanker.colmena; mediaserver = mediaserver.colmena; argon = argon.colmena; - weather-sdr = weather-sdr.colmena; + neon = neon.colmena; adsb-antenna = adsb-antenna.colmena; }; }; diff --git a/hardware/hosts/weather-sdr.nix b/hardware/hosts/neon.nix similarity index 79% rename from hardware/hosts/weather-sdr.nix rename to hardware/hosts/neon.nix index ac7cd9d..9c05314 100644 --- a/hardware/hosts/weather-sdr.nix +++ b/hardware/hosts/neon.nix @@ -4,23 +4,19 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot = { - initrd = { - availableKernelModules = [ "usbhid" ]; - kernelModules = [ ]; - }; - - #kernelPackages = pkgs.linuxKernel.packages.linux_rpi3; kernelModules = [ "tcp_bbr" ]; - extraModulePackages = [ ]; blacklistedKernelModules = [ "rtl2832" "dvb_usb_rtl28xxu" "rtl2832_sdr" ]; kernel.sysctl = { "net.core.default_qdisc" = "fq"; "net.ipv4.tcp_congestion_control" = "bbr"; - "net.ipv4.tcp_syncookies" = 0; + "net.ipv4.tcp_syncookies" = 1; "net.ipv4.tcp_timestamps" = 1; "net.ipv4.tcp_window_scaling" = 1; + "net.ipv4.tcp_fastopen" = 3; + "net.core.rmem_max" = 2500000; + "net.core.wmem_max" = 2500000; }; }; diff --git a/home/hosts/weather-sdr.nix b/home/hosts/neon.nix similarity index 90% rename from home/hosts/weather-sdr.nix rename to home/hosts/neon.nix index 70c4525..da3e8e4 100644 --- a/home/hosts/weather-sdr.nix +++ b/home/hosts/neon.nix @@ -15,7 +15,7 @@ ]; home = { - stateVersion = "22.11"; + stateVersion = "23.11"; packages = with pkgs; [ ripgrep diff --git a/home/programs/ssh/shared/private.nix b/home/programs/ssh/shared/private.nix index 786f3d5..f1bd9d2 100644 --- a/home/programs/ssh/shared/private.nix +++ b/home/programs/ssh/shared/private.nix @@ -50,15 +50,6 @@ identitiesOnly = true; }; - "weather-sdr" = { - hostname = "weather-sdr.laniot"; - port = 22; - user = "daniel"; - forwardAgent = true; - identityFile = "~/.ssh/LAN.pub"; - identitiesOnly = true; - }; - "tanker" = { hostname = "tanker.ts.kempkens.network"; port = 22; @@ -85,5 +76,14 @@ identityFile = "~/.ssh/LAN.pub"; identitiesOnly = true; }; + + "neon" = { + hostname = "10.0.0.7"; + port = 22; + user = "daniel"; + forwardAgent = true; + identityFile = "~/.ssh/LAN.pub"; + identitiesOnly = true; + }; }; } diff --git a/secret/hosts/neon.nix b/secret/hosts/neon.nix new file mode 100644 index 0000000..e1fcc8b Binary files /dev/null and b/secret/hosts/neon.nix differ diff --git a/secrets.nix b/secrets.nix index c69deaf..733e37e 100644 --- a/secrets.nix +++ b/secrets.nix @@ -4,13 +4,13 @@ let system-tanker = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpnogLd3Ttmz/At0dXveaG1xF37vV7lz34ojDTIuCOi"; system-mediaserver = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDlB0cL5CtTOyARWSE2yUsNU4JHUPmr71710mZHzsmbX"; system-argon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPP9ygczyi6g8abvj1I0eAj7N2Rli9UMlkC8VT6SnWLU"; - system-weather-sdr = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBHuAdx5u9R2DyK065DUxdwhEOi0at1WNkY5f4JtrOzk"; + system-neon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5Ht4KaRUvuGFmYLznTkVSnn6isjrcVplz1kKWkrnRQ"; tanker = [ user-daniel system-tanker ]; mediaserver = [ user-daniel system-mediaserver ]; argon = [ user-daniel system-argon ]; - weather-sdr = [ user-daniel system-weather-sdr ]; - all-systems = [ user-daniel system-tanker system-mediaserver system-argon system-weather-sdr ]; + neon = [ user-daniel system-neon ]; + all-systems = [ user-daniel system-tanker system-mediaserver system-argon system-neon ]; in { # all @@ -100,8 +100,10 @@ in "agenix/hosts/argon/weewx-proxy/environment.age".publicKeys = argon; - # weather-sdr - "agenix/hosts/weather-sdr/user/danielPassword.age".publicKeys = weather-sdr; + # neon + "agenix/hosts/neon/user/danielPassword.age".publicKeys = neon; - "agenix/hosts/weather-sdr/mosquitto/passwordWeewxProxy.age".publicKeys = weather-sdr; + "agenix/hosts/neon/forgejo-actions/token.age".publicKeys = neon; + + "agenix/hosts/neon/mosquitto/passwordWeewxProxy.age".publicKeys = neon; } diff --git a/system/flakes/weather-sdr.nix b/system/flakes/neon.nix similarity index 79% rename from system/flakes/weather-sdr.nix rename to system/flakes/neon.nix index 2acbc71..55d1978 100644 --- a/system/flakes/weather-sdr.nix +++ b/system/flakes/neon.nix @@ -1,4 +1,4 @@ -{ nixpkgs, home-manager, agenix, inputs, ... }: +{ nixpkgs, nixos-hardware, home-manager, agenix, inputs, ... }: let default-system = "aarch64-linux"; @@ -26,7 +26,9 @@ rec { system = nixpkgs.lib.nixosSystem { system = default-system; modules = [ - ../hosts/weather-sdr.nix + ../hosts/neon.nix + + nixos-hardware.nixosModules.raspberry-pi-4 home-manager.nixosModules.home-manager @@ -40,7 +42,7 @@ rec { home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.daniel = import ../../home/hosts/weather-sdr.nix; + users.daniel = import ../../home/hosts/neon.nix; }; } ]; @@ -48,9 +50,10 @@ rec { colmena = { deployment = { - targetHost = "weather-sdr"; + targetHost = "neon"; targetPort = 22; targetUser = "root"; + buildOnTarget = true; }; nixpkgs.system = default-system; diff --git a/system/hosts/weather-sdr.nix b/system/hosts/neon.nix similarity index 70% rename from system/hosts/weather-sdr.nix rename to system/hosts/neon.nix index 2808171..8b996a2 100644 --- a/system/hosts/weather-sdr.nix +++ b/system/hosts/neon.nix @@ -1,26 +1,34 @@ -{ pkgs, config, ... }: +args@{ pkgs, config, ... }: let + secret = import ../../secret/hosts/neon.nix; ssh-keys = import ../shared/ssh-keys.nix; in { imports = [ - ../../hardware/hosts/weather-sdr.nix - ../../agenix/hosts/weather-sdr/config.nix + ../../hardware/hosts/neon.nix + ../../agenix/hosts/neon/config.nix ../shared/show-update-changelog.nix ../nixos/raspberry.nix ../nixos/ssh.nix + ../nixos/eternal-terminal.nix ../nixos/git.nix ../nixos/attic.nix + ../nixos/chrony.nix + + (import ../nixos/forgejo-runner.nix (args // { inherit secret; name = "neon"; tag = "ubuntu-latest-arm64"; nixTag = "arm64"; })) + ../nixos/mosquitto.nix ../nixos/rtl_433.nix + + ../nixos/container.nix ]; - system.stateVersion = "22.11"; + system.stateVersion = "23.11"; nix = { package = pkgs.nixVersions.stable; @@ -44,7 +52,7 @@ in gc = { automatic = true; dates = "weekly"; - options = "--delete-older-than 7d"; + options = "--delete-older-than 14d"; }; extraOptions = '' @@ -66,7 +74,7 @@ in }; networking = { - hostName = "weather-sdr"; + hostName = "neon"; useNetworkd = true; }; @@ -74,11 +82,13 @@ in enable = true; networks = { - "10-iot" = { - matchConfig.Name = "enu1u1u1"; + "10-lan" = { + matchConfig.Name = "end0"; + vlan = [ "vlan51" ]; networkConfig = { DHCP = "yes"; - IPv6AcceptRA = false; + IPv6AcceptRA = true; + IPv6PrivacyExtensions = true; }; linkConfig.RequiredForOnline = "routable"; @@ -88,16 +98,26 @@ in "ptbtime3.ptb.de" ]; }; + + "20-iot" = { + matchConfig.Name = "vlan51"; + networkConfig = { + DHCP = "no"; + IPv6AcceptRA = false; + }; + address = [ "10.0.51.7/24" ]; + linkConfig.RequiredForOnline = "routable"; + }; }; wait-online.extraArgs = [ - "--interface=enu1u1u1" + "--interface=end0" ]; }; services.journald.extraConfig = '' SystemMaxUse=512M - MaxRetentionSec=7day + MaxRetentionSec=30day ''; security.sudo.enable = true; @@ -108,7 +128,12 @@ in }; services.hardware.argonone.enable = true; - programs.fish.enable = true; + + programs = { + fish.enable = true; + zsh.enable = true; + htop.enable = true; + }; users.users = { root = { diff --git a/system/nixos/rtl_433.nix b/system/nixos/rtl_433.nix index 3569ca0..71e7b6a 100644 --- a/system/nixos/rtl_433.nix +++ b/system/nixos/rtl_433.nix @@ -40,7 +40,7 @@ mosquittoPorts = [ 1883 ]; in { - "enu1u1u1".allowedTCPPorts = mosquittoPorts; + "end0".allowedTCPPorts = mosquittoPorts; }; services.udev.extraRules = ''