diff --git a/flake.lock b/flake.lock index 67cb6266..78fdbb71 100644 --- a/flake.lock +++ b/flake.lock @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1727999297, - "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", + "lastModified": 1728385805, + "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", + "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1728306985, - "narHash": "sha256-l/KpcWTv2SjxCnqFs5GYhvjeVYd40WQV4/F2+w9btd4=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ac39b2a8b7cbfc0f96628d8a84867c885bc988b", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -370,11 +370,11 @@ ] }, "locked": { - "lastModified": 1728006367, - "narHash": "sha256-Bdf5twzinaacnn1JBogvxq0S8Ytm+25mWD2cfJ7fvpo=", + "lastModified": 1728438322, + "narHash": "sha256-vVMMJaoYGjrsXzUzXCsoF5cbqq3aV44RHIoQPxzLAGs=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "a3a7888df1b87bdababfd9f0b00b574ee4c2e204", + "rev": "6f3e79295e2ded5f13076fa99cec6abf59a8d9fe", "type": "github" }, "original": { @@ -450,11 +450,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", "type": "github" }, "original": { @@ -466,11 +466,11 @@ }, "nur": { "locked": { - "lastModified": 1728329881, - "narHash": "sha256-3qPiZMj2fEqRofx3OTBJ31wKGFybZahKvLTwtp7FFO0=", + "lastModified": 1728490142, + "narHash": "sha256-5iIn7eiCYNq9eWhUAiXDHd3vkA4UCCruU9BEOP3FzfA=", "owner": "nix-community", "repo": "NUR", - "rev": "d98334ad3e13d3db0ac5bdd94f0a8fbbcf27539f", + "rev": "2a8c9d69e204ac6991449a12d69f748f60bb794c", "type": "github" }, "original": { @@ -590,6 +590,9 @@ }, "scalpel": { "inputs": { + "flake-utils": [ + "utils" + ], "nixpkgs": [ "nixpkgs" ], @@ -598,15 +601,15 @@ ] }, "locked": { - "lastModified": 1655566736, - "narHash": "sha256-Vyolf8j7QcAHyVTQMqS8EGYZ/P6leJtiVNhYyIxoMRw=", - "owner": "polygon", + "lastModified": 1728502146, + "narHash": "sha256-W5/1J7F49hfGnb/yK8WF5NUcNsjNIcDCNyYnRT0NgKQ=", + "owner": "kittywitch", "repo": "scalpel", - "rev": "16c2103d613bb1c7adc6dbf2a17c2980ce08567f", + "rev": "5fbeec42ab00ecc5d99fc82c65c5d903ad14d3ba", "type": "github" }, "original": { - "owner": "polygon", + "owner": "kittywitch", "repo": "scalpel", "type": "github" } @@ -621,11 +624,11 @@ ] }, "locked": { - "lastModified": 1728230538, - "narHash": "sha256-sbsMJOZgykaSdFbxLKghc0QMtolzl4P5nqpttBA3d5M=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2750ed784e93e745a33fb55be7c2657adfb57c00", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -744,11 +747,11 @@ ] }, "locked": { - "lastModified": 1728299182, - "narHash": "sha256-wzxKH5DyG+uyhnGtP8YmN3LCYtEyYR/4fhjKVY2Rtxg=", + "lastModified": 1728399236, + "narHash": "sha256-X1a4t/OkB9fH6Ao+Pqkto8mJrzlG6t8Dimn8jkbPuZc=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "830b6a752d0097c2043985ff4c1203aba07b268d", + "rev": "9f4fbf5f9e381826e6d66a6f699ad30ff3122075", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6c475b76..8e8c9d3d 100644 --- a/flake.nix +++ b/flake.nix @@ -105,8 +105,9 @@ }; # secrets templating scalpel = { - url = "github:polygon/scalpel"; + url = "github:kittywitch/scalpel"; inputs = { + flake-utils.follows = "utils"; nixpkgs.follows = "nixpkgs"; sops-nix.follows = "sops-nix"; }; diff --git a/nixos/servers/web/secrets.yaml b/nixos/servers/web/secrets.yaml index d9be183a..078bb557 100644 --- a/nixos/servers/web/secrets.yaml +++ b/nixos/servers/web/secrets.yaml @@ -10,33 +10,87 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArVG5kTUFmcHdZNmtUZlFO - Mm9wWVV5NkdRb1hCZmNyZDU5Y3UxZ2NRSGxnCjl0QktuWHgzTk1lQW9hQUxzVzdU - QllDZXcvYVJVVnliQ3BCcFhIeWRGdjQKLS0tIFplZzdnMmx2RS9TbEZESHVnSHlP - VDM0QUcyeVBmRzdyUHNrTUVablcyY2cK4WD0mB/EvZNmagFMq1kZz8y5M9mdHxwB - o44D7JYE31czIpM/CJTfjsxG4NlQn//H48W60edSZPFHwIDNzjnbLA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYeFk0VFFaaWhIbEw0Tkdv + QjJBODRRRCtWbHY2Zm1QMHhkWEtDak9pd2tVCkNTNGJ1VmdpOXgwTkdnMmJDRXgw + SXN4dWdQRVdaTC8zWkcxSXFFSk5kMDQKLS0tIHlXamxNK20weUc3MXpwS24rTnRh + UjdTdHdQT0xiZm9YQWVMZFZRcFFsbUUKwwUgPOQWrZav6hLVFFiFuzKASWEnBvCQ + bdQhSAgijTUZziQP5ARYxS4uxaRSUOH5b/QHrw+hnGsGa/dAcyJuuw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDSy84UmpjZlZUbmpkUm5E + WWxETWxpRElBY0dybVJtMGNWRWt4MlBoRGtzCi8ySjNDWkdQdTMwMkg0YjBUbE5r + MzBaU2ZReE1aaDhnSHdWejREN1FUQVkKLS0tICtIcWJOY0huZlo5TWpWcFdja1JP + Y0Q0R3V2Nk5jcHQ4Q2RML3cxK24zQ2cKIb+xi+MCuIfHXXA67x1TCgzN+OGY9vjP + HkTOfmZAFTHsux6t659Rz0/pyEUSrQzk9aCrWKG3GZxiUDPALApaFg== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nr0qds8w3gldmdvhwu0p6w2ys8f4sd0h3xy94h9dsafjzttaypxquzmswc + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNOVplRDJ5aVlQb09NcW1k + ZEVocDJDSkRKZmdVOWhlQnU0YllHSTJQSkVRCjJ6SjIxZTRDdlRqRHo2TUlpdG1a + QzgzSUxRK21qSkxpdUgvZmdiWHFzVjAKLS0tIEpsb2I1WFQ5Tkp3bHg3cXZlQlVY + NGlQVnVmdVhEcno2ZFZkeFdtVjhSbkUKOZLg2INpEEuIyKGhQ7G8bk5UJgP7E5bl + Oj9NWLcQRYOQx9PjIjao4peKVbcK1gxtI2ek2V6KLaG9nEUEkLzkxg== + -----END AGE ENCRYPTED FILE----- + - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVVFg2TTJEbFdKczlWMGVK + dEl4eCt5NmZoWklFWkswVXVibjVva0p2Y0FVClJrZXNGVS9iQmlldERPSmtDblN3 + ZUZVeWpFRCtweU11MVRSUU1vUFJicncKLS0tIGJMOGFlcVFTcU0wNnh1ODdGemE0 + d0o4N0doQnlFd1VkT2xFQW0yUkhUVHcKRYG1HuepNNkmPYun5zwehpOscZ/9o48q + fys1OxmODTQwpHKqQaahOhBDvj0cDoVNrNjBn070UYyyAghrilf7GA== + -----END AGE ENCRYPTED FILE----- + - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3Z3ZmUzhOamNzS0pTRzdK + SlY1MlI1VExlVUVsalpMTHZkMXd0TmdCVUhvCkU2VE1vUUdzbVdzeGQwZ2NQRWNv + VXgyTkhrbGxyVVNRVkU2MVk0ZTNPOUkKLS0tIFdrS0lMVFFDM1h5L2pYKzFKS3BO + cHRPNEdNSzgvTUZaSW5weE5uOThkdGcKMVKV8CiL8ZTqAGQHxAAPFR1DNTX5DUl2 + A4mnqWM5yO7/1Ai6iFJSm5oPSWzokp0Av43mainLQitQ8nC7BE7w/Q== + -----END AGE ENCRYPTED FILE----- + - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhUlpVUVFnTU1GSnAyc1Jp + Y3RFZ25qVmZvWCtGeHJET3NQWVhoTEtGK0J3ClVKL0pwczlaM2x0SVZBR2cvTnJU + dVYxSjVXNWlrL2E2Q2YyUnJ0NkZmb3cKLS0tIG9JbjBEK283N3lOQWtCSjZMQ1VV + eGJoREZCVkZaVEFlMWdqQUdQMjNtN1EKruKf25SZkzGKSIjwMNd+zXIG27Gtd2Pm + LVHRZsR6Fvg5Op2+NScPhEfSmoGqJINjCLjKSq7df7H1lIut2+m2qg== + -----END AGE ENCRYPTED FILE----- + - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrSFRsOUprZTd1dmVQR0ov + cUcrbTBNZEVCOTltVGFvQXp5ZFNwT3FTcUZrClZ4S2RBajE3ZkEvWEErMzNXSm5m + TkJadG51QnFxblRFL0xPZks5NzRHdHMKLS0tIGwxd294VDBFYjVVRVl4SDJFbGlM + bCtHNkJKOHNZMTFuSG5DRWRSQzRyaUEKqaYEkX1AKXHYWl1APvAauk80+STE54gc + 0U8zbqTgJigXhQs8w2DS7uH8K4G5iMgNfgRIoXLg3cFnAA32rKO62A== -----END AGE ENCRYPTED FILE----- lastmodified: "2023-04-27T01:10:09Z" mac: ENC[AES256_GCM,data:tsvbspqI3jrwWQ/728g+urvhbDTvYJ70rcW1F3w5hC0YR6n7M4oED+QXOoH437Q85A9168OvfNqoIIIq3zEq7OWhk1dtInW2EWh2j5nHz1aFkiYg7VonfktJN9ylyamuZVKkmarMc87thzZrU+Ntb2VOdYsYd0AdWtlfY1CT++4=,iv:TI7tUjAUNc6DxpPRrrEdrsWxiJP6F+BZLGaOzTyo+3I=,tag:2zbq3/rMWFNjkRoBnYgfEA==,type:str] pgp: - - created_at: "2023-04-25T23:00:27Z" - enc: | + - created_at: "2024-10-09T18:49:26Z" + enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UAQ//fd8bxMcv1cIrBPEc1w0LKWaQtpeRhHmVOaU+DdHvzo5L - ++aw+pe8Tz/+D5lfz67Aw0U3R4eBrBnjetZ5C+sjVHqrzaKEReddlk22dG0NF9JM - Ejepxo/G85PwWsC3cXgoBeJs2IqcWdAhtS6dH9GoiM4Wwhx0Am4JvLrvo9OJO7dR - ZpSGpBeC9OJGw+nkPLrwMK7dVtfx9JO5A1jdAvapGa+XwP8XxC31IhRHOH0hSwjQ - JQuQFOPz/MqjHb8eHuZa6GPUxjQTX5RN9RbvtRNI5h/fvQxNycQR4GETI/Y+P5Pb - r55+jgR8acJ8p/Z6R7uQLF5tbcHdtM2SY6ANDVgcoBoHe29hAXe6gpLzme54Wo3j - Cm/pt5+TS14uKGKiQjeHJ84EGUsOr+GL2Hpm1qu8VKSkznI19f3zyqcDNWQTYKJA - P5EGO4c4vMp2ihqnDqZC8FurKmzkFpFLgua+snNOd5rVy5kC8f8BA6lQyIdA5dOf - KHf1OjpfbwASr4RrHdNLKj8Z7bkJ+yQ7fmkP2z3uQjk7WveMVa+1r5GNaMk/wYUV - YUOl3TSZNuNaIOnqIqjTCYntbkuwliyenREB8GN1iZA8pCp/mEwa1zyvU6xP8x17 - zPhwveevs96GgZBK4QMLJfYoUD5wCaMuXKIvUGHvM653+eL+Fk6Z1v3lo9+pPC3S - XAEQAzvt47ZhTvQVzWHEnBh9KlsxC6hS0vqbdIddSGXYZ7vsQMszG2r8CNGAGjJ2 - OIq2LsKlrW1KVgrBCWrYnH6HxPi+t+TBVjgehAWZ6qiVoTkI09yNC9MarC64 - =4AdG + hQIMA82M54yws73UAQ/5AbkuMS8qzt21oH7GYJGkV2VFrfzVvRPuKRNj+TH2D5d7 + /9tCtkYfFXI3QEjIAZACKE4djKHQI/jqO1rD0lXva+22u579TEpgonU4abLD3ViM + XRy9xDTBJuZfj3W9MCuga5RqdUNYZCrsGLOnDnc73qh9g4W3JhScIEIpFEUGxH5h + VzzMAFqUyhXccUy4N8mo+rv+DFP60zCfg8S6SOsCjehcwiklIq+HDcoMgjFx1RNK + x68pB1Usl96joZ2Reu6R/sGiLniSAtE06VdANcYSF+BXPdpPUdwi7yMSwkfX2SJG + fRMgBlTqSQhe2kndTICzu2g0JwN2/LFu/fMxiX5dEpIE2fRJJ7M9rJz6otTFRK2j + LUH5pR5qiSCzFuPQule4/jrMYrncpfFOSUINbY7/VAX+K15GPnhKpZllVK4Hqg4A + 9j7IfqfNgG2vO6AljjjXNIdgyhA/ZYI330ZXXzEsi/5RVsfh7VdB8MvLJjn79tTD + svsH5NY/ACKlDJcr2J//roDsyCSYg6FB06BfxkMwuNvJhWRNoNQiLazfm0V+FBY5 + W8Hb4U2C7c9+H82zLC+7ArKjcbBXrfiErFQE7v+AU+w0UF5h4CF3ZY/YriPL2Feo + eQn1HF7oLazosvw6SqIX3KXenuqCtr2U6PDxOZkoI5yaonJ0J4blc6FVV1ZyMJ7S + XgGFPLQJGcGdYrH1ePA3bjh0+rFAPLY3v5bMiIqbD8GSNJwHLXnUS7NU+JOQjWzP + Nkz9Ocb+zox2YfSDuNwEOmJ4GFu/rlnXxPPUYLn2xIX1oU25NNBVH1cGxGZw58Q= + =lYZG -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/nixos/servers/weechat/secrets.yaml b/nixos/servers/weechat/secrets.yaml index 11286d60..fa32827a 100644 --- a/nixos/servers/weechat/secrets.yaml +++ b/nixos/servers/weechat/secrets.yaml @@ -13,60 +13,87 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2aDJPeURXNmlReW8yQWRK - TWdWTlBFMDJXZlVUVFRmQWhEaWFnY0pYdVVNCnhYUGp6NjJ1bm1YNm10Mk9rWUkx - MjJnSFIxN2pkMEhZUGZmcnBsbUlWaXcKLS0tIDNyeTQxWTcwU0dGa0tpMW9NM0wz - eXhMMklrV0NzRXRlb3hBRjNIbjV3WWsKb0Lk1ALTqylYi2GVP7N7njHsQhxQksMG - oDvaHqcPX1FzF2i6MeZkf/IaargzIPBSkofB2AYAkpO28Eui0wl5HQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYV0pGOW5XM0hoS1ZKV2sz + dGdyZjlSLzNIUDdQRTE2TzhtOC9LQ0ZMYzAwCkF2WXpwUDUzckN6Smw0Z0NYQUtU + Y0xjQ3BwRnYrM1kzUUJJWFBKM1ROZXMKLS0tIE5jQWZQaFVwYnpEK0R6WHEyWk1F + U29adDlzdEdSSWp4UHAwajQwcXZXOW8Kzmlfug0PKOzk/Hdp/JrcVl6MpvoZcdLa + 6SbbXiKVcl7H4nFL28349+G9JGSpUhsHipIzhqHK2olLwoFnvN8sag== -----END AGE ENCRYPTED FILE----- - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFZlAvUWV0c1hXb205L3Vk - SHZ2VStIOWw2Qk9CWVB0Q0dxL3BSSFhxYUVVCnRUNFBDNlNTQ2NXYmZ5R2lNZ3Ux - bkxwSEZaVUVzUUhVVm1LbjRzT3dtbFUKLS0tIDdQMlZIOU5rSzhhaE54a1dTS2Vt - emF2M2ZLTUxXVXhDWC9oUHRMOHdMZDQKRJlZuztKP8Z5t0Vrv6ml1ttHQDwr8/uq - grXisFd6KYQDCFcHhuxr/BTvwkRCuf/ZgNst1+kGjvj147JXGR+WxQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFOHFYL2ZzbzlGVitzd3Zu + dmxoelcwaERETXg1cTNRSEJzNEFrd0xITTNJCjJ2cTdiL09HLzZiMWxBK3UrdGIv + bDEyT0N6WTV0QzZUazZDZHhOOWdROVEKLS0tIDJQYmljSXVyVDNrNGJEQi92Umlh + S0EwcStCMS84QkU0RlF5YzNDeHZWZ0kK+d5G0EoXWNoVF8ZMYiT7bc2q9KnkpaPi + tcNHC4Np4rHGvvp/Y3TV5MpT3NVLoNps/D667gan+dvAByPzQ4IV4Q== -----END AGE ENCRYPTED FILE----- - recipient: age1nr0qds8w3gldmdvhwu0p6w2ys8f4sd0h3xy94h9dsafjzttaypxquzmswc enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCTXozRnJxY2F4bDZmc2Y5 - VU5yT0JPZHV4T2NWdTY0KzN6T3BBN2pucTI0Cmc3alQwM0p4N3pkek91L0h2bjZM - THo3L0lWanBSMnlhOTI2NUZPb1MvZGcKLS0tIFNNS3FrRjBmelVwYzdtRjBFWVlQ - a2ZSUnNLUEhtejExZGdXRXQ2QXJ1U2MKKBA8+hAsthSbSxjfYzo/e2qwtFQRBFX2 - s1YQEd6/00PCo8GiJNzitv0Opip8seXy3GhqgnDXuWiiwPEw6aImsA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlNVE3OTJBOFNnbmlvdmgv + Z0N3ZjNBYjdBeWNtNUk0YnBjeDI1ZXQrL0JFCmFHNjUwbkNJYThlWUx2dGZJbE1u + VVhLRTBkYmp2OE1lRmdrdUNtU2dORk0KLS0tIFUraHBFQ0lSUlpkUytkQ25ieHht + TU13QmY3aW1pbk52Q1lNRGxZNW5nU28KLM1G9VrQpv1WheP6mhBjr0DMAyK3xnLe + bUMclhh3f6YbxYcitEV5DaXlOh7MOayaxPslcHeY0NKmVVE3O3HOUQ== -----END AGE ENCRYPTED FILE----- - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQMmtqbkRNYnFoWkJOQkNp - NTVPZ0ppRER3c2RCcEhaNWlLSkpMZTljUWl3CnZaQUo2dytRTHhrbm95UmlLUWRy - NmRTVDh2d1A4WXUvWDArNmtuMXJYU1UKLS0tIGFJOFoweUQ0OGhWTlZNcXpyYkZz - cDE0NlhaTTJjRHRwWFNVYTZlZVhWWVkKKLSGcTpffyMD6f/Kn/MhdB89GipwKJBS - HTQhBc9IE7AiFrHxgP5tIg4vEWNLJDumbpXVD+jXCtdyB72PGP9iKA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOR1BDTCtqSWlKSldHcklS + QkpIcUwzVzJkMzA3UG5JT3kzeCtFaXVucnpNCkpkbElFVE92TFNpTjFuamkvVDJ1 + S0ZTQm9GWlR0RHhBN1FNNE9lUjNpL2MKLS0tIC83T2xTQmRGZ3NhRXlucEc4VlUv + NGZtWkhJYmtOKzdBejRqb0Vlc2NPR0UK9DD61zjGTG9BT1zrlKllboaRWPpMuhDY + PcSUtd1T5M9vtGhMjmkzuYnGwBwUcE7XyhTFZfisuyxvFwrdxMStlA== + -----END AGE ENCRYPTED FILE----- + - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrdll4bUZjckhsNUxNYUtK + TUthandvWW90SnNMWmRmWmpJUUNLVFEvQkJNCmducEQvNUp2cG9kRjFTV3ByM0F1 + WFVDRWRoblJWRDBXUGFaUXJRVm8zNW8KLS0tIDAyODI3Zm5LY3dpNjFXa3hEbnNn + MzkwSEtGNVFveGJQdHZGMmZrK2p4UnMKtVWtR4n2G8P0Sb0DIoSJQ+Hs24Cpp9Yz + Z0EblmnY9YkJCOuCuYYSgP8tukXxUajHdwc8mjOn840g9Tp/cXd/kw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRV2ZQSkx3cEZxQ2UzMWpR + Mi9YemdSTUhmVEFRNFV3ZURIcC9qd2QvTlEwCkJscExJTUdDb0pQc2d0bWlzNU9N + eVpkVkhPWUpLRmNBZS8wM0s4N0RzTkUKLS0tIDk2TUcyOGl0UzRQRHFpWFcrN1h6 + UEtjckoyZDhnbHZkUjdvY0QyaEZ2SHMK2RRl/MsjPG66Iln91UrLRwwv3NZRLLwo + wLubYUBTOtbxP+Nz754k2Dgcg1uUetrAOjpM55+soZMhGIQ0RxNFRw== + -----END AGE ENCRYPTED FILE----- + - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtT2VVVXVnTE51UVFadDVX + UmpSZy9nS2RoeEJib09yNGdzb2ZqSGo1SlE0ClVJUFpYSXVJbWFYZ0Q1SUFaMndM + WDZQMzFWeURHNG9PNjdtL3Y1U0hrT3cKLS0tIGhibUxSVXk0R2tBaXlwYUdzVi9r + SDJBWGg5dVZHSDJRdmJqUUJBd1RNZU0KcRRVy6iCCGj1YkqcIrVhkIoWN7R+osaw + wngAV9+ltqRikRHg/t2J+oHMAriI0EcIAK4cUXX6J3VAXwf8cYyZ3w== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-10-07T23:24:18Z" mac: ENC[AES256_GCM,data:qMoo60ydezJZoQX2LYmzwwvQpKvfxJ5QEBqnCVy5UxNijpfhwmY7qQL7AZy0QNTrCXn/EwpjVScGo10EZwu2hyDyMpzerO2g+I3eCReIZQJmK8b4rsqLqCZFueuFVGDSHixj3M/peCuDx0f70ixurOEm3L8HmBwHGjEfY/jQD/8=,iv:/yHfkEEKOxw12sdmAKWUdOdcC2QqjI9eQ6IwnpV8QFU=,tag:wu5aPYyTy5ZDNKk+ggoTKA==,type:str] pgp: - - created_at: "2024-05-13T17:25:37Z" + - created_at: "2024-10-09T18:42:06Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UAQ/8Dsn4X5ZUaTVKSOVt/bIVVXtoTGRq6tOoRHAlfH0moKP/ - oYFHBmYsapteWuewZvjYn1sYUlfSVWGzwBBEO05FU7RBXPG1TAfpN4oiT1YfS98n - lGYftHZgENVFy5UbvndWhoKKrQGQshhdkR+k4HdyGDYPbV+3PgPLrYRbx2MC7Dzv - sl8mB3oRAn4lN+JKfvsGkJK8+8gkJIma7TcUKT517CqloScSh9Kvu2aOG1Oj3Zv4 - j2RZODbAzPLcQobYMCUk/+O+GwMWcVI/oNU1zF0hrz3LVUSaiLLD+i3VhksEbpqG - 4XxF04H7QMhXz258qzuIzrnMqygSGEbJMO47Dn8WQ38zub+EUxa5Fy1DKEIYjr4N - csFA4Vt14kGyUYVbZfebSK3TW6F05H7vn7pwUfD6OTOcIYMUSJZjlEk5HuYR1pnQ - 0VsxS/HOUP/wcuhyJ0KEqu8NmcM/foiNxIHBaRFcKqcZ7mB3d4KCUH/STu0IsBSO - 2A2VQPANxGRlH03d0zxDeIl/dlZw8RF+30ZHrJFm/MasUb3B/ufo8Fpx1lKdqN/H - yN24kbPwNmt91cKAXU09DghVK4cBlclfTmIMSxqaCFpApg0yS5YpYPmc/HFQ2wRM - 936uzZNkAq8qXWdlnHok4DkH25f3Qex6DjjtNWJ68JQ5eQFLUfhnWrE1iM0ZCGTS - XgF/4cYnaJ4AyXBrr6ykGNu5vmOruMaBpKvnHdl6g8k0F792+ZJPVHK6EH5eGCvL - mIi/J5r7RNGWcS+4JBTPbu006M+TXsi5Yy+z3MKrvFWxjjSTB3Nu5NubHJBOnrI= - =LtFB + hQIMA82M54yws73UAQ/+LQV/1f8SFCMV4Aw9vzfKbIfcoxtz7dKKXPg505d8RtYK + 4FHCSN/U5nDGVBzrtZzi22T0mfnMa/3hv2qgxk5XLu49058j5w7VlAFOgP7xbdwy + SqmCpgjh2k+btQSloQ8rnLkJZ4gGMdU9QRGQzLFSN45DCIv2ZiUzG0j4uRd90M5S + 2PtdohIAQpgy9B0RPDx2R3YXJnDrwPyTAXs0jW9Hew+B3m3MTJXW3uXhzjnoyKwX + ERuIQBWQBNtXPGDTVWpYaAQ3Fv55pXhSbUK/vbceZnwH6liCc5r8WDPLMoPKdYh4 + uftkNO5+eNL7a/MtNUjksg4P65dMWkmySemmvo8OdimGfWSAJab+QbUU6eVaRaWA + OfKUbCOySLG1AtCb792jvYSvhfymNFQnA7eZ51HL69PxtpfNS6GaewPT/CPkzm+Y + DmiQdPL2Sfoa+dKf2IrvEsWpd/M4k7vyf+WT99ER5Uo/J2yXN/wWYg8RbTFkHop3 + rIq3OFxaH28GtxgGSl3u64m5hhWeJsSN1RMpbnGSWa3zBcwtbgrmTPGqq3QoZILc + DhFfAyziqsL9bG2QkrBRtyQzztcnLzT56wlvJY/C54Azo23ukjue2KCmUL2vIu+Q + RVqdWSh+3P2cgS6niXMM24Rp6mQYLvongTsDzAcqX0Zyfe65gsGWtNW0G+2BkZDS + XgGNwsy7J5PAUxe+Tjn6AoJSc6aoIh7JQ/pNrZeHPBhsOAfPABMISpzUvA1oLNzb + QQW0RAbxkYdvL9NtGqVYgJx8+T7BIiXdqpJFpfyCy5pLoJR9jH0bqqd0j3TYgwA= + =n9Di -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/systems/daiyousei.nix b/systems/daiyousei.nix index c6781f39..b4863d14 100644 --- a/systems/daiyousei.nix +++ b/systems/daiyousei.nix @@ -15,6 +15,8 @@ _: let oracle_flex ]) ++ (with tree.nixos.servers; [ + weechat + web ]); system.stateVersion = "23.11"; diff --git a/systems/yukari.nix b/systems/yukari.nix index 57571730..b92bfd20 100644 --- a/systems/yukari.nix +++ b/systems/yukari.nix @@ -19,7 +19,6 @@ _: let postgres matrix public-directory - weechat ]); boot = { diff --git a/tf/kw-irc.tf b/tf/kw-irc.tf index 9ae46d7c..58867f54 100644 --- a/tf/kw-irc.tf +++ b/tf/kw-irc.tf @@ -3,6 +3,6 @@ resource "cloudflare_record" "irc" { proxied = false ttl = 3600 type = "CNAME" - value = "yukari.gensokyo.zone" + value = "daiyousei.inskip.me" zone_id = local.zone_ids.kittywitch } \ No newline at end of file