diff --git a/common/services.nix b/common/services.nix index 288fad1..7f54d98 100755 --- a/common/services.nix +++ b/common/services.nix @@ -23,4 +23,7 @@ services.tailscale.useRoutingFeatures = "both"; services.tailscale.authKeyFile = lib.mkIf (config ? age && config.age ? secrets) config.age.secrets."headscale-authkey".path; + services.tailscale.extraUpFlags = [ + "--login-server=https://headscale.nekomimi.pet" + ]; } diff --git a/flake.nix b/flake.nix index 189e09f..aa1275d 100755 --- a/flake.nix +++ b/flake.nix @@ -95,6 +95,8 @@ ./hosts/buer agenix.nixosModules.default + + { imports = builtins.attrValues nixosModules; } ]; }; }; diff --git a/hosts/focalor/default.nix b/hosts/focalor/default.nix index 482516c..84044a2 100755 --- a/hosts/focalor/default.nix +++ b/hosts/focalor/default.nix @@ -25,8 +25,8 @@ # Hardware-specific ../../common/nvidia.nix - # Common secrets (commented out) - # ../../host-secrets.nix + # Common secrets + ../../host-secrets.nix ]; # ============================================================================= @@ -154,6 +154,7 @@ # ============================================================================= environment.systemPackages = with pkgs; [ inputs.agenix.packages.x86_64-linux.default + prismlauncher ]; # ============================================================================= diff --git a/secrets/build-token.age b/secrets/build-token.age old mode 100755 new mode 100644 index 2bc7eee..5bc5fca --- a/secrets/build-token.age +++ b/secrets/build-token.age @@ -1,12 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 i9wBeA SNBmBYKDOcADlQKvTCzGFWJF2mUoHYmnSNl3qXsiEwQ -hzClNOQ/XdN5rIOeYt6cJEE/I0Y7pNqSTX33tOy761Q --> ssh-ed25519 UbxDgg shMhY2WtElJ61NFyYVzt8SG09YaIndXbo1gqDv7GtT8 -v6W0lBm8kuVM6thJsOwJvnwg3R1wq7CcRF9yZnYaltI --> ssh-ed25519 YYzA7Q uK8U+89FYcjthWZNT0exk/pqY/syoQ5Cbq+pDVCcLwQ -iPGTlIGxCLVgqAnYX6ZbAqLLIwtxDTylcAUpV30/y18 --> ssh-ed25519 UbxDgg smr+A6sEa3ksrATeqOT08RTkIu4sVSzX/hM2piqlFg4 -sUGg9jas6vJhD2DoqARAtA9nPB6Kj/0xTCt0+QalhxE ---- eaSZzUL7BdIOC4uzDuSWRtoR7PaQfYzW0xjt85HSC3E -m,?DTww>tlŠ/*Z85#fcyŻUSΕ.~asQ?*Z f[`i{ݘ:݊&۰,4婻 -t+ٚx0ٍbMӍʵw< \ No newline at end of file +-> ssh-ed25519 i9wBeA iGYNmiExHD0M2Efk3zqlsZsUY9xcVW4ZyK2TKVkMxTE +PVm7Qwd+o/fP8bfSSouikZTV5yHIc1pFrS3EE/oi2wg +-> ssh-ed25519 UbxDgg n7YqLyF7ZqjOzaKDZ0j89gBT/pflBA72m/0NcW+lU3I +Jj2aFFRhn8/eNRrXdfAAH6nMAvmtCZyd0/GWfBfoPg0 +-> ssh-ed25519 YYzA7Q zrSEpBaQDjjWnCCeqqjYvSoZkZIXEwEk15R+8vNtYxA +AdEkXRqk1ekR/6wqf6gmFPPlTvxsB4WgQxQXMSpPie0 +-> ssh-ed25519 3RWqPQ iIMULw0As6DUmo+iTsXdcba4Tml65WESZlDxJfEEBBw +WxsBR7YRZGnuZpMnLld3VRrPQq8OP2UfFACrt/lPOp8 +--- D2QkZuwJA43Zezo4RhE2gW7UO8shM2upHi4tcaPSLUY +@g!h0E!i< Zgr3` #G[KL CXk/,ijL Pl@Bả26%gO!S"e q3#ւnTV)/ \ No newline at end of file diff --git a/secrets/garage-admin-token.age b/secrets/garage-admin-token.age old mode 100755 new mode 100644 index 23e752f..c427d56 --- a/secrets/garage-admin-token.age +++ b/secrets/garage-admin-token.age @@ -1,11 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 i9wBeA 3kSlwZ54PYTcvftI/3XcTpnSDxBmKRKNMy3Xf69Psm8 -QtqP2ebKP2M7hWcvFoT24aBkhj2Kvu1dlBbcGPyBo3k --> ssh-ed25519 UbxDgg o/TFehVOAh1Mcw3TJdldANFahiFhj9UvhFoFWyXVmzk -suQBydY0cRZ3FrrYDizfE8CrF8YjyJXWtzpPMJ5vgqI --> ssh-ed25519 YYzA7Q nbNcoC5R6CxsZKEvscezknX56mvDnw3VdG2gApHcZVY -AJHD+nM0OmZMX+aILK4s3x8wHI8K3O6hmb+1T7URTWc --> ssh-ed25519 UbxDgg iK4ea0RJLy7UGCHe8B5g6qr7hpSMYvx3dSQ3DW47sS4 -8dAWBDtDOY3YB0u+aEiIUTMqBQqYxV/HafosHk5Vklo ---- wbbBYCiJ+zOdj8bEmKLSd+vU3RMGX5nulXAcKcK4fRI -U$Fqph?xyd5>*=/=Gi(,Bw{ hr-'XG95#/'! \ No newline at end of file +-> ssh-ed25519 i9wBeA 8PLBgO1NF5MRPY/2WsmqQ31meGxLEq1CTOqo5ngwTFo +ymt1bCGSEN1jCb5zBc7gvaShzLKwT6Y5/J1/zO8PKWs +-> ssh-ed25519 UbxDgg JPYD8E0EDn2eBL0IltQtrgfTfFM4fqtRCjIqmrBb8is +QWzV5535zfi4wde4qY1TtWKwXEoSbkCRwpLt5R6k84I +-> ssh-ed25519 YYzA7Q YEIN85tSaLGmjECEGPVWrVtX3gXGXqy7NZEtnW86fkk +wPWnLtotf0JjJ+wPbz19DVYb8iXqXV9F61v54CAqoA4 +-> ssh-ed25519 3RWqPQ P13HdiuAj6ZOqfw41dlZdim/Qz7Pu9sQkeRbAOfKo3M +9eI3OCu9corRl7Wnpa7o2d3JxtBR3ttJG021o8fDUL4 +--- keY3p62HlGCBh2Wu9a9ZO6jcmLuk7bX1cJrRg+0BAQU +UOݵPRU]fpsUW9qLoyv%M0KSI[;(W("3) \ No newline at end of file diff --git a/secrets/garage-metrics-token.age b/secrets/garage-metrics-token.age old mode 100755 new mode 100644 index 2998028..9c6bd90 Binary files a/secrets/garage-metrics-token.age and b/secrets/garage-metrics-token.age differ diff --git a/secrets/garage-rpc-secret.age b/secrets/garage-rpc-secret.age old mode 100755 new mode 100644 index 65aaa9b..a544d5c --- a/secrets/garage-rpc-secret.age +++ b/secrets/garage-rpc-secret.age @@ -1,12 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 i9wBeA AtZIxAsM2lbP4hpZ5RjMkdVN3Ko4IVciNLsI+2ioh10 -HA5dZPJeO0RJpQVcXSTXl9Bzah55Md+UPldiz9NkzFM --> ssh-ed25519 UbxDgg IT0sHTltNKJqDnBdJXcBa3D8LO0rWY1ff2yursA0zl4 -jKE3Y2zOL92q82mcmdwZ1zi9AyaGLF1i9kl1+gegb7o --> ssh-ed25519 YYzA7Q DNlwj0lNOmQukfavVMyUxAJtNTpqKUobCu7stzrU/lg -Qxu4ITmiPfhDUnMdfBQPVEJi8AkZ3wCpKsfMlkWKoNs --> ssh-ed25519 UbxDgg bSJTVJtj9b4hb8/MFyWry79pez8xa2+lXgufBHinwz4 -lFnBfg1BZ9Kzb6wcYqbR0km9jRvSuK/fyhV5H508s24 ---- RhUMM66NH9bAUKHjMiJdQXV96SBap8hKKGayMaZ578c -bpқU}@=5«Φ= -T- *Mɳ5ы"`1[_rtjU]&gՠPqC8 \ No newline at end of file +-> ssh-ed25519 i9wBeA zKsnT6qzLx1lwXUOqSvz288GQvRuTSC4h1r1/peo4kI +i/t/qhyZRcW3werLZMF6IY8YP5t/BcvyfsffDhz+toE +-> ssh-ed25519 UbxDgg VZuoyPwHuaysdcvJlx6ILndEjQ0hKQN4kaJGzwutzEU +zhGpGQYN6WiyJ9IXH/Kldfm1iTVcZYPvaUdxTyPfFbA +-> ssh-ed25519 YYzA7Q Qlj5Oas+FqgbCBJjjBjcD/rlndFmU3XaB7IPzeS47DM +rLs09r8RRq/SJd9oLJsDGibAZsKXo1SJ/qvi4Z4Vhhg +-> ssh-ed25519 3RWqPQ NfcoP0kzkhHXvjbtmsWhrTu6jJ4Cby2C35JqE17qxzk +wbWmgoZrN2hbblKEbEJ07IMI+ZZeVsOJLcEALYQ6tOo +--- nZymvWQjoVNZRlBMvYxiQt/IvT8LuNZFR4hQF6pJR04 +]~4FOު`dsO +>h5?3!=s#f R5scx݈J];f$XnGg \ No newline at end of file diff --git a/secrets/headscale-authkey.age b/secrets/headscale-authkey.age old mode 100755 new mode 100644 index e7872c7..f8dfd70 Binary files a/secrets/headscale-authkey.age and b/secrets/headscale-authkey.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 542185d..e3d4571 100755 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -4,7 +4,7 @@ let valefar = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJlXq2lSfiWwRwIxsxhffW5FDGmjt0QKYN+BaikmRR71"; buer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMVhjwDcO8eleSoR8a37ZGGPvkHEgV+c8SYcy07SayPB"; - focalor = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJlXq2lSfiWwRwIxsxhffW5FDGmjt0QKYN+BaikmRR71"; + focalor = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA518oTmTp5VG60/dBrLu7rlV1hh8muhMattoiGfmrei"; systems = [ valefar buer focalor]; in {