Merge pull request #211 from DarkKirb/add-devterm

devterm: bringup
2023-03-28 20:58:32 +01:00 · 2023-03-28 20:58:32 +01:00 · 2ca0096f98
commit 2ca0096f98
parent 7ff5f75acb b021cd06f8
11 changed files with 178 additions and 56 deletions
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@ -25,14 +25,14 @@ jobs:
          ATTIC_TOKEN: ${{secrets.ATTIC_TOKEN}}
      - run: |

-          for job in nixos-8gb-fsn1-1.x86_64-linux nutty-noon.x86_64-linux thinkrac.x86_64-linux nas.x86_64-linux instance-20221213-1915.aarch64-linux; do
+          for job in nixos-8gb-fsn1-1.x86_64-linux nutty-noon.x86_64-linux thinkrac.x86_64-linux nas.x86_64-linux instance-20221213-1915.aarch64-linux devterm.aarch64-linux; do
            nix show-derivation -r "github:DarkKirb/nixos-config/main#hydraJobs.$job" > old-$job.json
          done

          echo "Difference between this PR and main:" > review
          echo "" >> review

-          for job in nixos-8gb-fsn1-1.x86_64-linux nutty-noon.x86_64-linux thinkrac.x86_64-linux nas.x86_64-linux instance-20221213-1915.aarch64-linux; do
+          for job in nixos-8gb-fsn1-1.x86_64-linux nutty-noon.x86_64-linux thinkrac.x86_64-linux nas.x86_64-linux instance-20221213-1915.aarch64-linux devterm.aarch64-linux; do
            nix show-derivation -r ".#hydraJobs.$job" > new-$job.json

            echo "## Changes for $job:" >> review
--- a/.sops.yaml
+++ b/.sops.yaml
@ -5,6 +5,7 @@ keys:
  - &thinkrac age15c2dquc22epmmndpmd8pa3077fdl8nyr5qehr7y0c9uvavrledsq326ak9
  - &nas age1c7y687sxh428wk34s8ws6kemu62mggafpt40rmanevgkuj5xa59q6f7tlc
  - &instance-20221213-1915 age1elra3uklw8rmwkevqms2l4tsd06d5utqda9d2w4qvqpz898uzuesugxkhc
+  - &devterm age1z5ryq3pehydapv0s90ljak3yct3qwwtt43wjp9kv48q2235s252s6fq4kc
 creation_rules:
  - path_regex: secrets/shared\.yaml$
    key_groups:
@ -14,6 +15,7 @@ creation_rules:
          - *thinkrac
          - *nas
          - *instance-20221213-1915
+          - *devterm
        pgp:
          - *lotte
  - path_regex: secrets/nixos-8gb-fsn1-1\.yaml$
@ -49,6 +51,7 @@ creation_rules:
      - age:
          - *nutty-noon
          - *thinkrac
+          - *devterm
        pgp:
          - *lotte
  - path_regex: secrets/instance-20221213-1915\.yaml$
@ -57,3 +60,9 @@ creation_rules:
          - *instance-20221213-1915
        pgp:
          - *lotte
+  - path_regex: secrets/devterm\.yaml$
+    key_groups:
+      - age:
+          - *devterm
+        pgp:
+          - *lotte
--- a/config/desktop.nix
+++ b/config/desktop.nix
@ -81,7 +81,7 @@ in {
    SUBSYSTEM=="hidraw*", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="0330", TAG+="uaccess"
  '';
  services.udev.packages = [pkgs.dolphinEmuMaster];
-  programs.steam.enable = true;
+  programs.steam.enable = system == "x86_64-linux";
  nixpkgs.overlays = [
    (curr: prev: {
      steam = prev.steam.override {
@ -96,7 +96,7 @@ in {
  services.flatpak.enable = true;
  programs.java.enable = true;
  hardware.opengl.driSupport = true;
-  hardware.opengl.driSupport32Bit = true;
+  hardware.opengl.driSupport32Bit = lib.mkForce (system == "x86_64-linux");
  home-manager.users.darkkirb = import ./home-manager/darkkirb.nix {
    desktop = true;
    inherit args;
--- a/config/devterm.nix
+++ b/config/devterm.nix
@ -0,0 +1,48 @@
+{
+  config,
+  pkgs,
+  modulesPath,
+  lib,
+  nixos-hardware,
+  system,
+  ...
+}: {
+  networking.hostName = "devterm";
+  networking.hostId = "b83a2c93";
+
+  imports = [
+    ./desktop.nix
+    nixos-hardware.nixosModules.raspberry-pi-4
+  ];
+
+  hardware.raspberry-pi."4" = {
+    #audio.enable = true;
+    dwc2.enable = true;
+    #i2c0.enable = true;
+    #i2c1.enable = true;
+    #fkms-3d.enable = true;
+    apply-overlays-dtmerge.enable = true;
+    pwm0.enable = true;
+    #tc358743.enable = true;
+  };
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+      options = ["noatime"];
+    };
+  };
+  boot.supportedFilesystems = lib.mkForce ["ext4" "vfat"];
+  system.stateVersion = "22.11";
+  nix.settings.cores = 4;
+  networking.networkmanager.enable = true;
+  users.users.darkkirb.extraGroups = ["networkmanager"];
+  nix.settings.max-jobs = 4;
+  nix.daemonCPUSchedPolicy = "idle";
+  nix.daemonIOSchedClass = "idle";
+  services.joycond.enable = true;
+  hardware.bluetooth.enable = true;
+  services.blueman.enable = true;
+  services.tailscale.useRoutingFeatures = "client";
+}
--- a/config/nas.nix
+++ b/config/nas.nix
@ -176,4 +176,5 @@
    max_parallel_maintenance_workers = 4;
  };
  services.tailscale.useRoutingFeatures = "both";
+  hardware.sane.brscan4.enable = true;
 }
--- a/config/programs/kicad.nix
+++ b/config/programs/kicad.nix
@ -1,3 +1,3 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [kicad-unstable];
+  home.packages = with pkgs; [kicad-unstable-small];
 }
--- a/config/services/cups.nix
+++ b/config/services/cups.nix
@ -27,5 +27,4 @@

  imports = ["${nixpkgs}/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix"];
  hardware.sane.enable = true;
-  hardware.sane.brscan4.enable = true;
 }
--- a/flake.nix
+++ b/flake.nix
@ -128,6 +128,10 @@ rec {
        name = "instance-20221213-1915"; # Oracle server
        system = "aarch64-linux";
      }
+      {
+        name = "devterm"; # devterm
+        system = "aarch64-linux";
+      }
    ];
  in rec {
    nixosConfigurations = builtins.listToAttrs (map
--- a/secrets/desktop.yaml
+++ b/secrets/desktop.yaml
@ -12,33 +12,42 @@ sops:
        - recipient: age1py6eyelfttya52wc2v2ar7fx5htr5jw6snl4shx98sw8nuaw2pesyhseul
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuMXJncEt5eVF0eWs4VFFV
-            aHZlSWJwV2xkemdDK3JCbkc5YkF2QTFHdDFnCjU3UkV5NlYxSmdVUlljSnNBam5x
-            Tkl0cjh5WnV5YlZFQ2lqaDdRQjUzTFEKLS0tIGlNd3hORS9aZWRRZzhVeDg2UkZP
-            Y3VhNUhWTEN4YTF5MFJjUG9UUERwb1EK1v6p+cLRp8L9uW5GvYnZlKvZJhThhON0
-            SMev5i+oA1gGC8wSBiujFxQTiHUQi0R5g0FS+GfN1SejDx7QBVnk/w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsbDBuaTZZanlKcjFiZjNp
+            RDd1RTYzMTJYTGZZbFhnOWNvRnI2WkprcDJrCk55eS9qTUVIeU9seWhxQjFyR2ZH
+            M2Rlam1iS2tzSGlaSGRFcmdMMjZvdk0KLS0tIDRkdmlsOEhJRXl0NUVmMCtDV0VS
+            c0V0NFFJN1diNDBEZVF1NVRYb1FSQzAKJGOgzFIt8XVwjzCsRhH2m+UwIdheHLmL
+            6PgakO3mRN6eiyjGxvA+7wTT6Rn/npLA1rPqSihmnXlqYgFO9fk9og==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age15c2dquc22epmmndpmd8pa3077fdl8nyr5qehr7y0c9uvavrledsq326ak9
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOMzRQRzFpdTl1Zm9OVjlJ
-            Y285YkRkUFVMbWZtaTU1RUJPM0NscHoySFgwCldaeXpTVDRHNGlBeHpQeDZWNGth
-            UHp5RjVITW5hTzI3MmMrNGRWc21xYncKLS0tIHFNNWtxaDdTanVsUXNwTVBMdlNP
-            RldoaFNWVDg0NkhYN0FEVDRwc2RiSG8KL0Ng4rlbv8v32Roos4slUw7N5AONFwdU
-            AZQBp1NC81jhOfex63U5taX2SIvlAZ/PRqjt9Swo0qzJlHWlDLhhug==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMd0lpWVJzbnpZUFAxc09z
+            bUFrSnVtakFHbENVbVlreUxJMmFRV1dxeFhjCkR1MlRtbitvMFUrWVdPeUtKOER1
+            L2VhRFcvR1BlbzFraCtZWlV2YVJDZ3MKLS0tIEkrcjVsaGVmOWlqd3BSazh0TE9q
+            dnZ4amlrMXk5MEJMT0l3YXJIM0hhcHMKHQDSokpaUcZUPKV2gsQapFrnhvR6JLXo
+            2bXt3od+VV/rONnN7als4svfI400ALdBkkb1w9ALEuTbiSNjPYNiyA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1z5ryq3pehydapv0s90ljak3yct3qwwtt43wjp9kv48q2235s252s6fq4kc
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGYVVQUktra3N6bkZ3YkN2
+            QTlDanJjT1hqOFVlckF3bCtabWVWbG5UQ2pRCk9NWmRwVGlocDdsMlhzQ0E1YXNl
+            QllnZ1dPeUcxYVFsTG5GMFA3d25rR1EKLS0tIDh0UHlWaGpiMlQxT0ZWRllyTHQ1
+            TWl1REw4VXdZdy9MZ2hOdGNaZElqa1EKY2OmuzfUl9qXpswRMozR0JPvXfUgarrr
+            i+ZlbZGN0gV4TQzMwokU8T4BxmRPC3Zj1+Nm7235ThjRIKI73rl2tg==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-02-18T08:55:52Z"
    mac: ENC[AES256_GCM,data:h8NhhFlM8T+Ux98jcKV2SOCAfLM6JGrz7zaK6Rf9FpT1cJPa5Z/6nV67Ccp53J0gDvlnXgBrlawekUb/Tq9Df5C79btu2Rp0Jric9kEhdI3LHcG+Pg5N0re1VgBFC8ypcJdC/5+g/8Fz7gMAj9Tq7leW8kIR3WH11xXBHqg2bKI=,iv:1PJrHIOnTXViaEM1k1kqJ3/1Uu7F5Hv81/iTnS9L2VY=,tag:zlPFK6n7aAa30guF4DEEwg==,type:str]
    pgp:
-        - created_at: "2023-02-18T08:55:52Z"
+        - created_at: "2023-03-27T16:01:10Z"
          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DAAAAAAAAAAASAQdAYKquQpDAGrcwHfic+JZNH8buTdjUkoPiXiiYmOQn40ww
-            MobUiDit5iLYS3UcOmiehQaOVi9B5Iv/46Zh404zDY6wUFD+qKWVLTBxQGd0pXJi
-            0lwBRXSY8QtfMwRH0UOE4RIedojVnx4lVkzd4hXuPuAS492qKSaokplsSbS2Iq8W
-            a3xivS0U34vZqJVM3pI1YtoPmint1e57YM2/FTPF2XfXF2AXCBpPOY4+M8r9aQ==
-            =T29X
+            hF4DAAAAAAAAAAASAQdAOThNVCDmFQeKv/7BknJoKn+8sTZsIHsK1KK9qoLNaT0w
+            J6ndScjLuNkNnNNQOLe2Cy1Lbh5vcG5jB9vMEH8w9ItgG+xVxwZHub4IFc5a6Ir+
+            0lwBuz2XuiZCDQnzRQpqGiW+K61echrfXMRsuvhuKv6dWgvJuSjitbs1vm2QINVH
+            C1FOBt2PydSPtLIj2AB/nLvxsGfKdC9IMmpLOyZ8VBLbNmcWMwd94DLJ+3xfrw==
+            =XPZz
            -----END PGP MESSAGE-----
          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
    unencrypted_suffix: _unencrypted
--- a/secrets/devterm.yaml
+++ b/secrets/devterm.yaml
@ -0,0 +1,43 @@
+network:
+    wireguard:
+        privkey: ENC[AES256_GCM,data:cOCbrFajDznhQJTNkkmxRbf5y+AZRINFxFVcVJKHjoqlAJb8JoxOB7QQlRo=,iv:MI3ywbty59Wu+nEouZf3Jcgr9fUTs5jUe1Ti56AOWgY=,tag:01L3igLwoZsn7ZD97wEyeQ==,type:str]
+security:
+    restic:
+        password: ENC[AES256_GCM,data:1+Qi6hRmElj2ZgEqLfkV/n2FWBw=,iv:fnQYTFojbKmrtXFC2Vwgdx/cQwceak2l/RW1/+3gcX4=,tag:ITKq/SCMR+SAK0msfFh6GQ==,type:str]
+email:
+    lotte@chir.rs: ENC[AES256_GCM,data:BPhVTMiqv+J5GDYR5NAIYj/BIA==,iv:C2V4HqB68Us8PdxRB0WMl1VM2GHVse1U9SFf3IPNiwA=,tag:jq5SFq3Rg3dGFFfan6qxpA==,type:str]
+    mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:wQR+YsnWmdOwNyXYGwAm8ZkGBax/ZLmWJvG78pb0cMYcZceVFBcH106td66whscIS3OmVeSPxUx9XbHlXtHXXg==,iv:4O7sa4Bp/ungGC6X41RAKt8ZHN8M9OTsedu/6jn2mS4=,tag:4BqLR6X6XNFcc6c0o5ZcJQ==,type:str]
+password:
+    root: ENC[AES256_GCM,data:tCdTl8m6r/znHHJdQxIU5+R09aW0j/PURsKHRhhgp5ntnyzigxgtJT71bOOu1UzOecL+ocfr9iI85QHNblh7zw23yIpqs5kI890l8FAsaKj7/XFFAmkiJAtIIwIiLUBfM6pamRIPYR0a1A==,iv:I82IXspWp6GsqxgNpPADeyDK1n26BT1Oymp8VFP3LbQ=,tag:EvUzn1DY+yK1R9qsZ0Rl9Q==,type:str]
+    darkkirb: ENC[AES256_GCM,data:r9HWfYbBp2LzQSFcNnv9p1kg0rdQoI7RCboOWO9/trOtB4W5R4hccpWphvZz58R9T7WuSUr0Nu7mKHAx3DjaLYvdGq+XjhGjZZrQo1iLdJ/rGGmNx987mV+cJqesKn4n69mfltqC80b/8g==,iv:iCYZSTDTm+1gyNhjBl0Z8NC57qSjmIJFP6GS+Uxv9fw=,tag:f3tD8wuiewwUfDXmMqhDiA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1z5ryq3pehydapv0s90ljak3yct3qwwtt43wjp9kv48q2235s252s6fq4kc
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjdlVFdWlZY0lzSXc0NUEy
+            YWdWZDc3Ti8zZ2VJVVNKeFAvd0h3U1daK2t3Cm83bzJIWHJRdUk4bElnRVg5czIr
+            c0dFd2g3WUFKRkllemowcExCamZnVm8KLS0tIG5oYUg3Y2t5YkZUZG5hU1FCcjJt
+            NGNjSVhOWnExUjIrMWVEbEllMXNyam8K29sPci9LT7rQOdq2bwNXwPbgE9bk1SG3
+            Su+07MHegtQLOvY+zwG2aZVNtx6O4ImwM7l7AOyxqglcjNjIrSGMtw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2023-03-27T19:51:12Z"
+    mac: ENC[AES256_GCM,data:9lxSLBxEy5TsNsf+BaO2cS9Z/et/IZoNx1Ry0S6EmcahQygZ5KDWl9WOv9Wq/UIaDliDo8Hpou9LcTxp8onL6ZPoG/xmR8qn6m6sFVib71m4o8o5okp5r0RQU+bI/mMb/4O/JKrMV4TaXp0HWeBk1DlxJd6KNSFocMkgf/t9I6s=,iv:yPTlvjYHU7b0fakZiQBgymfiND/L0zpcdS84ParaPx8=,tag:KdHwHGkh08N5czSQfia0LA==,type:str]
+    pgp:
+        - created_at: "2023-03-27T15:58:24Z"
+          enc: |
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DAAAAAAAAAAASAQdAyzpAXrup095uERAbw+gmY7jdR3xmlBzvPUgXS/R4MzIw
+            S/NkuBPEb36hZRrZfneBvfuf1C1Lu0ezFTceWE8UygfuewHWrd2Emadr8gQEg8UD
+            0lwBItL40tr7u/o0bvd6F0r+proIRh76gzKNQ91ZIytZKVLTGebusAPuJ/eWSJ7u
+            yOkpKaCZbcc3o2g/7ZbJC0U9yxcSP2OKfEzG2V6lw/nZ2Ly+Ik6LOHGImhwqTQ==
+            =vIlD
+            -----END PGP MESSAGE-----
+          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
+    unencrypted_suffix: _unencrypted
+    version: 3.7.3
--- a/secrets/shared.yaml
+++ b/secrets/shared.yaml
@ -4,7 +4,7 @@ ssh:
    builder_id_ed25519: ENC[AES256_GCM,data:VXzI0bSo68jt/lo8aq2iR89b/cnLDRWUQhf0BQAhViirugNA7gkQZPz3IU1JGH6iU1jtoDzFCje3vRXA/EtmRD7S2bKHg7jj4TaQOB80yrWWmGlL3rRmPvjKoAh8+geWKKU7vuoZpR2YbQZidcAFFZ5n8DpYyhcCwYTBgpcIW6/yWD2ZNi2S0BxN1b9SdThrqbq8KRU3ngXHWnWkp99cVMuOL4VPHrJDL84vdkIPP/6q9oTUDwdYERpYuhvuKBkMW4iB9eeL5527B/CqBSI1qJfwpcGDi2yh8RuRfK81p1utFKT5PNwR1ONM5Xy24bYxc/YX3DPgEsvThYqZ/UJXP6kZ3VVhPgYQ1qhz4Sg59HX8v+d0NXjfoMg2zF7bZ8qiMOo6jYtb15scgtZAFmHIh02cUShmk/YB1qZeZdXXdBcTvANW54XOYrnMNAzsPvMVvWVfbusU/38v1csEryf7GICRSvhaJ95m7pBWA9v3f+gXjsQtycUSBoWKR7Vy/Dmf//GRylUesBoBNc3wJLVgJ/YwF09O5/sgrQB8,iv:6YG9KmaDnwHEe14Rx9SlkFxg+u1w7F98yN17rg3ebe4=,tag:40sjADcJc6CAixDUlCw64g==,type:str]
 attic:
    config.toml: ENC[AES256_GCM,data:XLGu78jtFxmItlobW0m4aUdQRkOVubAohFCJD5213Mi7TtmoKe9HXgbhypLQzZHURLTwwJWgnQBSS1hf0xVyCuM2gLUEXE3MeNdZuP5tIxVJGyrSY1MIB702H6fxt1yCR5q2CXfEsGDtB08/pE1S01WZ2XKFvcGoFSDz4+8zfvk4CyTeMr0jCg7Ejj/UfywCQY6tjvgZBkynaZKDJog1xyuEIYx/TyITMoz0ge0vcdzKE2b6xbMC4ToDqTTVeG+AUCfYA9d2JzPnSHY8yDSDw2sK6yB9tMR25btUGAChn2nEejSIUxKbNm/jPp8OUugdOlwT+o6q/OFuWZLZ2sZKuU69i4kNO5+UIujkJ3AmGdHshurHQ5F6fZWlSutT+YbGoSzm1h1jrcCf3XesXReGJ6P1+zfjl0FH7GA7VbG+Q3IdJW/ZvqmMnrujfg==,iv:Frmb79vIYN09+sw84ETTGiAuC45kssUFk2ecnZt+YqQ=,tag:JZPpNPncKfxZ3JUOiGPcsg==,type:str]
-tailscale: ENC[AES256_GCM,data:dM0A/3CZJxvE1QGRMyKZuDGVSyb4t5dWsszouj+z2MjKywdmRw0bB/RWu3tMPC12a5QtKOXfKv2l,iv:jko+Mf6BGo8WhF2YrOQHQu5NDB+pb8uAlkwC9N4MTfw=,tag:g7aH44jis7homYemLdoiVA==,type:str]
+tailscale: ENC[AES256_GCM,data:qGwgnZVUNWFmAR48xBzwGGrTxph9oiB/0RjaW7B9/lWpdlngg5RfffoRQdweP3Q8XhvdqhXXWx8=,iv:zXbZ0RI2h/1eMMNM4kxft1K6OQT1NvLPY/ktpiI684w=,tag:8EEtsRPShrWjDzJEG3rJbA==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -14,60 +14,69 @@ sops:
        - recipient: age1273ps5thcy70ckdt0270s2nysqgu48t38pq3wq975v3y7mf4eavsw38wsl
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBidW9ibGdrTVVSTm1LcHRx
-            cUxlS0l0UWJLWTZQY1k0bjg1YjdRc1FkcnpvCmYyQW5aajVlelRYOG5relBVMVRR
-            ai94MytpbHFFQnI1TkRST0czOWNPM3MKLS0tIENPM2h1VGc1WFo1bllmVTJCdnkx
-            K3NNNDlxc05XQ2lDZjArR2EwOFNKWEkKUFnCMMpgtU3dqqIogxFzLLU0T1Kg3m7h
-            NhAGcfrtG/1vqi2NZvjNRQf7s7xwADCq37fsvhx9KmJZ5Ree8O9VHg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLdjRzSGsrWnVwWWNSTk85
+            NklWRHVhclBxNUhRQTIza1g3TkErWnNMR0YwCnRlN0gyNTRpTS85cDNNeThKSzl3
+            NWtHVVhUL3JiU010dWJ5ak9KT3VyZzAKLS0tIHl6cUhNQmRGL09QbFcvUnFkdHN6
+            VGthTVpsNEhkZ2JDRXRjVTRNVFoyVk0Kf7gwfWzsMf09uwljqhIUWy/xYKKboPdD
+            pcYxlHIETmoo95TopOzr3EDY0l2QSQ/KJ1fh6wDh+hO7BgWb/wh5hQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1py6eyelfttya52wc2v2ar7fx5htr5jw6snl4shx98sw8nuaw2pesyhseul
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLQWRSVHRFc0JqWjRnbkJp
-            aWE5M0QrNXJVOTVlS2t5RTdWTVVTQk8wNFU4ClFzb3kwbU1lb1FKd3h5aEdEU2pT
-            TUFlWWJjQU44MVM0VUtvTWpqWGtuNjQKLS0tIFlaTkVhckZSbktlV0k0RksrQmZH
-            dVBFYUJNK2pwWUVDQUpnaW03ZjZ1YjQKBK+55bau+5/afrxDEiHJfLmYMbvWBHfr
-            4EDij6cXEeSXhYCWfM1nrClj1h/Wrc6v8cjm+t1B3B/bd/fSeDdSHA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYVzdxaEhKZmFHdzBydzJi
+            b01DTG1RM3VZcjZkeFVBMktBV0Z4ZHpyMldBCk0rUU42MktrN2VPZjZBTTZzQjVr
+            ZkRSemNCZDZCNGNySnBQY1cwYWZWaUkKLS0tIGd4dS9UUEpXb25oSE5KbGw3dThS
+            V3lVYUR0RnZLS2dKMjRJWCttanpJM2cKbasf4nKlo0fmgZRu2oonuAxL5RC6UeYb
+            A5VhlFX+IC9sMdGbIobnFG+LyeFwaNhna76vLVmaMqpWNOiPJffMnQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age15c2dquc22epmmndpmd8pa3077fdl8nyr5qehr7y0c9uvavrledsq326ak9
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSWHo2dDdhVElGNmJ2Q2p4
-            RUFtSmhnS0p5cTg1MGxZdFp6N1lHMzl5bXpBCi9GZzJCTmsyR2tUMk9tSHlRVkJq
-            WVB3UmN6QmtMQ0UrVXdxV244aHJhTDgKLS0tIGl5aXpNMlZvZTZNY1Z4R2tiRE9K
-            Z1lnWG41b3doRlI1OUdNN0luZm8xR0EKtd77RdED/58YtmlskKFU0hLW+T+jzepo
-            lrbd0qQTZw8XZPvV/ZGd2KwhZq/e6msszzNYkyFWe42Vzkf0FGegew==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmYzFHRVRmNzdlbmRhejFN
+            WjVBTXRhVmJDOXRWeWZtUFN2SENZU0JDRGpZCjI4akhUS05SaEZyU3lsUENQeTdM
+            S3VlSTU1ZTJiVkhERWtKNlBHZ05xWlEKLS0tIGI3REp4VEFnMVd6anBBZFZPWkta
+            RXJ0RUw4MEtvZ0w1dkN1d1h3Qng0TFEK5vqr/4e1uTxjVSI41YjkyTQbWddupcKG
+            VBmxMuw0l+R42paVBNkaeZS6at74Yyl/wYncZ5AEnmc4G36nNKQBsg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1c7y687sxh428wk34s8ws6kemu62mggafpt40rmanevgkuj5xa59q6f7tlc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLL1FVU0YxSktjYXBuQzdF
-            NUl1NmpqZEpHYlozQWxDaVRTck91TEEzSm5zCjBvMHNkUHByOERtVUh2N3FaVGhQ
-            WTBHZElvSzhacWZ5Y01KYmloTTlzTjgKLS0tIE1HWlhST0V2bWVaaHpRWEhJUURH
-            MWExc2JnMUlXQlhIVGh1dFhQeC9NWm8K67+U08LVAle48M8Nojbc8zAO5Jr8BKQg
-            XrGUXLGhBdDC0P8FAF3sTBJJbqUE3U4/sCnWrZ82ynfc/2FLZySo/A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBY0kra0hrZ3dzdjJTU3hr
+            aDNZYVVPNFpIZ0NXWDlaK2NrNDZRMXQvT1dnCnZpQkY0OHNaZG9UWEZyUit6V21r
+            elEvYit0UmVXQ04zektySFYyeUlPVWMKLS0tIGhTN29kZXpnK1R3N29YL0dzZzc2
+            RXdKWlFjUjllVTJrZ2N3L1hlZkE3NTAKB/NWeAOtZbFtB0BdArHnhqwP+D4JelQm
+            VIARZnxi/TieprbnEYKcv8y2IT2DWCICU0EpokYSMxAP9rpnBlZcmw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1elra3uklw8rmwkevqms2l4tsd06d5utqda9d2w4qvqpz898uzuesugxkhc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoMzFYa0xlZEpBVjZSRHpu
-            dVNPUG1pYk5ZdHJXelRYVzIrUUNkbS9ibVRBCldSbVpyOGVWOHBLVzdib0JqTVNj
-            T1B1SlpMZHlWU2I2YkNzN2dlY3NIN3cKLS0tIGYzaHZRSGN1N2o1SWdSWnNnL2Vr
-            TWpsTFpnVk1xalJDbTd2M3hERDh0aVEK6p5b89IxJRTs9rHdL4fG5SbRpgUVJMl1
-            uOy40tbzMEenvTb836iPKcdbl8FAUP7ayyD6D6DqbXCMLimLMvq2jQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiWGdlSVlxazFsS1ZpSWhq
+            ZFFmY2hwSWpDUUk3U0RUcUtTbzN6RzhzK1djCmxBRHJybEl6dzZJQ3ZOd1ZuWHls
+            WXl4M1ltb1NDN0lUUndmWVpPa1cwSEkKLS0tIGNMOHYrd0o2UWxCSmYreGZwK1ln
+            WXVEcFcxM2pWTEdJcG1NOUVrYUJOd0EK24SCC0BXjc4x47QlvLdNOz1LnurfIP5L
+            eieUM0cT1psKL8pHLYsAaRR/CWJgF5Bv4gXR0LFwSRugnLGUBnnqlQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-02-18T08:55:07Z"
-    mac: ENC[AES256_GCM,data:dJ1t7d33rP4EOSxwHstvNjDftyycFwNApdt0/K5UnTuTuQ2TFfuw4R9ISXxIi+3o7xS07yCOmLc06Vt9rGnueetuxmJ3JEAzcl6IjSmNfvWO1uwA2tJhLX+Pg3HHbW4W0Ae7TCdtODiuVUqDTSQywbPJ9fdBfUcol+ePutD17go=,iv:4HrjosbfQARzVv0PMmtdnDmscYjKEU45Lgn5DU6PHmk=,tag:2uEJC6b6VT/+CY4/hrDxwg==,type:str]
+        - recipient: age1z5ryq3pehydapv0s90ljak3yct3qwwtt43wjp9kv48q2235s252s6fq4kc
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBycWR5dWJURVQvY3dEaW5w
+            akIyTmNCR05iYUNhZkVGOGFLSmphUjZFL3k4CmpmeGZUQTJWdm9IbjdWM1JNQzV5
+            aUxBMUp4ekJFMGNEMG84bkVIaWt4UVEKLS0tIE95akM0aVhJZ0NlTHhwdlpwcW5Q
+            a1RYNy84R05BTHkycXdYTFFOdTNKaUUK7MrR3ZmV7eTKbSBtUoBaYHWmVnMwOA1o
+            +/EuiwkKx48EslpuxhYPmoETyhhw2f1jyCr0JSWjJMlZiumCj4MTZA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2023-03-27T16:02:55Z"
+    mac: ENC[AES256_GCM,data:zzuROqswcLzVo7QFAmwJ5za3M40xOt5Jfa9aLauXjFl5Pj+cu4bFrB1GqOGYrInp6djUtwBKYGcfqu2Bw5KDk+3iiYWVp/81RQliXyef3mMKIRF/3cSkGjo82vSnnfZHjVMmapic5phiyqhMYfhWBYRr9c3gK0rrw8ai9V5w608=,iv:d8ahcsfZFyeNDO24ZGX3gwOlwEoa7XpIscgEQFUJrC0=,tag:CIN7u7gRGEY1/8kHvIz5PA==,type:str]
    pgp:
-        - created_at: "2023-02-18T08:55:06Z"
+        - created_at: "2023-03-27T16:00:59Z"
          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DAAAAAAAAAAASAQdA1P6St51NySWFtm0iqq9ayNpGfRYRebMiuPCbIhAB6UMw
-            3LJSm5dMrY4uOIiRnT62Jgk9aBJVf1l5SO46AmXh89un2ODOjHtXDUmYW5Baz2gv
-            0l4BfC97MqPGrK39aj2qBDYDAGaNQfrvgXUQi4LgKqlBYNkn5M6RNlOKI9cyMD1w
-            PKHdLA2ebXiy1Xw4JuDAxWLvI2h9RWgmSXxcoMdOd6p7PwBDiDE2358dtmkQeRhw
-            =gd/o
+            hF4DAAAAAAAAAAASAQdALYQaKfS0Q03/fJ142bC5/iOTJ8ptTBAeD6nRdPyW2Sww
+            gh8tLWgoohymzDBjTDbOAF6BPFEdISUPKP5GXcpxvbVpOUYmiIEuVoNl889qqlBS
+            0l4Bjw/sWX6CtWTKFKJwCS0Ur2TDAsnhvpCeG9kVQCiw36wDgZiWOT3rcg/BCudg
+            K48m8a+Ysd6PQa5znrAL17TTe4f+l1VQeXlWM3iaYLGFRSvHk9S57Tk3CfqwyCEI
+            =f+vw
            -----END PGP MESSAGE-----
          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
    unencrypted_suffix: _unencrypted