diff --git a/flake.lock b/flake.lock index 4d44766..c6b079b 100644 --- a/flake.lock +++ b/flake.lock @@ -223,6 +223,24 @@ "type": "github" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -608,6 +626,18 @@ "type": "github" } }, + "nixpkgs-lib_3": { + "locked": { + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1719122173, @@ -794,6 +824,27 @@ "url": "https://git.sapphic.engineer/noe/pihole-flake" } }, + "plapkit": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719437344, + "narHash": "sha256-CYkGI2KIU5UiEAh0wgTkJipERGWK9kLjQKmKAZNMp6A=", + "ref": "refs/heads/main", + "rev": "dddd75dd8661d3f34f1047e1a9c501a3cb3356c9", + "revCount": 4, + "type": "git", + "url": "https://git.sapphic.engineer/noe/plapkit" + }, + "original": { + "type": "git", + "url": "https://git.sapphic.engineer/noe/plapkit" + } + }, "root": { "inputs": { "apple-silicon": "apple-silicon", @@ -814,6 +865,7 @@ "nixvim": "nixvim", "noe-sh": "noe-sh", "pihole": "pihole", + "plapkit": "plapkit", "sops-nix": "sops-nix", "tachikoma": "tachikoma" } diff --git a/flake.nix b/flake.nix index d44964b..003ff00 100644 --- a/flake.nix +++ b/flake.nix @@ -84,6 +84,10 @@ url = "git+https://git.sapphic.engineer/noe/lightrunner-emotes"; inputs.nixpkgs.follows = "nixpkgs"; }; + plapkit = { + url = "git+https://git.sapphic.engineer/noe/plapkit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; nixConfig = { diff --git a/nixos/stacks/ps2.live/extras.nix b/nixos/stacks/ps2.live/extras.nix index 11b96d9..2a7b31b 100644 --- a/nixos/stacks/ps2.live/extras.nix +++ b/nixos/stacks/ps2.live/extras.nix @@ -1,9 +1,13 @@ -{ config, pkgs, ... }: { +{ config, pkgs, inputs, ... }: { sops.secrets.roombot = { sopsFile = ../../../secrets/ps2live/saerro.yaml; }; + sops.secrets.plapkit = { + sopsFile = ../../../secrets/ps2live/saerro.yaml; + }; + virtualisation.oci-containers.containers = { roombot_ps2c = { image = "ghcr.io/planetside-community/discord-room-bot/bot:latest"; @@ -14,6 +18,16 @@ config.sops.secrets.roombot.path ]; }; + + plapkit = { + imageFile = inputs.plapkit.packages.${pkgs.system}.container; + environment = { + DSI_FIELD_NAME = "system[front]"; + }; + environmentFiles = [ + config.sops.secrets.plapkit.path + ]; + }; }; systemd.services.restart-upgrade-extras = { diff --git a/secrets/ps2live/saerro.yaml b/secrets/ps2live/saerro.yaml index 8c271d0..e95b2e9 100644 --- a/secrets/ps2live/saerro.yaml +++ b/secrets/ps2live/saerro.yaml @@ -1,6 +1,7 @@ saerro: ENC[AES256_GCM,data:Cl/d1d7O+sChFqQiBWroaZtGk5PzCp2esfdyT0DmQZBVfpZmnIXsaUBgM2Yjq3Bm6x0+njQr72v0JlWT73FnYSh/6fo8a92KLseysGca505vpdW7ynCFLR7e2Wrumil7iE2rL/SHr/2vbjgttDnjv6EkPqOPqYzD1BAc30frsH0WmZrB3llPhTBdgwdLLZYfJZPYg50oH7q0neeP9JxZaFYpEEkhtIDkObKZiix5gCxgQK0WzOpYyrRR7uCL/zpVNnM05aBpxz6o4GJwepJTy+KAlnmDBQnELrWAepx9EYiQRH7yk0OoKFYLnnP0jVA/PDw8HSA+29w=,iv:0dowkRKlS0IYxgMSCgMFw4EID/zb8GuZ/zsVKohFaRA=,tag:Nu3bDmxVUmGgwB20i7MdCQ==,type:str] metagame: ENC[AES256_GCM,data:4B2br0xdvlVDUmnvrD6g0g==,iv:mv05woLklpk9B4bj7/AEFBGYgRyTS9flv667Ud9FpEc=,tag:mRvB2sGWKzE2RwgyF1kIpQ==,type:str] roombot: ENC[AES256_GCM,data:D4ee3xyiuRYZZUXNR8LFiVjto3r8nZHcgHU/6H/LNH3Yuld0E0fVmV3vABdyqd1HernM4PUXMaEzMhGcajdNvKmof6ItpJPqACL9z7kono4etAotuhk=,iv:W9Ek5Eid+TFJO/7xTl3TYd2PzXiQ7tldIWN0zDEuOSY=,tag:Cg/iGWyy/rQDuYaH4w6Cmg==,type:str] +plapkit: ENC[AES256_GCM,data:IAEAaPouYF5SxUrG9u7AvB444D+oMb1wNPP/8NrEUHIRDdjgXaGWekBgYt7oTNZNNaG5eJBMBH2AjNRVyg==,iv:U3ZBOlCFPtI/djZZhQji28pYkiLtBJ29SaRtW2MsP5U=,tag:A0q/MSZflwvo3+mPFakUyQ==,type:str] sops: kms: [] gcp_kms: [] @@ -43,8 +44,8 @@ sops: RHpySU8wMUI0VlRBek1TZ1R4eTZuYmsKYK1nW3njBGyAsihttauYMNzq16StUjW/ ui/Cn136JiYAUTkSG8yEHaSGoI32vabNuLNJDnG6fdvgqhDeJTGBBw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-03-11T00:46:46Z" - mac: ENC[AES256_GCM,data:8Me0U7DVUe1F7TaPboV3Dt1U/KBuFiBGingfjK1GgkixljgRs5oAR3uwMblbmOvSmjuRbyw1G9S29ZUbuMGDeYBLWVtIyLroUdDsoUIYCJenyyMNNBeOhh0qA2syvhyNVkOtawPqdiIO7AlAfuvab+lGYq78Abyb8Te0RB4Bxu8=,iv:0VhG4JESLGtjZ0I/X9E7leWwXzf0FvYPzEUl9Tn/9zI=,tag:UGlRj7A0N1Mw71tzNWA/FQ==,type:str] + lastmodified: "2024-06-26T21:35:22Z" + mac: ENC[AES256_GCM,data:EW2sWKnvppJvvAOFbbk/IL5Cd/p9dcV0EsKFzKNW9uy7uqDj/XpncgTh6lMqxGeGB4DASNJODO2peu5AJ92FnOowUqPNiEq8cerJs6XapvmH66LFisQAUVjjzmtAM2fiPJqRWGzSM3JaZiha7GCw/TsyCwbq3Mc6Q9NCHJsYoro=,iv:K9s1ejieal22XN08M3Ko6PbFRBRVMpVIwRQiI2jqxOY=,tag:aGJ13uUsR1dpc1ik64GVEw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1