diff --git a/dragonwell/beszel.nix b/dragonwell/beszel.nix deleted file mode 100644 index f63f49bcfda70d3f91dadb765983abc774d5de29..0000000000000000000000000000000000000000 --- a/dragonwell/beszel.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, ... }: -{ - age.secrets.beszel-dragonwell.file = ../secrets/beszel-dragonwell.age; - services.beszel.agent = { - enable = true; - environment.LOG_LEVEL = "info"; - environmentFile = config.age.secrets.beszel-dragonwell.path; - }; -} diff --git a/dragonwell/default.nix b/dragonwell/default.nix index 090548bbae0299c464f27a16a06c9bffed0f5a34..d2ce5cdd8083b4028064ad97ba291e4cfb335c1d 100644 --- a/dragonwell/default.nix +++ b/dragonwell/default.nix @@ -4,7 +4,6 @@ key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+uhnfFLhlyfGGsksSxh5IIY6gnIMryeQ2EiM979kZa"; in { imports = [ - ./beszel.nix ./caddy.nix ./dex.nix ./forge-lines.nix diff --git a/flake.nix b/flake.nix index b3dc1cbd66ba4ef57d02e1e921bf9894f95be3f6..f627d6db890c98e4322f52fb24d816c7e7f09efd 100644 --- a/flake.nix +++ b/flake.nix @@ -56,13 +56,12 @@ inputs.golink.overlay ]; system = "x86_64-linux"; pkgs = import inputs.nixpkgs { inherit system; }; - beszelHub = "${beszel}/nixos/modules/services/monitoring/beszel-hub.nix"; - beszelAgent = "${beszel}/nixos/modules/services/monitoring/beszel-agent.nix"; in { colmena = { meta = { nixpkgs = import nixpkgs { inherit overlays system; }; + nodeNixpkgs.shincha = import beszel { inherit overlays system; }; specialArgs = { inherit inputs; }; @@ -76,13 +75,8 @@ inputs.foundry.nixosModules.foundryvtt inputs.forge-lines.nixosModules.default ./modules/miniserve ./dragonwell - beszelAgent ]; - jasmine.imports = [ - inputs.agenix.nixosModules.default - ./jasmine - beszelAgent - ]; + jasmine.imports = [ ./jasmine ]; gunpowder.imports = [ ./gunpowder ]; shincha = { pkgs, ... }: @@ -95,8 +89,6 @@ inputs.mazanoke.nixosModules.default inputs.tailproxy.nixosModules.default ./modules/tclip ./shincha - beszelHub - beszelAgent ]; services.tclip.package = inputs.tclip.packages.${pkgs.system}.tclipd; }; diff --git a/jasmine/beszel.nix b/jasmine/beszel.nix deleted file mode 100644 index eb7e365c97c24da7d856564f87b6673160addfa8..0000000000000000000000000000000000000000 --- a/jasmine/beszel.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, ... }: -{ - age.secrets.beszel-jasmine.file = ../secrets/beszel-jasmine.age; - services.beszel.agent = { - enable = true; - environment.LOG_LEVEL = "info"; - environmentFile = config.age.secrets.beszel-jasmine.path; - }; -} diff --git a/jasmine/default.nix b/jasmine/default.nix index 19f1db904da764c8200ca3898988b114dcf0b049..c4a0c619db0aeea6771c13e796405d5d3ff1640f 100644 --- a/jasmine/default.nix +++ b/jasmine/default.nix @@ -4,9 +4,8 @@ key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7cgpIUaEY3q12xBct9a0gIl7rdckBBPsWQea7Wtj7P"; in { imports = [ - ./beszel.nix + ./hardware.nix ./homeassistant.nix - ./hardware.nix ]; boot.loader.grub = { diff --git a/secrets/beszel-dragonwell.age b/secrets/beszel-dragonwell.age deleted file mode 100644 index 7706f094e23afe53b7a12d828443cfb91d32cc57..0000000000000000000000000000000000000000 --- a/secrets/beszel-dragonwell.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 E8j6/g FULGDIRTOpsdr5BQRHJBtbarmLmG7u1pyVKuPugvShE -XaNCPPCHxPtCiquUdlAZczFlJoYvJVEbAOmsifPKg40 --> ssh-ed25519 f31uNA 9UeFA3rkqduVCRekz9v1uSpx3Q1RmQKm/BbHxIlhumk -Pp7x9xqH9xCqvaIwjhZkXzt/qlvnunwOeTDwJogkGHs ---- yQpM58nlvx1oEhG4bHfIMMBBD86qWNOIEVTeGQbs/oc -j?-j=kI\.e3%u2aBRՑUPΐ] 'L!^SjDbwːq"V~=vڹ[! \ No newline at end of file diff --git a/secrets/beszel-jasmine.age b/secrets/beszel-jasmine.age deleted file mode 100644 index 1b3058823d78136e8eef9cf44f6d76fa08c1008b..0000000000000000000000000000000000000000 --- a/secrets/beszel-jasmine.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 E8j6/g J9D9FM4HXPYZ0RVs4hW8ytuhHGb02nMRJQi6jBRsQnA -X5wgEJSBvcCHNu/GhPoHl8R+4Jgcfn4Q4jeqAVt03WQ --> ssh-ed25519 orwHCg /sOGaTBrn1di6i4G/AUZFQxHMRJ0zTcnv2Y9BrBu2U4 -PoxSDSZh0bA4DLll7uWNpq78tUxSx8UbasjvSbSLfkU ---- /xIsG75GOF0uoq8rmg/p7TXRC5EtUm8hpJHPYuy8Pcc -3&2;gb4 7H0 ssh-ed25519 E8j6/g ELjIQSmsbz0PK7s9RcL4vTaOBbUrpH9EGAXN998n9RY -JegzXcs//6TJ9tKXDKiP/blc+J0EhWJlXKju/p3bKcU --> ssh-ed25519 Wq7dJg aBTNYwpqMV3tf9adr//rnwY0ehXhNd7PICsR6uOagzk -wwvEAHmBzKL3iqeBJuMDf60vaKvuSdt1cLvTVlG0OMI ---- haqhC+ktwsqN/M9FvI16J+V5a7aczQVPuQ0Z0ROXJl0 -+㤽zXنCKzj|+t$g~ +[bݸ"+6 31_D2Zv%vޢmKwWny \ No newline at end of file +-> ssh-ed25519 E8j6/g mL6nO3HCC14lfK/HIdQpkXTfy95roDZLHFLqHnFFISI +k4DbNNm/D8GUvI92YfpSqBpDob8XGJPHPQOmNuU+xpQ +-> ssh-ed25519 Wq7dJg 3GOsr8uVvvuB/ZiZJfDzWCmW7d6fE6Fb7dLYmWcpYhU +clehXep3nsywAh6su4zcZXlyd2XLpQsJKWg4JWPwN/Q +--- TGGz5Hqn2KlGPTDSmleteF/D+Mbg22WgxYZoYcnUYDY + oOg8M|-NOVQޓsr\H"2!nݺ)|ohcƈ m#鷣7EXJy6CK +Ms \ No newline at end of file diff --git a/secrets/dex-tailscale.age b/secrets/dex-tailscale.age index fd08a0a9c6041197813d276ef962757ba859a45c..49110af5e0e9879e20049f5184106f19f1a1b2e9 100644 Binary files a/secrets/dex-tailscale.age and b/secrets/dex-tailscale.age differ diff --git a/secrets/dex-tandoor.age b/secrets/dex-tandoor.age index a225884f01176c109450fa3a327fbef77997c546..5c6d1abf31d0a3b25e3c50be24c31c4631191ada 100644 Binary files a/secrets/dex-tandoor.age and b/secrets/dex-tandoor.age differ diff --git a/secrets/dex.age b/secrets/dex.age index 8fd1fb58fe9223a1f19a8207aa0766ac0395e8ec..f3c6c0d3938a9bec41cbfd0f123baeec312697cd 100644 --- a/secrets/dex.age +++ b/secrets/dex.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g FlKwxt0jQldPaUYvtVjgVxMDNdb36kclogKonEwBVww -Qn9GzexKqtlmfrhvyfvE3uPJyjn2WtM7bMsC2iUpJb0 --> ssh-ed25519 f31uNA b+0yX8OagjPVGVi8Y85mCu/Qj7kvUqYWfA3nSImuMmQ -KXnubgxUpL6h25UjzAixmfm59CMvx+vMM3bNMkLxQp8 ---- NQxJ6mSxKAH+ks3btpbDBVmcdT3GuKrCrd6Gi9y8ePw -tbe~42-T1(M!o '`ك4v){pJ~>\s@OSY 8jow_ے{*9*Tf䃽t lw[@1s}lqt9dbM.n_9i@!Z]9SU) \ No newline at end of file +-> ssh-ed25519 E8j6/g 5ad0uNPinL7QAROdRvj0ISYh1L2VpUu0qq5ukXYvLQk +WPGVSdXlAgKvitdpdxwfGDccMZZBhW3mKRASCDz6Tnw +-> ssh-ed25519 f31uNA HatP45NLfh3G5CP3cz04J+8JfiqPS6AMxJCHKVBhRAA +XLFEIkjdQoezUnAAtDqK+s412Mc3iSRUeo+9iduK650 +--- 6F/LUb4MrV+NBOeTgN8fP4Wvf8lmuIq1FmMd1mwA1YY +ubYiς-ձy"u D3{GПԭ2Sٰ^~In|w(rvTl$KL_$J~iRTv$TۋG3 nhIRo٬W ܼԕZ--nNwj|v$qv%O%ibWbǽ!4"=]X- \ No newline at end of file diff --git a/secrets/forge-lines.age b/secrets/forge-lines.age index 8730fca21b7a4978c1f49fd034f15b99f5b8a172..d5603a1fb681f92564ab513bbc813c5afe56ea8a 100644 --- a/secrets/forge-lines.age +++ b/secrets/forge-lines.age @@ -1,8 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g MOue2FWi5KIuH/YezYHaC2BhTLJyAm++9wcBfiOD21w -wzLYn3if+zWfDLmtC5x7rc8y0wTHs/ndXA+nIiDPNe0 --> ssh-ed25519 f31uNA pUzaDSPDHD+G1hxXcEEFdWEr8pL8TnaSSxJWJaTLWiI -nQhS0G4ZpBPzbFDsNm/73UEyTWtjd+ovhHtM8T9qxXs ---- HiupunEhBca/FwNXRI3dXpNoSr/UtsIkCiHYvUi0Z5o -I"5R`q4c5/'$_z?y3NĬĐwO< ? -5~PJaѓvw$Z.(r \ No newline at end of file +-> ssh-ed25519 E8j6/g yJyH71dW64CXsryp8805sFGNK1dTPpENHwIefqJhsCk +2nwO/+vY46A3PiqSvSlx44TfSLoeoUZEQLEP+q4jnSw +-> ssh-ed25519 f31uNA alNSzssbbr0prlXybNB0+VWHylN8kilnk2HN4z4H8FE +/92WNBM6LgPiDx5IQePjYX7+nX5yChr0OLhRbNl1LH0 +--- 4ZQvj6BHOH1Vc9Cp6a+XV68KrTxTc0YXxvzs9RYHQFE +ܞHa9|lHlˏ +U[]-k@I>g,&) /:j!d6D+d[r1Ai]HMl9OTxr D$(E \ No newline at end of file diff --git a/secrets/pocket-id.age b/secrets/pocket-id.age index 5dfffbb6bef72851892640e8884a312cc344f828..f32f177edc12bbff91da1c7d9964f5c67f21bdfd 100644 --- a/secrets/pocket-id.age +++ b/secrets/pocket-id.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g W8IBejPJVKQE0AwIZR0rviKrJGsslFuGRgyRcfbKtys -tFh0jbbUgNB7bBbV9bzhg9eJdmgzXOZSrcjEdXGAXjI --> ssh-ed25519 f31uNA fX6qgzOgUFO7P+TLKrYwoOsOIgN+JhrMufbSfAhYwTY -MbDLpgFF2kHPLZOCcB6byU6hw2dv9A60DlY1naTr3Pw ---- ru0OmVSJEgh4FK3zkDmmAvxeWx7CIQ7iu1ym4zCe85E -wZz uSuXd/Ȼ46-zU>1& h:4drn|TO H0T\֞A uE'kHsgoL@v/t&s| \ No newline at end of file +-> ssh-ed25519 E8j6/g 4hVdi54c1QFl1Qb7MVV68Xx8+EOuYmt9jCTelQOnt0o +yy7mmmZn0qVEIDkvPbFvndZXgdPqtzSMakziq82VBT4 +-> ssh-ed25519 f31uNA WIzUjqVsgu5NImCBumryJdaq+cTDEmFQaI68TDhZ6XM +D6OmWBg/GZPQNYu6jXo8w9nmNGs5V05bcROkN4wArx8 +--- 51EV6tl8R8DTaOlLVRzHutB3IjVhpaXit+QMtZLRzds +arBHKĠeLn'7y׮J@Q8|6P2Mȕg~pw^U9'LDD˫8 \ No newline at end of file diff --git a/secrets/restic-env.age b/secrets/restic-env.age index 87a10f7fd00877ecccd4adb80158ee8c942c00ab..85478399521b8cedc716f7ca1be4ee07d5c1ea08 100644 Binary files a/secrets/restic-env.age and b/secrets/restic-env.age differ diff --git a/secrets/restic-pass.age b/secrets/restic-pass.age index 21a8378a9894e93d41126d610c00a03ccddb5a1f..9ebb93a62c6503f821b5e72e1b2f765016321b6b 100644 --- a/secrets/restic-pass.age +++ b/secrets/restic-pass.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g 21X4ZbbN1FeIU7uP+kPeZ4X60S88wbIWjJ14TUAk83s -nrbTqIKD/7O2nomfAk3CpyWbuq3/E9XGkUIIVlnDVMI --> ssh-ed25519 f31uNA XVLq4GIYQkaIJvnq2df+UFvZbD11liqEEGozgOaaNAo -FTZo7x0m0XfqFQXKWTc4MYnjEYkRTKNkMi8212yAqvk ---- ocF8qKvsF8zoXQWUNhE3UXu8lMGZcgbLyEchdXRQUUw -/1iq?^suVM7_6x`=lA>(0 \ No newline at end of file +-> ssh-ed25519 E8j6/g Xme/jcIO50c315grJlMhHAn10vqtLDtKBuF4GIvJGhg +AJwz1H+bLKtjZcEfWkwwnUx+iIQdR6ssXQkFNSvV1lg +-> ssh-ed25519 f31uNA zyeVLuWDAMrcDDWAu6eIeNY0IjL8MWmlQrKQG3+nkGU +ZiQM/n1uN6QlJl5R+aNiwYfeHcztCjtxkun+HIDS38Y +--- Hn5sQs1h7zrYGV8XbHDxYU072n9HVKSdeZob6hR4E5M +B¾Н@UQV&*ؓgM/5p _Bt| \ No newline at end of file diff --git a/secrets/restic-repo.age b/secrets/restic-repo.age index 756ef95a5d2944e4f3c2314b7f32e5af3198f61e..c60546327ce56056628c75716f36e3b77177a872 100644 Binary files a/secrets/restic-repo.age and b/secrets/restic-repo.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index b3e6d818bd78c001e8142d9891f3bddf229627ba..96a650479fbb6cd01b13d6bf478ead783d98a0db 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,7 +2,6 @@ let jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53"; shincha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBikiSP5UIoHgjZejxSt/ce2FxnYk9VGDW+h12QvefJ3"; - jasmine = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE4koC93ixwkFzMK+kYLk2A6+xn6xprzkk49k+avRZkn"; dragonwellKeys = [ jolheiser @@ -12,11 +11,6 @@ shinchaKeys = [ jolheiser shincha ]; - jasmineKeys = [ - jolheiser - jasmine - ]; - in { "restic-env.age".publicKeys = dragonwellKeys; @@ -28,6 +22,4 @@ "dex-tandoor.age".publicKeys = dragonwellKeys; "forge-lines.age".publicKeys = dragonwellKeys; "pocket-id.age".publicKeys = dragonwellKeys; "beszel-shincha.age".publicKeys = shinchaKeys; - "beszel-dragonwell.age".publicKeys = dragonwellKeys; - "beszel-jasmine.age".publicKeys = jasmineKeys; } diff --git a/shincha/cfg.nix b/shincha/cfg.nix index 3f2ef70e0d880571df46bcbaeb7a1ee608a936b0..9e87a2de2abf80a251a0dc373da6643335dd1c26 100644 --- a/shincha/cfg.nix +++ b/shincha/cfg.nix @@ -2,6 +2,6 @@ { services.cfg-playground = { enable = true; verbose = true; - auth-key = "tskey-auth-kvTmESR4X411CNTRL-rxnWk7pBz9b58GKBStYHAb1gFuk9r1VTA"; # One-time key + auth-key = "tskey-auth-ksTZtpeU1i11CNTRL-HmmWuAFifG3xxy8UDr1yG3UdjiYJ3mtGe"; # One-time key }; } diff --git a/shincha/golink.nix b/shincha/golink.nix index 887a64d14787a93a00bdd342e2c74355a045ae4b..9e65524a795e059659db3b5e229f266a533b2a86 100644 --- a/shincha/golink.nix +++ b/shincha/golink.nix @@ -2,6 +2,6 @@ { pkgs, ... }: { services.golink = { enable = true; - tailscaleAuthKeyFile = pkgs.writeText "tskey" "tskey-auth-k7Tfyvczdn11CNTRL-tE6VsLtnqEaTzfugS2XYEaEEaVQPxUsbf"; # One-time key + tailscaleAuthKeyFile = pkgs.writeText "tskey" "tskey-auth-kGaKxz5CNTRL-nvyRLm7J38B37QZ2gCDM8BqtwyC6zJUh7"; # One-time key }; } diff --git a/shincha/tclip.nix b/shincha/tclip.nix index 3c202edf97dceba83f4e0085bc3ac8dadeb65ece..db4dcd802fb6603260966715df18c83518968242 100644 --- a/shincha/tclip.nix +++ b/shincha/tclip.nix @@ -4,6 +4,6 @@ enable = true; hostname = "paste"; useFunnel = true; hideFunnelUsers = true; - authKey = "tskey-auth-kK1ktiQ5K921CNTRL-8pC8dxF15xMdZPtidGCmwMXQui6dosp1"; # One-time key + authKey = "tskey-auth-k1VerP4gam11CNTRL-89rpeDcfTdJqkF9AECWmdJLVgo1jQcSAB"; # One-time key }; }