diff --git a/flake.lock b/flake.lock index 43ed98855f01c3c7ce7ccea6be97866308a67f57..3491c18df2df298b9072f6551ea1a33b59d8b5b7 100644 --- a/flake.lock +++ b/flake.lock @@ -364,11 +364,11 @@ "inputs": { "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1746646765, - "narHash": "sha256-ehZw23ENq6rjpK0qi1whIqtoItAx7sXBmNTN9UXyhBI=", + "lastModified": 1746641281, + "narHash": "sha256-EU8w6Hq5s175ymaxGZhLo6Exbciq4htbJFYzMZ8Hj6Y=", "owner": "jolheiser", "repo": "mazanoke-nix", - "rev": "fd53b71ad16c33a9d39658f374308c2588e73ce0", + "rev": "e0f7ea2066e1166afa8501d640199dc5237705e4", "type": "github" }, "original": { diff --git a/secrets/beszel-shincha.age b/secrets/beszel-shincha.age index a9fd3650e937a3de4f84b5c16a39d2cb687574d0..e81d7d4442ba48f270a4fa036e5415983caacbdc 100644 --- a/secrets/beszel-shincha.age +++ b/secrets/beszel-shincha.age @@ -1,8 +1,7 @@ age-encryption.org/v1 --> 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 +-> ssh-ed25519 E8j6/g 3hWESZAMXSKnKnUWosMEJwXbSeudiQ40NCoF48kVS24 +JVP/xt+qVIugu+uNS0sg9gW5OdwrXjVhuSDmGZyCVGw +-> ssh-ed25519 f31uNA bKfpISFkhxXfCLL2SwxWORIEROu+8GLdJUy389SPBGE +HKuav0FlZZw0Dg9gbTweNr3YIsen0VTGGDgcX0Q82Qc +--- 2uciEdq5AjFeD0f48YwHOe/MeXFewnijFaquOkEw75c +k>aFG}[z2x"O+_` \ No newline at end of file diff --git a/secrets/dex-tailscale.age b/secrets/dex-tailscale.age index 49110af5e0e9879e20049f5184106f19f1a1b2e9..e6f83b71beae4e9eb9b8ac2836171338c91e603d 100644 --- a/secrets/dex-tailscale.age +++ b/secrets/dex-tailscale.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g BSWLwEbEjTBbmYJTow0qrbNjZPH4kbtFIZCB5VYG0RE -Gghy6luK547mOusNrkxwOQKS3k5fgrVxuVcWSCm5EDU --> ssh-ed25519 f31uNA GgXVD8HSO0et6hmWnKMNJ5w9+pMJdR3OPVKEA2pH/WY -57VrwUTzEDxRBt2h6txZZrn/lZpVrQ6pde+e2kPxrFs ---- xP1BA8Oouajxf+5vm+VdOiqIsBswbKRNd3E3ZtqH720 -+yXO$5g ߠ(2Rnq|`%_lʹ"s!i?Skr \ No newline at end of file +-> ssh-ed25519 E8j6/g OcoMszulWi+6YFqySgxOuDQ8ggo1VfZ+9mX80L+A+lo +Kv9FBLVwI3z3a2YeEdzaZSsMJnXSGn64lAaNMIwIDFk +-> ssh-ed25519 f31uNA Utq5aNPsLK+RPwukTg9Ma70X2bpNhf8paDesfLZ/bU0 +WiMmSq2FeDdhyfrS+KUsPRotXEeCv7TUbK0tn+r9iuQ +--- LV8xaL5Wsg1NR26St6l0KUhjey37Li8Rbr58cl2tTns +{,LWk_į2U?Sd'HT`b9ZP%[ M \ No newline at end of file diff --git a/secrets/dex-tandoor.age b/secrets/dex-tandoor.age index 5c6d1abf31d0a3b25e3c50be24c31c4631191ada..4fc4832779a2935b75d33564020024583251d029 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 f3c6c0d3938a9bec41cbfd0f123baeec312697cd..55d02bafc4decbed9a3c49b7939fae9837ca40bd 100644 Binary files a/secrets/dex.age and b/secrets/dex.age differ diff --git a/secrets/forge-lines.age b/secrets/forge-lines.age index d5603a1fb681f92564ab513bbc813c5afe56ea8a..b0e878b4302b7193a26ab71ef9cabc4b518bd266 100644 --- a/secrets/forge-lines.age +++ b/secrets/forge-lines.age @@ -1,8 +1,7 @@ age-encryption.org/v1 --> 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 +-> ssh-ed25519 E8j6/g z8hVrv3gzEzMDN4oAmowfJTqrfZ8uuf2Ubvj6qPRAUc +bCro6AhefbThDPrKqIDres2F3ZjOgjmK0pW46sNHTTA +-> ssh-ed25519 f31uNA hKyGGOikE6vNU0fFA5W6RHTYrME4L3meXZMn4zT7KC8 +XQaAPKvpxhVjZ34B4Eoua1rSn0NR78T1wNHXDq66fiM +--- C5jQ3eF/V8p0hXOKb0GvYkd/3caKl6nM/ezzlLiPoCY +N9-Op>!MC6#gR<~;u6Xr( 1nЙؙwJ*ٲwJB 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 +-> ssh-ed25519 E8j6/g yiZaIQNlZYqhimGfLh9eDlRg3TRZOzGzz/FlF3PzUgY +5ehtgBdPFVpjEx+IKI/us8EclSLerTD0GtQEdpTXgJk +-> ssh-ed25519 f31uNA UcgDly1+cWneUANspYpzI42WuCdNBazqnKCdVGyxBWg +OHJBjbAVnVm1haa8Xt6gRl9z1KQSuk+kHvfpZhVqruU +--- kCZKTNmby7NP+HQE1J2NdjU+OzKYmBzGeBOxwW8hefk +|/xf<zoBbE=j; ,4~o(qDV}f'0u0o}nm߱ʙ'4ŚNU4EqU \ No newline at end of file diff --git a/secrets/restic-env.age b/secrets/restic-env.age index 85478399521b8cedc716f7ca1be4ee07d5c1ea08..af199bd5f3b2c12c7fc4aa21abdb326fc30c9e5c 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 9ebb93a62c6503f821b5e72e1b2f765016321b6b..226bc6ecc9fb2c2d059348d8144ce91e4e312e28 100644 Binary files a/secrets/restic-pass.age and b/secrets/restic-pass.age differ diff --git a/secrets/restic-repo.age b/secrets/restic-repo.age index c60546327ce56056628c75716f36e3b77177a872..2075356e38c137ca4302d8caef8fe297d78a7f9a 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 96a650479fbb6cd01b13d6bf478ead783d98a0db..5fcb8306f95888ca37bfd7cbe307b3048bddba6b 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,25 +1,20 @@ let jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53"; - shincha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBikiSP5UIoHgjZejxSt/ce2FxnYk9VGDW+h12QvefJ3"; - dragonwellKeys = [ + keys = [ jolheiser dragonwell - ]; - shinchaKeys = [ - jolheiser - shincha ]; in { - "restic-env.age".publicKeys = dragonwellKeys; - "restic-pass.age".publicKeys = dragonwellKeys; - "restic-repo.age".publicKeys = dragonwellKeys; - "dex.age".publicKeys = dragonwellKeys; - "dex-tailscale.age".publicKeys = dragonwellKeys; - "dex-tandoor.age".publicKeys = dragonwellKeys; - "forge-lines.age".publicKeys = dragonwellKeys; - "pocket-id.age".publicKeys = dragonwellKeys; - "beszel-shincha.age".publicKeys = shinchaKeys; + "restic-env.age".publicKeys = keys; + "restic-pass.age".publicKeys = keys; + "restic-repo.age".publicKeys = keys; + "dex.age".publicKeys = keys; + "dex-tailscale.age".publicKeys = keys; + "dex-tandoor.age".publicKeys = keys; + "forge-lines.age".publicKeys = keys; + "pocket-id.age".publicKeys = keys; + "beszel-shincha.age".publicKeys = keys; } diff --git a/shincha/beszel.nix b/shincha/beszel.nix index 994c9bae452b48dcfa244f820c2f996e8b9d2029..82e79d033f0522facad298d3151afe16778d1869 100644 --- a/shincha/beszel.nix +++ b/shincha/beszel.nix @@ -4,9 +4,11 @@ age.secrets.beszel-shincha.file = ../secrets/beszel-shincha.age; services = { beszel = { agent = { - enable = true; - environment.LOG_LEVEL = "info"; - environmentFile = config.age.secrets.beszel-shincha.path; + enable = false; + environment = { + LOG_LEVEL = "info"; + KEY_FILE = config.age.secrets.beszel-shincha.path; + }; }; hub = { enable = true;