diff --git a/.sops.yaml b/.sops.yaml index aaa6209..55ecc81 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -6,15 +6,12 @@ keys: &all - &m_work-mac age14vsmekuppm4xhp4rthhv9jjgzfv45v39a0q8dsgg6yusw0pjkvaqnr9kq8 - &m_cider age1kjsga2kf95lu7p5stqr5d9p87jquyypnx97cycj6jvhsm9zkn93quexx4r - &m_aerial age1jc6ghxfgxe3gx53xa55azxan447cfxaqfqeh5y5yzqapj7mw7ajql8kv02 - - &m_blueberry age12p9lw3zgufcg7qx375t9lwtckzwgj0tkn2pt9uj3tnx9sn3ucqgsf5ctdd - - &m_keylime age14luf58rfmzfg49624x6t67ahc0v3f0q2l0ely0he34y4skvmwg2qxdzdad - &m_drone age1faccfe85637hme39xyzgmvjn6ku9c4aapfmpfc35hswj5emhnedssrg2cq - &m_ingress-proxy age1w9rhdgapzww5xepsmquga65wyh3met9kmysayx09gam92upg0d5qnlq9ww - - &m_lab-alpha age1cfl87vkhqe0wpz8yvv7dhgj9w8vydec07f0fr9s2xaggf5r255sstprptl - - &m_mango age1v3kxefw8yz7c8nrc0qkghy0tnznt5392hlaegnzgj9hjj0dq3fsqg9dkpw - &m_happystaticbuzz age1423yycn0hzgq74v6rtu38l6e28cgwg3uh7xdllcsvcfphguh8s9s8plplu - &m_keysmash age1x27qj562g5jt0facz26awp0wnxts0qk8rtj23skenaq3warzp5cqzkrtfd - &m_monitoring age1ztjv535sy9v0nmgcqznvq7wxpju5wajax0pc72c37zuva2mmu9qqh8tqem + - &m_ps2live age1t3gt7yvnlfpjrl6ycfcpmt4xdume884xwswd2epnum6s9cwuxu9svalwag creation_rules: - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ @@ -48,20 +45,6 @@ creation_rules: - *op_noe_2 - *op_noe_3 - *m_aerial - - path_regex: secrets/blueberry/[^/]+\.(yaml|json|env|ini)$ - key_groups: - - age: - - *op_noe - - *op_noe_2 - - *op_noe_3 - - *m_blueberry - - path_regex: secrets/keylime/[^/]+\.(yaml|json|env|ini)$ - key_groups: - - age: - - *op_noe - - *op_noe_2 - - *op_noe_3 - - *m_keylime - path_regex: secrets/drone/[^/]+\.(yaml|json|env|ini)$ key_groups: - age: @@ -76,20 +59,6 @@ creation_rules: - *op_noe_2 - *op_noe_3 - *m_ingress-proxy - - path_regex: secrets/lab-alpha/[^/]+\.(yaml|json|env|ini)$ - key_groups: - - age: - - *op_noe - - *op_noe_2 - - *op_noe_3 - - *m_lab-alpha - - path_regex: secrets/mango/[^/]+\.(yaml|json|env|ini)$ - key_groups: - - age: - - *op_noe - - *op_noe_2 - - *op_noe_3 - - *m_mango - path_regex: secrets/happystaticbuzz/[^/]+\.(yaml|json|env|ini)$ key_groups: - age: @@ -111,3 +80,10 @@ creation_rules: - *op_noe_2 - *op_noe_3 - *m_monitoring + - path_regex: secrets/ps2live/[^/]+\.(yaml|json|env|ini)$ + key_groups: + - age: + - *op_noe + - *op_noe_2 + - *op_noe_3 + - *m_ps2live diff --git a/flake.lock b/flake.lock index d2ef933..2924423 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1705557527, - "narHash": "sha256-DuxxHTQ/W5KToFLWG4FUF8hLldNo9eXlbt7JgvhrMnY=", + "lastModified": 1709691214, + "narHash": "sha256-EA8Irz+Fai598dsK0nreaN5ZmZUCi57cFuRC2NqwDFQ=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "6e324ab06cb27a19409ebc1dc2664bf1e585490a", + "rev": "92056c4a93ca50f8abc20cef2aade3a645a44cee", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1705617092, - "narHash": "sha256-n9PK4O4X4S1JkwpkMuYm1wHZYJzRqif8g3RuVIPD+rY=", + "lastModified": 1707922053, + "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=", "owner": "zhaofengli", "repo": "attic", - "rev": "fbe252a5c21febbe920c025560cbd63b20e24f3b", + "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21", "type": "github" }, "original": { @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1706844761, - "narHash": "sha256-5BcXmVy5QPXplCT9fJ4A0+Tru0kG2sAR7qYwdxVrwvo=", + "lastModified": 1709836394, + "narHash": "sha256-Vm7AediRQEwyPayeAnW2SvJInfCPS+5FmlGOYGdpPrk=", "owner": "famedly", "repo": "conduit", - "rev": "72a13d83539a4df7c0f126b5854642e210c506b0", + "rev": "a095e02d048e960494d13d29363e27fd92ba0ee7", "type": "gitlab" }, "original": { @@ -99,17 +99,17 @@ ] }, "locked": { - "lastModified": 1706473964, - "narHash": "sha256-Fq6xleee/TsX6NbtoRuI96bBuDHMU57PrcK9z1QEKbk=", + "lastModified": 1707685877, + "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=", "owner": "ipetkov", "repo": "crane", - "rev": "c798790eabec3e3da48190ae3698ac227aab770c", + "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", "type": "github" }, "original": { "owner": "ipetkov", - "ref": "master", "repo": "crane", + "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", "type": "github" } }, @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1707707289, - "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=", + "lastModified": 1709771483, + "narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd", + "rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6", "type": "github" }, "original": { @@ -133,6 +133,28 @@ "type": "github" } }, + "devshell": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708939976, + "narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=", + "owner": "numtide", + "repo": "devshell", + "rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -142,11 +164,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1705559032, - "narHash": "sha256-Cb+Jd1+Gz4Wi+8elPnUIHnqQmE1qjDRZ+PsJaPaAffY=", + "lastModified": 1709619709, + "narHash": "sha256-l6EPVJfwfelWST7qWQeP6t/TDK3HHv5uUB1b2vw4mOQ=", "owner": "nix-community", "repo": "fenix", - "rev": "e132ea0eb0c799a2109a91688e499d7bf4962801", + "rev": "c8943ea9e98d41325ff57d4ec14736d330b321b2", "type": "github" }, "original": { @@ -256,11 +278,11 @@ ] }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -289,11 +311,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -338,6 +360,24 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -389,11 +429,11 @@ ] }, "locked": { - "lastModified": 1708031129, - "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", + "lastModified": 1710062421, + "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", + "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", "type": "github" }, "original": { @@ -410,11 +450,11 @@ ] }, "locked": { - "lastModified": 1707919853, - "narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", + "lastModified": 1709988192, + "narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=", "owner": "nix-community", "repo": "home-manager", - "rev": "043ba285c6dc20f36441d48525402bcb9743c498", + "rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030", "type": "github" }, "original": { @@ -451,11 +491,11 @@ ] }, "locked": { - "lastModified": 1707707289, - "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=", + "lastModified": 1709771483, + "narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd", + "rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6", "type": "github" }, "original": { @@ -481,11 +521,11 @@ }, "nixlib": { "locked": { - "lastModified": 1693701915, - "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", + "lastModified": 1709426687, + "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", + "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c", "type": "github" }, "original": { @@ -500,11 +540,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1707873059, - "narHash": "sha256-simzllUEmzVqmQogcGCorfIbJpodAhgGSr6vuFtd4XQ=", + "lastModified": 1709887845, + "narHash": "sha256-803UIoB8+vGkm/VK/g55aBAAOf/ncTGvxXyjTF4ydm0=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0aa24e93f75370454f0e03747b6836ac2a2c9fca", + "rev": "bef32a05496d9480b02be586fa7827748b9e597b", "type": "github" }, "original": { @@ -515,27 +555,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705316053, - "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "type": "github" } }, "nixpkgs-master": { "locked": { - "lastModified": 1708147120, - "narHash": "sha256-sd7EckSXa6yJnH9hXAnqirBRs2Nab1IEL8klaxjAqoM=", + "lastModified": 1710110055, + "narHash": "sha256-Ytk8pGJpKJorcwcArWb+6UGEvZUgHBPIvPBthgXkC1I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d014ba8097072cdca4630b236da81cab490613e", + "rev": "b1da94375cf40d4774f0d29a0dd21d4d07087723", "type": "github" }, "original": { @@ -579,11 +619,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1707978831, - "narHash": "sha256-UblFdWQ2MMZNzD9C/w8+7RjAJ2QIbebbzHUniQ/a44o=", + "lastModified": 1710021367, + "narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c68a9fc85c2cb3a313be6ff40511635544dde8da", + "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d", "type": "github" }, "original": { @@ -595,11 +635,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1707603439, - "narHash": "sha256-LodBVZ3+ehJP2azM5oj+JrhfNAAzmTJ/OwAIOn0RfZ0=", + "lastModified": 1710033658, + "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8cd80616c8800feec0cab64331d7c3d5a1a6d98", + "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8", "type": "github" }, "original": { @@ -611,11 +651,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1707956935, - "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -659,11 +699,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1693714546, - "narHash": "sha256-3EMJZeGSZT6pD1eNwI/6Yc0R4rxklNvJ2SDFcsCnjpM=", + "lastModified": 1709675310, + "narHash": "sha256-w61tqFEmuJ+/1rAwU7nkYZ+dN6sLwyobfLwX2Yn42FE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d816b5ab44187a2dd84806630ce77a733724f95f", + "rev": "43d259f8d726113fac056e8bb17d5ac2dea3e0a8", "type": "github" }, "original": { @@ -675,11 +715,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1707956935, - "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -691,11 +731,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1707451808, - "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", + "lastModified": 1709968316, + "narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "442d407992384ed9c0e6d352de75b69079904e4e", + "rev": "0e7f98a5f30166cbed344569426850b21e4091d4", "type": "github" }, "original": { @@ -707,6 +747,7 @@ }, "nixvim": { "inputs": { + "devshell": "devshell", "flake-compat": "flake-compat_5", "flake-parts": "flake-parts", "home-manager": "home-manager_2", @@ -717,11 +758,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1708092675, - "narHash": "sha256-v989FEEnL74uHxb5e2BNInJFbnVO5xmO3o/sX8+JwUU=", + "lastModified": 1710016565, + "narHash": "sha256-GoNm8bTT2YjZwdS0jcF0u2mTb8TYDDVyl8vgGICaS8I=", "owner": "nix-community", "repo": "nixvim", - "rev": "ca6240ddc2f507742f52650b3ea6a74d477afe30", + "rev": "fb897e22e31f4d29766d94cea3df4aaf008c095e", "type": "github" }, "original": { @@ -761,7 +802,7 @@ "pre-commit-hooks_2": { "inputs": { "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "gitignore": "gitignore_2", "nixpkgs": [ "nixvim", @@ -773,11 +814,11 @@ ] }, "locked": { - "lastModified": 1707297608, - "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", "type": "github" }, "original": { @@ -805,11 +846,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1705523001, - "narHash": "sha256-TWq5vJ6m+9HGSDMsQAmz1TMegMi79R3TTyKjnPWsQp8=", + "lastModified": 1709571018, + "narHash": "sha256-ISFrxHxE0J5g7lDAscbK88hwaT5uewvWoma9TlFmRzM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9d9b34354d2f13e33568c9c55b226dd014a146a0", + "rev": "9f14343f9ee24f53f17492c5f9b653427e2ad15e", "type": "github" }, "original": { @@ -841,11 +882,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1707842202, - "narHash": "sha256-3dTBbCzHJBinwhsisGJHW1HLBsLbj91+a5ZDXt7ttW0=", + "lastModified": 1710039806, + "narHash": "sha256-vC2fo/phnetp6ub/nRv6mgAi5LbhJ6ujGQWrRD2VgNs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "48afd3264ec52bee85231a7122612e2c5202fa74", + "rev": "f8d5c8baa83fe620a28c0db633be9db3e34474b4", "type": "github" }, "original": { @@ -898,6 +939,21 @@ "repo": "default", "type": "github" } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d1ff30f..b2e1c09 100644 --- a/flake.nix +++ b/flake.nix @@ -136,6 +136,7 @@ lab-alpha = mkNixos [ ./nixos/hosts/lab-alpha ]; # what the mia doin mango = mkNixos [ ./nixos/hosts/mango ]; # Matrix (mx.sapphic.engineer) monitoring = mkNixos [ ./nixos/hosts/monitoring ]; # Grafana, Prometheus, Jaeger, etc + ps2live = mkNixos [ ./nixos/hosts/ps2live ]; # PS2.LIVE stack + planetside stuff thonkpad = mkNixos [ ./nixos/hosts/thonkpad ]; # t480 }; diff --git a/home-manager/noe/hosts/aerial.nix b/home-manager/noe/hosts/aerial.nix index d904f27..191496a 100644 --- a/home-manager/noe/hosts/aerial.nix +++ b/home-manager/noe/hosts/aerial.nix @@ -11,6 +11,7 @@ qbittorrent spotify teamspeak_client + signal-desktop-beta ]; programs.vscode = { diff --git a/nixos/hosts/aerial/hardware-configuration.nix b/nixos/hosts/aerial/hardware-configuration.nix index b514bd6..2691fa7 100644 --- a/nixos/hosts/aerial/hardware-configuration.nix +++ b/nixos/hosts/aerial/hardware-configuration.nix @@ -30,6 +30,7 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; + networking.dhcpcd.IPv6rs = true; # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true; diff --git a/nixos/hosts/blueberry/.target b/nixos/hosts/blueberry/.target deleted file mode 100644 index 0b3c629..0000000 --- a/nixos/hosts/blueberry/.target +++ /dev/null @@ -1 +0,0 @@ -192.168.1.229 diff --git a/nixos/hosts/blueberry/hardware-configuration.nix b/nixos/hosts/blueberry/hardware-configuration.nix deleted file mode 100644 index e4bdbf5..0000000 --- a/nixos/hosts/blueberry/hardware-configuration.nix +++ /dev/null @@ -1,36 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/4f8dd009-2ca1-4237-92ac-3fbc3823781d"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/45FC-9E5B"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/nixos/hosts/ingress-proxy/default.nix b/nixos/hosts/ingress-proxy/default.nix index add44d2..679780d 100644 --- a/nixos/hosts/ingress-proxy/default.nix +++ b/nixos/hosts/ingress-proxy/default.nix @@ -23,6 +23,9 @@ in { mango.servers."${tsHost "mango" 6167}" = {}; hsb.servers."${tsHost "happystaticbuzz" 8080}" = {}; ks.servers."${tsHost "keysmash" 8080}" = {}; + ps2l_saerro.servers."${tsHost "ps2live" 8001}" = {}; + ps2l_aggpop.servers."${tsHost "ps2live" 8010}" = {}; + ps2l_metagame.servers."${tsHost "ps2live" 8020}" = {}; }; virtualHosts = let @@ -31,7 +34,6 @@ in { http3 = true; forceSSL = true; enableACME = true; - }; static = { src ? null, url ? null, rev ? null, aliases ? [] }: { serverAliases = aliases; @@ -51,7 +53,16 @@ in { url = "https://codeberg.org/noe/personal-site.git"; rev = "f26c50a2d44ddd6094804949c9f338010b61bb79"; }; + + ps2live = upstream: { + locations."/" = { + proxyPass = "http://ps2l_${upstream}"; + proxyWebsockets = true; + }; + } // defaultConfig; in { + "" = placeholder; + # Matrix (main) "mx.sapphic.engineer" = defaultConfig // { listen = [ @@ -110,6 +121,10 @@ in { rev = "f669f68f1bf89c8f161627e994c9c865811964e8"; }; + "agg.ps2.live" = ps2live "agg"; + "saerro.ps2.live" = ps2live "saerro"; + "metagame.ps2.live" = ps2live "metagame"; + # Generic store for /.well-known/ paths. "well-known.sapphic.engineer" = defaultConfig // { locations."=/.well-known/matrix/server" = let diff --git a/nixos/hosts/ps2live/.target b/nixos/hosts/ps2live/.target new file mode 100644 index 0000000..bb49e4e --- /dev/null +++ b/nixos/hosts/ps2live/.target @@ -0,0 +1 @@ +192.168.1.177 diff --git a/nixos/hosts/blueberry/default.nix b/nixos/hosts/ps2live/default.nix similarity index 51% rename from nixos/hosts/blueberry/default.nix rename to nixos/hosts/ps2live/default.nix index 6d4fd56..37fe6c3 100644 --- a/nixos/hosts/blueberry/default.nix +++ b/nixos/hosts/ps2live/default.nix @@ -1,18 +1,14 @@ { ... }: { imports = [ - ./hardware-configuration.nix + ../../templates/proxmox-lxc.nix ../../server.nix - ../../features/systemd-boot.nix + ../../features/dns-cache.nix ../../features/podman.nix - ../../features/nginx.nix - ../../features/dns-cache.nix - ../../stacks/ps2.live ]; - networking.hostName = "blueberry"; + networking.hostName = "ps2live"; system.stateVersion = "24.05"; - services.qemuGuest.enable = true; } diff --git a/nixos/stacks/ps2.live/saerro.nix b/nixos/stacks/ps2.live/saerro.nix index 4fb9b4d..1bc7fc3 100644 --- a/nixos/stacks/ps2.live/saerro.nix +++ b/nixos/stacks/ps2.live/saerro.nix @@ -15,7 +15,7 @@ in { sops.secrets.saerro = { - sopsFile = ../../../secrets/blueberry/saerro.yaml; + sopsFile = ../../../secrets/ps2live/saerro.yaml; }; virtualisation.oci-containers.containers = { @@ -61,11 +61,10 @@ in { }; # TODO: Automatic restart and pull - - services.nginx.virtualHosts = { - "saerro.ps2.live" = { - serverAliases = [ "saerro-new.ps2.live" ]; - locations."/".proxyPass = "http://127.0.0.1:${port 1}"; - }; - }; + # services.nginx.virtualHosts = { + # "saerro.ps2.live" = { + # serverAliases = [ "saerro-new.ps2.live" ]; + # locations."/".proxyPass = "http://127.0.0.1:${port 1}"; + # }; + # }; } diff --git a/secrets/default.yaml b/secrets/default.yaml index f25bbff..771dfe0 100644 --- a/secrets/default.yaml +++ b/secrets/default.yaml @@ -13,146 +13,119 @@ sops: - recipient: age1lq5q5g5qjsdcc3key0n6qytkc9z3qx3d3e96ap9zre2aqgvc9ujq82l9hd enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEK2h4WElwUDRMQ08yeFQr - MW04MGlDeWs1dzJlNXkyNXpianQ0SUlBUUJZClpDUndCcnQyUVYwZHlaZ2xYU0oz - djRLc1RWTlg0M2syUlJGSDM1cG5qZTgKLS0tIHpPVG1lQWZiaXFVNDVTeUU5a25Z - dFNqdjRlMTQwanVneXJJd1pCK09VaVkK4sbkorHErZxn4uVjsfNqUEF9XYd5pASS - PNorGDhYsxgq4ZA00S1uHq6pfPGtg3fF8AsF+1YspkctSuGKHPd6lA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwT2pFbzZIQUFxUVMzenZ0 + cDlYcitzSG10RWVvVEJrVEU5Z3pRWVFjL3dnClJhMkw4QmlkRFgyenQ3MUFSd3Nx + eDBqemxUYVhSb3gxSmVBb2p5MVliN3cKLS0tIGx6cFpkTzRrUzlSTmhETVVrUHhQ + dEdDOVJ4Uk1zbnZEbTVYeHhjYnFrMmMKpiyStdSr3vNSS9ZI6OfCHrTxJijBrmy3 + qPqk/ir0uOchuZWn5xoOwNUSGyYs81uAwIpDUMkSLK75HO55Met6eg== -----END AGE ENCRYPTED FILE----- - recipient: age1p0f62dwatt558sf5s4equdqwtg5m7lsnaytrf3xjnvmx3e0lqu4svtugyp enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXRU0yNUF6cUVpQWUxSVRm - alVLMzhWRG1pdkJNd0pObUZaMy9GVGdkNndzCjVxUjYzdDN2QlhhREJ0SGVWcnhj - UVFWL3V5SS9XV0ZqZmZ0SGdUNW9XUmcKLS0tIHVkb2JGRFMyK0ZIRGNLeERsR0FE - R2NKNTV0eURRM0NQclJaMUdYQzRod2MKsp5Ky8wvB/F4Vj3yaQmzVR4Urf5qdDDK - LtvIG/StVHRQibqLJxj1EiYmWA3XDrrL531G31/GpBtG4dhpOZkseg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGSDBqMThTU2Z3WlhyL3hj + aUVuaWFLalpZRWo0V0dUcUpCWXcxcVZyYVRZCmlsWHVGQXhjNTJyQnlycjRGeFlP + cVhjOVd6M0VJZVBWZWdRTVBFTnNsSW8KLS0tIFhTaG50ZEtZR2M2RjNWcXpCWG9S + REdjS3A5eG9SYThSOEw2ZWdpRVNnWDgKiCKM/zfFCqa1dewoKV28+/XkYceV0Eeu + 2WldQ3WpF7H2oTiDZMpsnz8EqsxAIj0axr+MABmXDJt0zoymjnLF5Q== -----END AGE ENCRYPTED FILE----- - recipient: age13c5wv623jxjja5mjz7fajg9qqwvypzgsfqrs4tmk7rpgyzu7aufs4ul9f9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3Uk5MQVNTY29oK3VIRjZx - UzFTb2F4K1NOTkRTTXp0a0FPeURVVmowaUdBCmZSSGhvUzlIMS96eVVuM3lLMDhL - UzUwdlpEZVlXYkpvMjUvQjMra3JNVG8KLS0tIFBSMEdFeUhzRUYxK1N5ZDRQejhj - MkNSeG96WFROWHlrMlluKzRkRW9IUXcKXnI9cw8ahI+zfxTMYolrbmxflum2I/JT - HNfzEHFxmqvV2dnPqj+QKrzz/VfpSyGzIcdet/Hohd6HQt1+9R/ROg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0NldmVENXcXNha1BIbUNp + YStWRVFTYkZnT3hNQWo0cHFNSmp4MTRISVhjClphVDFEOWcxbStHU1lIYXlRRDkz + MDJNUTlxNE5XUEoyZitvRm9QYnRUQlUKLS0tIFl3VTZqMG1vVEFwTGEweE1FSEVD + aG5tUlRmVU5PdENjNEhYQ2xoME1JcVUK5SQHqo9NDFpZR8YABiqcxvZOtMRZFJ8f + UaQ7YEbyyieF9cOPtcUQaRQTal2JUaVzm9ti1nc0MFjzQqjYEN1O5w== -----END AGE ENCRYPTED FILE----- - recipient: age1f5cqspxexkl8f42v5ne47mx6xmm4v00lafdlslq9g79a508e4p9qrku72s enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtaHdSaGFpWGRFUFhBR1gw - Z29LUERUSFg3eE8wWnBjR2NaTjFKcVIwTFRJCjBpUWtBN0NOMTBVWG9FOW1QUWpp - MXlHcFVZenFONXdwdHlPMGdxd2JlTG8KLS0tIFdnb0pYYU9lSGJpQmo3R0JSK0xs - VFpoc3ZkTnB1aUc3TWdSZXZVVEpIM0EKYZiF78LVryNNVVWMSYMypgFhmy7HHjq5 - 0GAn43XoRpHnrUic0tGNXwfBIQ4SqRPnNpsAUvbQVuAnyXLlgDbcSw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvV0xRVEE4blVOQmRvM01R + U0pMVUlPTVllZDVYZnVHbXF3UnQ5WUswMGtRCm9xSHdnT1phR2REZkI4YTdQanZX + eFROZ0JOcTJVMDcydDVFaFgvUllCNEEKLS0tIE5YV0Z4TE5iOVhIRjhpZjVXYnIv + SlhLak9yWmZCUDdHY2tKZUxRYmtRM2MKudaA8JiFGulOmFpFLxMPisFkNURAThm+ + 1zp5N3ftSPDZoWKepwR1C+YjHdEq0jT1wy1IOcZYCrztxt7oLxUgrg== -----END AGE ENCRYPTED FILE----- - recipient: age14vsmekuppm4xhp4rthhv9jjgzfv45v39a0q8dsgg6yusw0pjkvaqnr9kq8 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2emVhMXdrbkRQWjc0aE9L - K1UzckxaY0ZVQllmLzlZa0x5MHUvZDR0Y0dzCnRXa0gzM2UvT1A3T0Ryd2o3VUx0 - b1o5Z2ozTDF6b0FpUXh0UncrdXEwUGsKLS0tIHJyTkY0dzUzc0RxQXA5UHFBRWls - cy85ek9MMS9PSFgyc0dlaHVTQlRBejgKBemru4DJTritBb88bE1jjIMNZxxt3pDM - MHfDPKIXlmZMRnhMYP0I2CNq6msarjB9w6lred7mLIvsgE6sx5Y8GA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZNHFWK1cya2RndUwwR3pt + dXluaGZQQzFpNUh5bzRiS20wQ2JLWUxaZ3lZCklzK3RiTWpvNHc4UW4vMXFaYmJC + VHlqWEEveTJ4WktLNWgrTmY2SmJleEkKLS0tIGNMcW1vU3R4WGVmcGwxNlN0eEhu + dlpCTVQzUWp1Y3JlMy9xd0ZtaTI3S2MKORtWWb9+4kdBwSoWdMQKAJ+OXpznnwHK + BU587daS5gDpSVVtF6+U7AKxkZx6kosxJffLGs7sJHlg7yrSLad/Vw== -----END AGE ENCRYPTED FILE----- - recipient: age1kjsga2kf95lu7p5stqr5d9p87jquyypnx97cycj6jvhsm9zkn93quexx4r enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0STYwckxCUGFZWVNXWFFG - M0RvMFRRdVo2Z2k3NTlmRWQydTJvK2tlbWpvCitNL3RQYnpIb2txR2tJMXU2VjRD - bjR4OGFUQjFRZGh5TVlRMnlkUHdMc0EKLS0tIEs2dWxkQmR0R1VzeDFIZnlUUm5s - L0hJblZQMUl1T1BXVXE0c1ZFdnBaQ3MKuJ2Q1/jYMQFnxAZrBkl6KrkpLJgZoV82 - JzXn1/D/eabLLUuT8S8DqykwX2nga6z5sIbuq3CNFj8LQsz10Limnw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBISkk4dzl5WkswWWVXZEF2 + ODE3b3ZRVnl6TVZHNmlSWFlmZEo2SmVoSXpJCm11UmJzYmwvSlUzTWhreHNSdWFz + SC9lV1JOajA1NkcwSUlOZm0xMGw2bjQKLS0tIFRLS25aNktxeGU0dFFzeDEwWFp5 + WkVQSDZ4dUloaGJXMVN5RFNwYmU4L1EKaUkUfoiLHDNMZON17VWIVtCDlxv+Yjx/ + GTrTK4avZSdq/1EOwFeSpGX77/TQy4RbPLPRpg1sijFVnd1w17LTCw== -----END AGE ENCRYPTED FILE----- - recipient: age1jc6ghxfgxe3gx53xa55azxan447cfxaqfqeh5y5yzqapj7mw7ajql8kv02 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNbTlBdHBBMzcyNDdGOXVo - aXZ4UVYyb3pzRlY5MWhqUnNEbi8zOG1OM1ZjCkNxUGpaT1h4YmRkd2xRbUlMVmM2 - UCt5b2lsblRiTG8vNEoxbUZsL29FajQKLS0tIEtDWXJvWDBZVHBqZGR4RGRNWm4r - TWNIOVRHaVpvd3pwM0pNcDMxZ2JpQzgKJ2h8v2my0lZr5yAejopjuok0oZZHx95L - zU1P2JRJsxIwgwAcmO0rfFNTrJehhTAqg5dxa8CHGkkXj1OmHRMfqg== - -----END AGE ENCRYPTED FILE----- - - recipient: age12p9lw3zgufcg7qx375t9lwtckzwgj0tkn2pt9uj3tnx9sn3ucqgsf5ctdd - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5Yk5mN2NmaXY1YVNjVGxI - TmlzQVlFOGpHTlVJVW5Pa2NjUTZKWDZsUkVvCjdMMHRxai9ZVTFvdEV1czNqSzho - UzliaUppT0FJWU5tU2JGQmdNQXFPOXMKLS0tIFhxbzJTZDF4ZEwzenA3a1ptTDYw - cjExQlBHVnZCK0ljN0pPaXZGQ1RXQjAK4oDBGnPSN2BRuWpBtWsJqx6nHfYhWbRp - VlGwrUWf3JUP9WbO9T2+kjGIE35bzvIZcdx5hgSwQC5Akg59MZElwg== - -----END AGE ENCRYPTED FILE----- - - recipient: age14luf58rfmzfg49624x6t67ahc0v3f0q2l0ely0he34y4skvmwg2qxdzdad - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1RnkvMTdHQ1doMDllYW80 - QVQwemV6OE5aVDBHWURXRXVsTFNpRjd2N0JZCm0wbEZzUkUrMzRrSURQRjU5MGJu - U2l0VTVXMmZUTytWUTB5aTJWMnd0encKLS0tIHJBNDJRSS84bmY5b1hraDdsZFBW - S0s2OGJ4MGsvTWhVYlhKaG1iNXV4QmsKhw7DWQNsugFw6MvgC6mVNt6DALRRAwID - ir9DcjwvIUxYQ+ciMXXC3TwX1zWyyEr06xLM79gxpiKUiLrLY9wPmQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZQ1l6VCtGNkVBcStQSHJH + MGZaYnIxbGNjNlJuWmN1M3NZT1Bvdi9qbXc4CndFY2xLTVdkMXdmcStCOXVCeUZS + eHh6dXRveVgvQ1R2SCtrK2pCSGFlY00KLS0tIFk4U0IrTldQTGp0UGt4NktyMk1K + WG1CblQ5M2lOakV6K3B5bWVzRGhvNWsKKxPgthJqCdjW6IFkGIVbQ28btTomFmj0 + 3iWYrNOEKP5TVMByxJQXWY7+API+vAj7oMw+BxIPCfQTvTqmWSknxg== -----END AGE ENCRYPTED FILE----- - recipient: age1faccfe85637hme39xyzgmvjn6ku9c4aapfmpfc35hswj5emhnedssrg2cq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4SUY3L0NFNTZ1aUp6dW1q - K3FuRjN5djQxaHhHcDJ4elY3YmtmMFQ1QlhnClFnY0szUmI3NHZLRDBBU09vYXlm - MlI2L0ltNDlvcTFwVFA0R1N6ZVRxWGMKLS0tIEZqNVZmVVZ1SmVqRzVySndnN2ZC - bzNIdmtsR3RadUN2TWRLTTlsYjlsVzgKp3XAmnFfH/SOU63Asyi9FHs5BG/EFA2f - hsegLryMVLSmFNWQgORHz7nkSmHLTqCkSNuhlFI03XQ0xue/sVoZjQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJUmZacVFEY0Y5MW9iSld0 + R1E1STFDN1NxRndVMFlVc014anpiMTJjTDNvCnZKMksvMi94RDFrQ25MbkdsZ2xK + bFg3UjBwNnlrVmZ0TjV2dGNTb2JTSHMKLS0tIEUyV2NPd3hiRkF3VnpEVW9WWTRz + aXE1cXZuL09PVUtjZHBEeWVURUpUVDQK2you/NLjoynVx71fEyVdg69C2IHr2KTK + 4bd8jW2CIEh6S+bAOG05ymmWN7jurVBI/s+LlCI5bfCoBiVA17xoIw== -----END AGE ENCRYPTED FILE----- - recipient: age1w9rhdgapzww5xepsmquga65wyh3met9kmysayx09gam92upg0d5qnlq9ww enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBORnoyTGhuMzcwajNCV2hZ - R0N6Yk1lV0ZSQzlPTXE1NGpIQmlPWndJMWxjCngwVVJkdUd6RCtJZUhMTThaY0hz - Mk9tTHFpSTdrNEwxRTFrWUNkR2dENncKLS0tIFpmcEpFa0ZpSThxRGMyRzNVcnk5 - b3BSdExtRGtodDJudHV1bUMyUklsOGcK7wqC2ESoZbT0Qh2/1Ty0aqn6Y7TDfB69 - mYqq/odLhM6PAI/PzqFEvd9C7Y9PJDilSulauiu/sIREn6fR577Wpg== - -----END AGE ENCRYPTED FILE----- - - recipient: age1cfl87vkhqe0wpz8yvv7dhgj9w8vydec07f0fr9s2xaggf5r255sstprptl - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxcldjaW1sNVpIWUlLNi81 - Nm9MT3p0aFNzZmsrYzl5Vm96NWxZUkhRMkdVCnIwV1A4TVZNZXZONHhUTjdZb0Jx - aXRTV1hzVkhMRG5Md0JidnhuVFIvMUEKLS0tIHU0TTJIdVMxcGNyaCtBOE1WVEV4 - alcvcS9JNndDOFJIcGptT0p1RjE5ZUEKrKa53eR3GxRqKdr+kb+4cKZFJf+scTHj - DwpZ2NajtUOMw8H6Ypfg54FXgyYBEUPVfhKQ49eqC3L235jJ2jlF5A== - -----END AGE ENCRYPTED FILE----- - - recipient: age1v3kxefw8yz7c8nrc0qkghy0tnznt5392hlaegnzgj9hjj0dq3fsqg9dkpw - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGZFBEYy9aYnA1WVppTm4w - M01tcnFLRVUwTHlZMjhudUE2WXpzR0pybWpVCmhzeXQ1WFV0RHNZTjVyQmtGcEZy - ZG1zUnBseWwrbHcvWlNtdmNFekRGODQKLS0tIEwxRnNLNmVCekVheTN2VWdXa3VY - bWJIQS9lZG9rdUVveVArQXp2a1B2dnMKqROGTG/M++GF53qYPnwXzrGWiyKZgNpa - UcVDuZpSt7uvDrKML2f/kqZ44fD2mIBOXv2uNFlLSDb3LHBPU9i4KA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIQWZGOXYyM2c2QmVpck4r + SFRTS0Q3TjBYbW5URit1V3JaOHpYTmhuTm5vCnFvQmYraHlMa1RtaDVBaFFtVDg1 + QXZvZ0FmNklIRkw3cWZYT1hqRUpySkkKLS0tIFYxN2hKeEY5cE42Y1hjQU1NZWdH + V3lNdVpTTS9obXYxVDZReTNZMXI5K0UK01dAstgFPZIyKqj8cpXZNc18+ZRPvMx/ + ilZeBwRRmtpDJ4jybDeHUViNB9WgWGR+GaVIqnHEW0ovESwsDfLr+w== -----END AGE ENCRYPTED FILE----- - recipient: age1423yycn0hzgq74v6rtu38l6e28cgwg3uh7xdllcsvcfphguh8s9s8plplu enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNdFd2d0ppSHh1dHVST1pr - bUNIcFc2OWdjYXhBR1FaRy9WV01zYy9Hb1E0CnhyMEhLMWNndGs2WXgrM0xzT2Iz - eGxZQ2NxNVpwb0ZSaVVuN05CeVpsWXcKLS0tIDBIM1ZueDYxcGFCZkRMNnk3NlNZ - U1JuZjJISWR1VFNoQVJvZ2VvNFhEeDgKR1/KopFkkLDr0jh3u+3spoRcWGEKDZi6 - 7T4cvFv8DKmGzDv6z40TT8BlGxOcQqGEyW2UubLQlNa3fp9HTvyKdQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaVFJHOXJOOHFJK2F6UEI1 + b0NPQWRaeGFzcFRyQitvRDFjd255eWFmeGhvCmcxN1U0MHBGeUdJblBSV0hjc0hn + aHRDOWd3TGFlTnNqc0pnZVZLZktOeFEKLS0tIFdVTm1NNjQvS3M1WmY5TzNRdys5 + SkdEWnFxNEp6SEJneWR2TVluenpxblEK8Wqj75VRHbTLM7Q0K59Wu2kwAK5wbzMC + sPqWllnnqEM7SN/gTthLC2GSby+fd1VOG3997oiG9NEcYW98w7qFOw== -----END AGE ENCRYPTED FILE----- - recipient: age1x27qj562g5jt0facz26awp0wnxts0qk8rtj23skenaq3warzp5cqzkrtfd enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4OUt2QzJIWTk0bjdJeHps - WHcyUG82Q1pzOUZxRW5XZEE3TUpTcVhOWlFzCjVBYTRFU3ozblE2MVN2STRmY2tJ - cXA5cUZsTVNWbE5vbG5tTStZOVJpc1UKLS0tIFdEZEYxNko1NkJwNE9VeFNQaWRq - U3l2K01mQUEreWFBOFJnZlE2UGxpaEUK1fkkk0569on9MepL6VzPnelsaKdLRDHd - MD63k06lAbnwH8k2y+ktq2ev+dAMSs20TJgIOkNNg0VkUdcowYm11w== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmaTF1dEs2QXFvRkdTNFRX + dlExK2lnVGFsQU9KWTRpczFUZ1FxUTdDL1VjClRqSWNOZXdkZlE0MnZvVGF0VGli + K3RqOXZ1VmpVMEowT0UvMGRnS00vK2cKLS0tIDFXcFQ0aFErZVhVZmlTU3R3RjIv + UVlTT3BEOFF1Q1h2UGlHMTRwOTBEUXcKUSW+cqvLG5SXThsqYDw9tIRinfzEQinR + +uUxEBOXPukbuVFZikHJu3cOj/e1RPhRQnKMmLkU5Wo5iF80WpMVuA== -----END AGE ENCRYPTED FILE----- - recipient: age1ztjv535sy9v0nmgcqznvq7wxpju5wajax0pc72c37zuva2mmu9qqh8tqem enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmWUMrNVJpTTNYbEJHME9D - WG0vK09VY09GdXFJUzM0QTMycHYwdVY3N2dFCldSUDl2aGJXSkFxZjdNN0tEQUR5 - aTF5dTRHdkUrbXZ2YTBneXdLbE54RjgKLS0tIEVZK1p2RUJRMllGc2ZHajhvVVQ3 - b2FRWGpiUWM5UkFGTU4wN0NwbENhQ1EKmekpWf/gn9rKV+r9irT9mMMcAF4LDf27 - Ppx9xaNkksfiTgVjnIP7G4zECPtTZ2TIKu2EZYDu8D6/7ePXsSdXbg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3a3V4bnRnQ1hUOFR4bUxF + NG52THQ0ZlpGOC9VejVBN00yVU9HQllPOWlnClBEL3IyM3B6WTNQZ3NyN3J1cWdB + a240ZHBPdVlxSmFPNkNib245SVh5K3MKLS0tIHU4S3RWN1lWTFN6WlNDYXRaWkFV + VXY4cWlEUDNoQytHaTEzS2s3T0s3VVkKEPwHDQSTSrnrbxYYcEDWCc+NdJvB3HWr + rnfW3KmumKRHKu0rGysUAMLJ5moRSa7gpNekwXf5PhckR3Evel1ZTw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1t3gt7yvnlfpjrl6ycfcpmt4xdume884xwswd2epnum6s9cwuxu9svalwag + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxdGRqT3d5c3Rsekh0UUJn + bHI1RzVUcEFVNEszRjFyK2x0dlNaWGpxRUI4CkthZlFmeU1udHdUSWkzelhWeFRD + amtaMWZCSDJsK1hwaDAyeTJJaWZyYW8KLS0tIE1wNnpTYTk4NVJqbHZqZVFZVzNG + ZHdiTEdlRldaZXhTK2l0d1M0dU1sbzAK0XRZYJUgwC2jLzcooBRgOaPuD/qcEFLh + hlYUmXWT2nyZTHYlpApMQIXIrXUkyzN6+HvPwgm4xYKF6xxds8XjKg== -----END AGE ENCRYPTED FILE----- lastmodified: "2023-12-17T20:21:39Z" mac: ENC[AES256_GCM,data:IbpBloPeCvdYqloShrSvAIUzjCk+/1+Gl4+LbyKGnO9GUadlwJTyA/WDWiCkdmyFqqpMclD4Kq4CDYK341pSjyNdbfO2nIWU7/k+T7MaGoOzCJZhK/ysZjn7uUeNpkRNBJMht7VYGc6V4iEvJ835z4VAfnTb51mBz+Ytjpk6K+c=,iv:+RVwgp3btRyi1fCjPcMPZ5Du+3RlCkwFNqjFGrS+5zE=,tag:fpNwqMS6CH6pgd2QmaWggA==,type:str] diff --git a/secrets/blueberry/saerro.yaml b/secrets/ps2live/saerro.yaml similarity index 50% rename from secrets/blueberry/saerro.yaml rename to secrets/ps2live/saerro.yaml index 09ca205..cfd579e 100644 --- a/secrets/blueberry/saerro.yaml +++ b/secrets/ps2live/saerro.yaml @@ -8,38 +8,38 @@ sops: - recipient: age1lq5q5g5qjsdcc3key0n6qytkc9z3qx3d3e96ap9zre2aqgvc9ujq82l9hd enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXbnVaYzRrTDdvNGhIYkhH - dzRYZU9PR2xiYmxvRnJ5MDRYWUFIUm1scmdzCkRIaG5QOUEwTXF6ZTFNTzMzRCty - WUx6Szh5UTVPZTlGRHo2Vyt6U1JJY1EKLS0tIFV5SENwR1F0SnlTUitkWGovRjJE - YS9hU3hIRnQzbnQrM09Tamdpb0VVbXMKyiXXJ9U7GRxzzEwUIUEn+1imPvQDQ2Ff - UNSy8kvb65bV54hRLCrh5MqHbWZYGbhYdWST99FUPMCXktnuie3Oog== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaRlpZSjJqYUh2bWpFdFBs + Tm9yYTZ0NWp6ajMva3NCcC9DSmM1SnN6RURzCkhyOFkxTFdRd3NXVnNMYW9BTnpw + UVVtbmkrV3VudGF0aFlPK25pUmduSTgKLS0tIFhZaFY0WFYxV1ptUjRFYWRTS0sr + YklUSmh4aXp4TnJoN0RSQXVaWmdVV00KB+QvhvBrF36EbQv12dx2gtAEiiUc7JjZ + +kWm0tJx5SRSPSWFTSnqWUjWAf39ENLK3FbcPD0G75WjHOMV6WgS8w== -----END AGE ENCRYPTED FILE----- - recipient: age1p0f62dwatt558sf5s4equdqwtg5m7lsnaytrf3xjnvmx3e0lqu4svtugyp enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjNFp4YUVaTWR4RnJ6cG41 - SHNMQlpuMTNSN0N6b0RNRVQxTFdHWlZWdjEwCmdlT1d6bzRBV3BKNmlaeXQyOVVS - OUtsM1RtQXRzaFZwZTA0ZTZDZkxTM3cKLS0tIGRHMFkydGZUU0t4U2JMUFR3cEd3 - Zy9yT0xSYUthNXlKbStjNkd3TWZBT3cKu5CnyZDaEbcRi3zF5K6SnI818MZQABWd - 1itM/plrwHP+e2Db33baK41kgevxls+KpTlTGIt9ArDWMPIRL+MENw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJdjZXRVFkRHg0bVo1Rklq + ZXpoNmREb2p3dW1JOFUvUmdmWk1XZHRMT0FVCkI0SUREM0dCa2JkWXhhVzJucWdE + R1dhWTRjSWFwUUg1T3RGR1dJWm14YzQKLS0tIHVHT013WmpmeHFiSCtPc3RDUko0 + SjZuZFdUNTNrek5SQ1BKUHlNNndZV2sKO7C0FDe6cuTcSFg3BB8VvFaboyUqu/Em + ukje0eJfsyQ2vVDhHCZPPyAVY9RSttc8CCHObTbmvT4xyXhygA83Jg== -----END AGE ENCRYPTED FILE----- - recipient: age13c5wv623jxjja5mjz7fajg9qqwvypzgsfqrs4tmk7rpgyzu7aufs4ul9f9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEU295cHRxKys3OSttckxa - SU5pU2MvSUZ2RDBZaVB3ZnB0YXJ6cXRoekJRClpBTENOKzc2TTh1Y293REZlWi9O - YjhGbThJaXFwNnRMdlgyOEIxMEd5clUKLS0tIG1lbDB1eENFRUhKaFl3KzhDUkFX - akNWb0dIQ2F5NlFCSkMyc21rWW9ETmcKkA4kB7AOJW1LuL22xaI8YyIw0pV7rJPR - Ni43jM6UPU3F7Ans5gd9nKSWTH4FgZ6WkzMLY2hYkmsLVnxSmPPFlw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlY2JmazFMeFJRQ1FDV1Fz + N3NvYzFQbEsveFFPR0twcXFJdkV6N0xUejJNClZSK3hZNGZod0NkZkJzSy9QdnNp + cnN0QzQvcHRRVFdtY3d6dTVHQ01icFkKLS0tIDBwQ1lHMUNPSXU3NUh1V0lhVUJ2 + TDZIUnJhd2Zhc0NUbDlTZTdzd1Z1RjgKTVCC47UKSTiXVCpMcQi/+mfom961OgSn + 9BmXN/m81aHIASVCF0ifGfzg5bTC5lJJ3+M8awBXRiT7Xeit1QiHpQ== -----END AGE ENCRYPTED FILE----- - - recipient: age12p9lw3zgufcg7qx375t9lwtckzwgj0tkn2pt9uj3tnx9sn3ucqgsf5ctdd + - recipient: age1t3gt7yvnlfpjrl6ycfcpmt4xdume884xwswd2epnum6s9cwuxu9svalwag enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBic29RL0FYTkh3ZkxGSVcv - M09MQ0plVlNKNHRRb3JkaUYxcElnN0N4N2xjCk9ROGhMZE1JNzZSNWFEVnhRR0xq - dk43RWZZWVhjZ3phc3I0RWx2Q25xVFUKLS0tIEtWSFpmazMxalB3TVE0a0ZFd3k4 - NitjYVpjUW1uVkdnMGlNblIxM1ZwUXcKfAj+YqrTkhEnRLJSgnppAyEKLn1/QRsd - NpaTVYEKgcdPW404glwEn+2/tOv0+FrJchCcj++6iN8+uvqFr9mIEQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCQnE0cXc1QS9NdkRjUXVT + eU5LQ09Qc3BZSkt5Smo3MTVIZEQraENHclI4CnhyWCtETUNVSmZuRFppQUFSeWdD + RXpUYzdLNXVBSkxyQ3N3ZFVVNFllZHMKLS0tIHRoVE5PN2x2WDVRM1BtOTZaYllJ + YndWN3FNOS9BeFNGUXlwczlHVk85NjgKJYTjTbTZnpa+m8NUBieKcc+yvhrQPA6W + 7IIimE0gpi26vwxuSsMsoL22YbWG8GSX/GvLgBpzspiwimbJJOU3Og== -----END AGE ENCRYPTED FILE----- lastmodified: "2023-12-23T01:12:52Z" mac: ENC[AES256_GCM,data:VbukK5GegVd7hZDCLP7Kr6sOcCk9zcTauak/qyiQ6iqjEN/OPZDy3YGvZi8yozoY2nf+QRsb8mXCu9mo5rMK/txzJP6iqnVA2zAPSIMrvavXPJDJDTrYtnAP0D+TrA7NZzXbVvUjl58GrKEMsK2n3saNIIpxbSdQIBVMZiV4Ou8=,iv:hUy85MTGW5BcBudsqA1BxhjCkOmIh2rlwzY8tdbC1L0=,tag:EiUhdawhGuR49nMDU+xXyA==,type:str]