mayushii: Init

.sops.yaml

@@ -4,6 +4,7 @@ keys:
   - &sayuri 17FEEBB45E4245330507C960653378F10CA6E00A
   - &vueko BB046D773F54739757553A053CB9B8EFD7FED749
   - &fuuko 2372651C56E22972C2D9F3F569C8187C9C43754E
+  - &mayushii 23EEDF49AAF1B41DCD1CD10F44A37FA8C15053B3
 creation_rules:
   - path_regex: machines/nunotaba/secrets\.yaml$
     key_groups:
@@ -25,6 +26,11 @@ creation_rules:
     - pgp:
       - *simon
       - *fuuko
+  - path_regex: machines/mayushii/secrets\.yaml$
+    key_groups:
+    - pgp:
+      - *simon
+      - *mayushii
   - path_regex: secrets\.yaml$
     key_groups:
     - pgp:
@@ -33,3 +39,4 @@ creation_rules:
       - *sayuri
       - *vueko
       - *fuuko
+      - *mayushii

keys/machines/mayushii.asc

@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsFNBAAAAAABEADjzT31zliBOnM3UALM6S3Oa5nEKHhwn6Dmi8uMABiDUJ0tF3Nw
+cM8X69FI4oCA9YxQFWn/J8o/h5TvDPfiBwnjE/kuNCnRVkrPxRDFZybxgMyHM/dM
+QjeZBqCexVa5IhugOrjnx/OWKaFhjLp4mTT/g+HhtvD15tandWxRhLBizKAnPQz9
+da1nj0i6YbyWP/E+3EGHxw3qHkjDbts7c1oB2N7cTNFtTfdI24G/aiuSmrURHECl
+bD9xokEui6ZYAtg6cXDsBlmZE1/9D/sUIdrYvspj5bW0XLZrPLNud10Nh7kumBPG
+uy5xqzD7cl6xCcw4phlveHtDnNhNMH7LUplGyMKBc+CEQHC2uiEQ76P6oRTYSHnq
+d2fRwzaynBKA00Bv7WH2mucA8fERyLxl/CuBvaswCu/XBWgr3Mi8s9E7p/vB7EUX
+DDhJWYDBfy8ONUyWAUxdOwitoiPuKWO04mORLKYOQXS+Z4dpHJc8QwYeZoPNIh0H
+yv8mb7U8MNO2DVPDsoDTvC3vtNo8lwEH5BL2zRruc4LMllSPtkLmWRgMz77LL+9W
+HYFBfl3URR3MxE0RBU3BMrDeMFHjbxB0kQJL7vYahl6wwTlE6F3KF/l5oyCsd3R8
+5oqh4gjkhwIlopXizO8kTqnPWeR51VgNvB+tj5o08sRanB54XREulhRsSwARAQAB
+zSlyb290IChJbXBvcnRlZCBmcm9tIFNTSCkgPHJvb3RAbG9jYWxob3N0PsLBYgQT
+AQgAFgUCAAAAAAkQRKN/qMFQU7MCGw8CGQEAAOAnEABGFmF4VKNUQoZYLbnANtHY
+r0VGrSiAYQdj+HVP7W3dd04PSbH6YWjpP7yzZLncjd/+zr1azG14D8UjCZdnelGG
+jlOLFZNMLwVHjz/quLSMKDgERLfxwDCZsjxnA0CvMvZbWo0VoAs/ncPClqYVjMGP
+Lq8O+JVJYNGj0jra/PvLGweVqupbfAuJ6KBLlna9iYJiv8uCTjoRF90/dCPIEEQY
+ZUQstHw5zfGs8cycTElfIv2XpPLmARJ+juyLLUvRQQFIif1o9VI4+MC9oFKS/Tku
+Osa/KF86z1nLRFRyqKZwgOmZUADKqpEdQwHgyqKCE6XCey089hwBrwnwy/opdXUR
+hnP28tc4MgUAEAJhBH3uHH4TQyUI5gUOST9MkmxqQLTNVV5IuK6KqO5XPxtczdCf
+LISNRLjzL3H/zCy9BuhnwDZsdAz0ae5NMjjXnVpFcuGW7kP7RsiGL5aZSAYfx08N
+mdq1EiK3e3EQAgeunLpGqlc0Os/fB937yuQoR3lYAug6bwa7RnElZMID+Xj1GsQb
+qY1xodRDM6DE2qyYlDV2f0WoFjG2f2VjN0IVI0AxiydlIfrrK7v5TR9/8gVuo2Vl
+D1/6pVotiCeUapXhf/ezEBRS1DhRXa0v9rpwzV1t91A+M30CGj2Cye0CQc6uDvno
+lJ/oTo6bAXwmWGmvvyCtTw==
+=S83g
+-----END PGP PUBLIC KEY BLOCK-----

machines/default.nix

@@ -35,4 +35,12 @@ in
     targetHost = "fuuko.home.sbruder.de";
     unlockOverV4 = false; # gets slaac ipv6 address from router
   };
+  mayushii = {
+    system = "x86_64-linux";
+    extraModules = [
+      #hardware.lenovo-thinkpad-p14s-amd-gen2
+      (import "${inputs.nixos-hardware}/lenovo/thinkpad/p14s/amd/gen2")
+      hardware.common-pc-ssd
+    ];
+  };
 }

machines/fuuko/services/prometheus.nix

@@ -72,6 +72,7 @@ in
         job_name = "node";
         static_configs = mkStaticTargets [
           "fuuko.vpn.sbruder.de:9100"
+          "mayushii.vpn.sbruder.de:9100"
           "nunotaba.vpn.sbruder.de:9100"
           "sayuri.vpn.sbruder.de:9100"
           "vueko.vpn.sbruder.de:9100"
@@ -140,7 +141,7 @@ in
             rules = map mkAlert [
               {
                 name = "InstanceDown";
-                expr = ''up{instance!~"(nunotaba|sayuri).vpn.sbruder.de:.*"} == 0'';
+                expr = ''up{instance!~"(nunotaba|sayuri|mayushii).vpn.sbruder.de:.*"} == 0'';
                 description = "Instance {{ $labels.instance }} of job {{ $labels.job }} has been down for more than 1 minutes.";
               }
               {

machines/mayushii/README.md

@@ -0,0 +1,22 @@
+# mayushii
+
+## Hardware
+
+ThinkPad P14s AMD Gen2 (≈ T14 AMD Gen2).
+
+ * [AMD Ryzen 7 PRO 5850U](https://www.amd.com/en/products/apu/amd-ryzen-7-pro-5850u) (= Ryzen 7 5800U + “PRO Management”)
+ * 32 GiB DDR4 3200 MHz non-ECC memory
+ * 1TB Lenovo? NVMe SSD
+ * 1920×1080 IPS 400nits screen
+ * Realtek RTL8852AE Wireless
+
+Often used docked to a ThinkPad USB-C Dock Gen2 (40AS),
+because paying 300€ for a mechanical dock is ridiculous.
+
+## Purpose
+
+It is my daily driver so it does everything (except server stuff obviously).
+
+## Name
+
+Mayuri Shiina is a student from *Steins;Gate*

machines/mayushii/configuration.nix

@@ -0,0 +1,40 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    ../../modules
+    ../../users/simon
+  ];
+
+  sbruder = {
+    games = {
+      enable = true;
+      performanceIndex = 8;
+    };
+    gui.enable = true;
+    media-proxy.enable = true;
+    mullvad.enable = true;
+    restic.system.enable = true;
+    unfree.allowSoftware = true;
+    wireguard.home.enable = true;
+  };
+
+  virtualisation.libvirtd = {
+    enable = true;
+    qemuPackage = pkgs.qemu_kvm;
+  };
+
+  services.tor = {
+    enable = true;
+    client.enable = true;
+  };
+  services.privoxy = {
+    enable = true;
+    enableTor = true;
+  };
+
+  networking.hostName = "mayushii";
+
+  system.stateVersion = "21.05";
+}

machines/mayushii/hardware-configuration.nix

@@ -0,0 +1,46 @@
+{ config, lib, modulesPath, ... }:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot = {
+    kernelModules = [ "kvm-amd" ];
+    loader = {
+      grub.enable = false;
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      availableKernelModules = [ "aesni_intel" "cryptd" "nvme" "sd_mod" "sdhci_pci" "usb_storage" "xhci_pci" ];
+      luks.devices = {
+        root = {
+          name = "root";
+          device = "/dev/disk/by-uuid/16d97095-34d2-4422-819c-d1ddc9c3ce1e";
+          preLVM = true;
+          allowDiscards = true;
+        };
+      };
+    };
+  };
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/cd7ed921-4b59-4de4-b39e-9679571ce034";
+      fsType = "btrfs";
+      options = [ "discard=async" "noatime" "compress=zstd" ];
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/861A-D1A2";
+      fsType = "vfat";
+    };
+  };
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
+
+  # Most of the time I want to use both screens at the same time and suspend it
+  # regularily by closing the lid
+  services.logind.lidSwitchDocked = config.services.logind.lidSwitch;
+}

machines/mayushii/secrets.yaml

@@ -0,0 +1,52 @@
+wg-home-private-key: ENC[AES256_GCM,data:ZPPEuIOKCAEv6uN3ZmQpf1SfaQdzUORYBv6u91/rm9g/nxHww6b3umL8eDc=,iv:wtIEEbs6RbINbouW/qc/T1lm4s+5+n27co2AKu2IfTs=,tag:QOpNmYWGYD10DQJtKqIAzw==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2021-10-05T18:14:40Z"
+    mac: ENC[AES256_GCM,data:Uck/kX7BE3gqpMD8wgsksEX3DKzNSUinSRAPqpafH5UbVfQLYVOD637j7wltrtcHSOLjqGSrSbf6jhql/Ve3yTthYB72cHKcJ1UOk5cTD9xCpUJCx56Eid0yj9UZpifIM3PLRjnqqZFF2TYa/s8HcmsY4uvcN+U5dyXYpS6XYMU=,iv:2mhjUTxjU9xH0wFS0ZbgQ3GYRL+8BQboeQuVBpAQvsI=,tag:ZhAKuPo6iPE8890tkxHdaw==,type:str]
+    pgp:
+        - created_at: "2021-10-05T18:14:16Z"
+          enc: |
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMAwDgSONkM+d4ARAAvcpLQ4pl2zWfpNnyoi5Vu7Ok6kiQF2UveJQkxkvgQom0
+            TtvlazVEy7kBebM9sgYz9NtcWlTFTMCXC04gpJz9fGYAyssnZ9+D7J/yekK6vyEY
+            5vY9Dd6FX9HGOQuG3wAwBr98AgNHB76Rt31LBSUjIzNZj6RdsbakM2GRIRocFB9V
+            mykpRozkE1ju9l+E3NqnBm65AhjEX9q8W48oyrZLd0lFlfo3Lseda3AlGIMz+PV+
+            MNZ9jTERJZQStpeenE2u2+cS+tMJZbXGk0QBY3+Clz7fTOBlA30ePiWefy1ix3XG
+            mIm5WM12GP5cCpLc1mwAJvyNi/kTw4Myfy0+xth9j65nZCOl2xLIAGqgfikcmQoc
+            /NKs/ijpTwSaqbh3o2vmlmYoif7UkVDxoz/cQKoh9Boa0br7eEI6beKwL2bvDcn9
+            KBNYBeHftt08+sPrg8hSLGjVSpcES9IH6u1WHUWnQYH9ykN9b2VcFeMVUjjYsyWd
+            AwO+quTMF0dfo6es6t21/whzE5TrYZQGSAZzaGASPbzk9MKWQ92hJxICPyyFuZFq
+            NOdWZWRQfYS2Ia9HXqdzcEIiLtLBm4gZ6sZQ/vkv3bBKFcq1rZ2UqfJhsaL9eOsw
+            QiSOoiVpjOAq6SXLF6yQnTmPZczQV02XSvwtNjBSD3yXAIMsXt5JyIW4bCcEIJvS
+            XgESvf5cIkUUA/zmoSmiKFNhHDO7X7b9xMPAE4BqnJqFRL5iBkY9Wkwlv+DFOCDw
+            0W6U4V5dFtnGYMudnjQMp0qtsHeDkfhj/IQGAY7RuBaag7HnmBPAzWnYmgE7DW0=
+            =Fru9
+            -----END PGP MESSAGE-----
+          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
+        - created_at: "2021-10-05T18:14:16Z"
+          enc: |
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA0Sjf6jBUFOzAQ/5AbFqOiaNS2Wy5al/H0AVNbpPNPHYYYUaAiDYitdwNgur
+            oChxTYVP+h1UVwNhy+5e1XnLpEwJNcLrzfeQgxr21CqBcaSbOzEE7G9/COX0TD7z
+            pyEP5aup2TmCx8Gzc7Ugjbfiksg1m6EhoZV1k1bsuh5mrFMQqhnhI/xQr0Kehl9E
+            dggOw6IGfu7rZ77U++AHF4b22ZqR2LuRdhpHAvC4H7qlCXIiRlV2qQBT7ArnaOG5
+            7b9WxPI+PjJUNdm/O3rv/ooAtdYz+mvsoZJIMuS0ruxKNGGO0SInxY16QFECKixY
+            n7/q5OmlNTVr4i9++JPSAu0enQsqOscSZm7TctiGF0ekHEn+axRsrMBi8pqEzu08
+            nHb4HXmf/jkdlYjg/K34I4mec9jy1L7a11y6lfsAab1FnabbKJjgm3jrBMMoM/Fj
+            hEH7CWpAAvG0+rwJ9EmuVjq1gGbi6Q8mBpmX0g6/hfSao/YWOhXMi8tDmRNeVWpa
+            eBYhRto2SRB0MhLbOeZyC3UkDASDBIsNgmFz9JTbwLh/opv6anqE7O2sLmKIuXDA
+            IfLJk+ahm05Fdv3AfbPsWGevo1OzxSOxRYn5cDEuF22rcZNDOuRylLJIkkxF9OzN
+            XpsgV7aoSYFgG84u1qa59dE+rvKlhSi8xLQm2mZTRB6L6sDZw/gQ0H4AeXCZC1XS
+            UAF7lyInB6tXrEoNCCIdON9JSrBmSyARMGLoPOX6YqvPV2MQ4OEWf7BZ+SPRgbuI
+            ZFQLv6hk0fYb0fb8xHarmI8krq7k9dsqYxBZI5DjVaPz
+            =7LEL
+            -----END PGP MESSAGE-----
+          fp: 23EEDF49AAF1B41DCD1CD10F44A37FA8C15053B3
+    unencrypted_suffix: _unencrypted
+    version: 3.7.1

modules/pubkeys.nix

@@ -10,6 +10,7 @@ in
       default = {
         "simon@nunotaba" = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwMo0mYcTU1Y4BKpEUsvKAtcTPq3ylKaw+ZjUxNg9VqU5gDy2TDUfWk2FjM2VYcqQJ9ZaNGKE1S18fRU7ZHrcgtFPMgAuji87yOKojH74cwz9ZRf5ZiluWBmR3dFd7kddqHUKVS8utpiQuTLIyQwpgmUHA81IasWXuB2pHaI6HGntMlJTm1CvpcQvwKsDBqJ2bFjFMk6EDgAZWXyooQgthYAfmc+YfAX5T9fWKiqFnEJ0ryN3/RngJZe65HWV8WZwY1CxgKQhOZuRcPdkTEQlUk9Qu0JbVa2sTgdYDpw/Dz0ma+h4rxOrH63MD6Cf0pFgOwLeZVSmXqKTjXVaH1QkHWRat88J8Q6MM6LlhLx/48VcQshhIssAZ37YoW2W0NxnGSM7YtlwTVe+w7rU//cS5TyIQa4joq2pnIh4uurbNkIULa4Q2t2nEMzlqI9gEE9DK1ctOcuCyFOerNZD0yRZ5Rs8WouDLL1PR6ps4czK2N7h2MXABcELuVwX+sdxwFgf6AJaRvrlw4qIOohpeX48FhzZfcI9Cqvnakm+O42J3qXuUDVc6/NjE9zBku3dNaeseGv9CQxtvyVDq6o9MRDiFror3yEiN0Fwou7CXBfXrbeb7MvahsRxSKkSDY0uA+AXmsm1UwdArjEcEMsS1JeFQCdX1yR/Z5xzj2gx60NcR4w==";
         "simon@sayuri" = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1kQUoPII8A9/bgPA+OrZGQLPA8MxkdmPSCCsfGMh9qRZfF7BSD8W6VdE/28tLw+39QeUl1+/9VuVvGjZBP1zBAbKIcKx4DjtgxpNXCsfWMjXFtpTGk2dyl71CaY5n72YlADxXYwtEvuwfNixgE2yTCefMbBsfwqYC0GZGiDlFtjxdg+RuUC8jU++C+WFUFct9gj9ieQ0LWjud+Oh0AF0JhyGnou+wVZIIO8mwo7Cc5xiPldXhbc13XiNC3mpNGCLFj+nh1feazk8TeAVDBps6xaDkOd+hDwTBQh8LoimePK7MiShzLvC38Vd/sim5ym/IqY634CjqBDGCMp1KXnqHUTT8CqeifMv10+aRJKUPevVkO3nEE3VoSPt7Ui9ZzLnL4qhZyygoBau+PvD2WCWm+gRwBkvU1uNrYKi4HIGhB/gXcYHKJimqJwLMyqG5Wv1jfuhn3ZZN+uNqTgdAznGgPRU1Q/Mx6nMEDiQip78qdYEc0YGwdb/TldEL6aHRjuNuZPpTW+zakQHiQTRb/0VdZT1bAwyT9yL0Uf40h706Kh/pKiSQ1yq1dlSdl3RlfedbqLqGjspds1iRSrSXyH2MBghPbz/SF7Vt4LW/tXF0rcyV7CU98ZvxJDWeN60OE0vPf/AT5udYyfPO1691y0F8jGKxGYYPg9R/Y5o7J24PbQ==";
+        "simon@mayushii" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJ7qUGZUjiDhQ6Se+aXr9DbgRTG2tx69owqVMkd2bna";
       };
     };
     trustedNames = lib.mkOption {
@@ -18,6 +19,7 @@ in
       default = [
         "simon@nunotaba"
         "simon@sayuri"
+        "simon@mayushii"
       ];
     };
     trustedKeys = lib.mkOption {

modules/wireguard/home.nix

@@ -22,6 +22,11 @@ let
       publicKey = "VXic8mhaJBSl6yFkx0Cu6JI8tqqjjM3UbW7x+05pV0M=";
       public = true;
     };
+    mayushii = {
+      address = "10.80.0.9";
+      publicKey = "nnLdgywXmDg8HWH6I0G28Z2zb4OmmyFDpnvvEBzKJTg=";
+      public = false;
+    };
   };
 
   cfg = config.sbruder.wireguard.home;

secrets.yaml

@@ -1,116 +1,137 @@
-binary-cache-secret-key: ENC[AES256_GCM,data:HIx+SJzTeWIOD89xXGHDgVerDLFO0t6/S8E+QTVPtet5SUxiJLs8X+6/FZfm5WiILU6utecSV6+vpDap/yKcuin63OhXeUWbpD3pnOMtIElfs3tR1EUkJ3tiOJFVsThqi9JDNySGlq36ch2MTSfPdQ==,iv:jwwTaktWMPWFnCN3Ur84cgUm1kNZqzEEbyfZ7dIysWA=,tag:qDDpMJDYM8WUTqlJWOzaVg==,type:str]
+binary-cache-secret-key: ENC[AES256_GCM,data:EHBLyOPY0WYrJLfdML3c1ZqXLknWTKmx1nmxpSzOeyR2vKOlu50Xjldnoyff/BwIAB1E16rJuuHtMb5PRXfL57AvLBAprg5RzqIzJqnCKl/EIk2bJ3NoD9t2aw48M9R4nk3ixXGYJztdoIz+G0/gnQ==,iv:jwwTaktWMPWFnCN3Ur84cgUm1kNZqzEEbyfZ7dIysWA=,tag:ky4fYddxwVpB4+8NzlmLWg==,type:str]
-nix-netrc: ENC[AES256_GCM,data:vOcauP7BpcWriA6Q+UO8apdc+zfJej8OQswnaDEfIf2Gi3IbrNaeusGVwtzvRC5DI/Mqdjzmg0+SYvket0X7HSLzAFbML3YDl28btutzby1jpkTKWnJL0Gq3GDG0DgOqzbemQGJDtejI7pTPo6NLtMlmvA==,iv:sISKlZx+pMU7LnaT1ZC6tZo8ITYXpgLwYPpkoG51zks=,tag:u0h9l85CxEi6awwRdFXkog==,type:str]
+nix-netrc: ENC[AES256_GCM,data:F0vHeSsDDcaE5qAt7mNV0Az7NBdGjXfvn3v82R43bHhUJIH5lbbCUWQSyhDgA9aQ+NYACAhJCPAh7aWBzoimyfTSqZlSVglgZ3mkUT41BSanJYWTTyI6bW4YUsF+J4netFljsE15cn3+twZmNgtkTuzTEg==,iv:sISKlZx+pMU7LnaT1ZC6tZo8ITYXpgLwYPpkoG51zks=,tag:ZP7YN7Q2wVYpdV0huO+qeA==,type:str]
-media-proxy-auth: ENC[AES256_GCM,data:KaYd8TCMVlHbgoj1QQfRwTXAK2hJUDr0UJqhTXvILylyR+mdJy7smn5EtFdNNFWZk6eJituvGG7naT2/UiNoYne4ljlJhu/IuObTLY5AI9ELDtYBDQ==,iv:qo6SOaHrWsXfvRwgSKDTSnreOcO9xy3RKrfE2k+VLEg=,tag:SND1zp2Cd2gqQdOVWw2eWw==,type:str]
+media-proxy-auth: ENC[AES256_GCM,data:OcmYZq/tyzMB61NfyYZ8gAlEE+8w2IhlPlZ+dfedtfqVlPHk3iJsd9mvsXHf5ODTtuy00ll0MF4KYNePZkz7TeuaIdBgGlshFyE4gwsJdPXZNYnhcg==,iv:qo6SOaHrWsXfvRwgSKDTSnreOcO9xy3RKrfE2k+VLEg=,tag:14DT86PQdEuK9zyZzcAohA==,type:str]
-torrent-proxy-auth: ENC[AES256_GCM,data:9XuDRdUjOClPuZFvI7VwYQdbegzg400zfmFmE3qt5kTo6bD7m74V9F3b73aUueqMQ+80PxBc1KusTTlPYy2LAf6mT4PQ2TpqSu0kBXAezfL4e5fxdQ==,iv:26d+hQ9yn5CzDGNZvi9A5bvzgo87IrJHz67xTac4UA4=,tag:5FtjmtIY1gSixu/9UZhBVA==,type:str]
+torrent-proxy-auth: ENC[AES256_GCM,data:4oi4uZCgslTvmso1SCedu3gKsOTCtYIAf3g1mBS6/ta3d/hd6GJ0Ns+/9w51WrhcyJQRLSR7jLlzxRzKFp6JvKXlNAeflXDqOKNfk0LXY1GKTZynOA==,iv:26d+hQ9yn5CzDGNZvi9A5bvzgo87IrJHz67xTac4UA4=,tag:e8fO5Xpu7wpDiSC4CBsaaQ==,type:str]
-restic-s3: ENC[AES256_GCM,data:lRcwoChzSX+ICXyafAtBGjkBTBdzL5v/imUL2yHtApMOe+MkP5CjXr47WoWGt17tdLPVRQ9v7/6jcagTKIk3IfjmhRhMip3CMyPkio62uDxArlaKpi9GoZNQOCt+XHWlpiBJ609H,iv:yrp2QZLXJypWh5XjsAHcpiXEPUcYF8A+mQZ+W2w7zpU=,tag:Xis3NQ2KNQqG+Rmgzpy3Tg==,type:str]
+restic-s3: ENC[AES256_GCM,data:RXRvwIwR7EqZSKxoqSYhGIWGH3GEBagPYCdwkRh0CDSTTRHQYN280gpgQA7ef2NkWnkrwQK4FCwCu2CBaPSMO0X6OcSVNJsmBySDQqZAb8SCs6pOSn2J+kHP2n8K9Fgy9/7OeX2i,iv:yrp2QZLXJypWh5XjsAHcpiXEPUcYF8A+mQZ+W2w7zpU=,tag:XhktIlDqXeq/tLMPZpQuLA==,type:str]
-restic-password: ENC[AES256_GCM,data:Bi/WJAVECgBegIZMV/MZN8kvHyxsh/xERAnZ6TQ1OIOkffqkWBwx6DCS1cVJ0Nzz,iv:8/WPCuGfLkd0LkLTEr7pjpT8kb/P64VICppDeEcKDIE=,tag:JLgYEekrZG91AapztOYBTw==,type:str]
+restic-password: ENC[AES256_GCM,data:nzbUoZgK+XP99/hPlIBm83hIDqRWlmNNNHwq0TXE9cQGTJyEmLfB6qlUdEtateG3,iv:8/WPCuGfLkd0LkLTEr7pjpT8kb/P64VICppDeEcKDIE=,tag:eytBikegC2fzCtUFh84qIw==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
-    lastmodified: '2021-04-08T14:05:22Z'
+    age: []
-    mac: ENC[AES256_GCM,data:jCe1m/OqWyAWBYXSqk2oHmNkVuMTGVzjBzzD6o2fbo2YmoloUqsYDuGbpThlTxKIl9nL/5UJjKVJ2QMHFrB3+vvg0KH4LxoR9aFtCXFtIbeJcv77x1MT9s+8mrib75B4JulqMhSmnzqQ6bXA8l7tIUhg2ezaGZsT4Q/V1E72aJQ=,iv:hdB4MmgBGUN7HwUMv2Wn7qZ6C5HlBlOjRniJ9qV420s=,tag:dP0FAOf1A9u1H/l0L1ejcA==,type:str]
+    lastmodified: "2021-10-05T18:29:56Z"
+    mac: ENC[AES256_GCM,data:6hU8rMnWDGopyG+SkkWcevXliR80EVnxiEJ+lZyZ7yMwuJhozenBWr89VIzEoPnFhsHcfOpFIa30OkfxMD+xLhHEt7ZQfcJRa7WuzsvU1br6OKtaSdjqbkemgTBhj4zvsUPbGmIELEkkUxYSJsr6n9wAfhpBDTPdeqYNqznjcDc=,iv:NFD8F+TTkhr2b76ziYzLkYpYgBJ7ur4E7Fvmb19Xh0Q=,tag:dobYJK5UU5yF5k00J2V9Nw==,type:str]
     pgp:
-    -   created_at: '2021-04-10T09:53:42Z'
+        - created_at: "2021-04-10T09:53:42Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            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
+            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
-            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
+            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
-            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
+            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
-            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
+            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
-            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
+            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
-            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
+            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
-            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
+            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
-            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
+            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
-            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
+            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
-            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
+            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
-            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
+            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
-            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
+            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
-            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
+            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
-            =AbGk
+            =7XRt
             -----END PGP MESSAGE-----
           fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-    -   created_at: '2021-04-10T09:53:42Z'
+        - created_at: "2021-04-10T09:53:42Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA0PuGXQ/rB1cAQ//YszodytasjytlTAVLJgK52e3NG4xQBYVhoFvjNQcu1R+
+            hQIMA0PuGXQ/rB1cAQ/7BvMx94TdQXvfaIguEJR0JuQEe71rZYrp3RmXfdHDCLjj
-            H7gSXVLaviUVC2NHl8oz2KeIP6ivT89RmhXwnKekkAhIkcrKMzBlga1R6SJfZYNS
+            d4lXsIXY92uETyKZLVwSKtqlf4O1IawjQYDuAW0+TbfFqyqWQ658wCkOb3uHtzTd
-            1jEo1YJYnzZgHUdzjSLtciCOVQ82zacFUit/17pBTtBAxrXdWc+Yyj/gnm51rVOv
+            U+0zZM10dmZHhUH+nu0SIbeke+9h+Ck3tmW5yZwCjCZusiiKOTv/h56asqZaFq5E
-            syPOYiff028qaWbWDCkjT490JTyaGdw/+brHbqvfceywqec7yeNqg5BSJztimkMg
+            MtXq7dCGGXXmsDWbpsMpzjMl2vRzuYj2CGn4ZgOBKgZLa4inVgcpOON913SHI5QY
-            fW7tXKBfaxD9ekTk0XcmEW+GH+mwvm/jE/2FYtIKW7nYFGcfd3SGI6IAbWBcI+cY
+            ryc1RbEZX8PuP8pLXrtbI/dcBbWXvf+A/5jVamH/bl8VliS0rizWwFg1QQJK0W9I
-            HEM0JocSTz5TNDf50oYlz4mCRLekBhstEDXfbAooji6jdt2VC7I6xc1LWhPrcBpc
+            QyEw2MUGUTPmXCvBGpxqviflKx1hDpJUKsFDiQ5Euj8gXxt6ElsWuq8rx8UYExLM
-            cAKSlk/jVt5Dey3XnrwNc8mv12nhvioDna7yRncFMTBLEQXP8DY6FSknaIyyM3UY
+            qFwDGuwMVuKi4owQTgfWFdGuGRY9D48eKN0KdQxCX+stfJf1Wc7tfgHWypAV/LvZ
-            OZAbgRNbseF/dbrehSMz3mbzADlcXpPRKWhvY6FF9NMOAe2wuV4Kc+1aWkRvZSIq
+            TeHVy6Oyf18mH+GhEJdUyvMH2wmUA34zj38JgamMifXnq4UwXAnDq17fE0lS+iMC
-            2KyJy9Viok7r8RlGgEtMThp4px8LBUWbKe7H5QKdUsTO9FgcDJZmvR1CF+O5DQeG
+            eptlgCzvkxKNQpoQMxqTYnXYbxaco/EJNY7QHtqm1cLKVwpSbQc0yp8moW7wTSkr
-            eudTaIdKDWI1Ot6NBGJuV+ncG82WSLdMkfrBAA2I/4Xt6KiL9lN7Sa12PmhyXzVo
+            nE+m8hBktSVJU1TYBuBJ6LnEzWe44ERVC6rRodIUm7n90whqgW1jU1bQoY8X2AJx
-            51DZpJ8pWS2XP+FOUgVonrQhQbz395bemupCNuWSmqNhH6EPVUpKHXz8YP+IlZXS
+            o0+W/jzDEqVdC7yswvTC/xCEAwseKSlL5nHrCcmluzFat5AHRs+wz3SZYttEbF7S
-            TgFtAExA8MpC+CMpElsQqKbnIBfOYnWKQcBrVlS7KX6L7giWbKMakf7rOQ55OKzs
+            UAE893jHQQWdgr/2LMwxEzX41FuvBATjDe8ZQQKrTkP7clRHCeo4Hr8wU3MjRiz5
-            iIW/GKMpesljONfcljrUQtPM1pP7DKXXf5a3dtlAzg==
+            XwsuQoyi+WB1eNV1vyissa7Sbw7bwyCsW31lVKK3AFxt
-            =K5Vy
+            =zkg2
             -----END PGP MESSAGE-----
           fp: 8C5091AEA213FB0642BD46F943EE19743FAC1D5C
-    -   created_at: '2021-04-10T09:53:42Z'
+        - created_at: "2021-04-10T09:53:42Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA2UzePEMpuAKAQ//SQU8W1ExhOzlPbosLuVYYF6tUHFullxOID5kdfiRg8dP
+            hQIMA2UzePEMpuAKAQ//X7kvRMuXk1rre/9FEgSV6rQ8/t1Q5YT3SKLexj+73emp
-            lHXyYA0IVWn+cU+/wYz1+oRj59X35TugVXacp5MRleWS9uKJLL3jDbTGxFcf33Ls
+            drb8mW93oreUjkGEzkVZ+dSX0NR+5Lz9NJ+/Wpg1UqM//wbpCSoldPhcYInPd3W6
-            2JjWcOBAm+BqgBBm4eO025vHBT35zxG2NVG5oR9BFGrMpkkDu8PuY027BWkUkAvl
+            rS9vaiLNL6UTTu+5u22hP9Gg1jjKAcakSLLbZzEcXzUbBR4AZQQnKtKHYNsSY0c6
-            WCC6T37c047H1rlpK3TD8Qa2CQilJdUA8+4QqJgz3UjnCe+83neIPJpUSuyc20z1
+            h0df8hhAGGqGqDUi2CpRvDyXCPM5RhPLbelZ19d3AL4NYEP7qw/QkK39iTur9UHw
-            8E1GX+6u54wt80jv0ODlrIdnjMRYGhYItkbGaesEAegktA1lVup9XJeI5PtZMgT7
+            xcZ/nUEV+1j67+xmS2nY3iVXh3jc0Xs0UdKePHxYUZ2kpBqDp0Kid/ffVfX8k3L7
-            wMjZv93md01Yi301C2RiBoS6RyM2LDc3Wn4KkjRighGE8UMNp4j4sWVzcyjLWOsX
+            tjsFzmC0JW9Dtax3gekA1FkMQBirVnAbuHsCT2d3UXDPjlo2lchNCTq659/bAnvf
-            tKoqsa7YJc+dCem/QEg6kHpTNXrjZrXF3m3v7b95eLdOuQpdPbl2DYgOeIHB4YT5
+            rAxD7IiTS5Fbs6/zjl6LLb511elYQexj4Hqc+D9vhtud3QFdPiGeiD+GfGHKBGh9
-            QHDmnSIQpn7+moo9lPk3ilO889YQ2qXQHejOy78TN4Pm/Fo2WSKezag5Q2859SoX
+            xkVeg29+F1WVb4VUnJoX4fMNSNspGHxq8fjtkFdRz+wGtrBBKsAjlPADrNDzhyX2
-            X1DdmjQyozaxxiOYq9FPjKDa2TCNVnL5BOKYPr04O874lNylnHTF6/DuGoo1w8uU
+            HIcZM+/XW3xyU91Yawtk9UWR/t13LSmSxly8IXLehSaPD7XDYW5BUfMI3tmt9htH
-            QujAhTT262LkzB29eNnKyMbUz5egeJmt80zTN8sJEFqKUcDWuX7lvs2ZCWfhd6bC
+            1mM+uxv+hxH8EfQQa0EwS3VaFeiEUAiIsWi8JsKnIBxrcZ+Ke/Cu7ysANln03Pgz
-            aIk5EMuUIJwPq7lOu7Fy2MpOimAQgTB1uaKSV/LLPogRdfF/9AF01EDDlZZfvpzS
+            gfDmpAUsxOG9tk+ql6yNe8tnuvcLtioE1qPOAg5r21wztvhT77JFMbftInP8KdfS
-            TgHntRQa7pVuWIZA2PdW2gkBAz/vu/4yx55S4tfKeaPj0MGU+woDvofZDu4EcSdZ
+            UAFUlof2OK0VaOa53mIwX3V241HheSj8qP2QkZ/tt+y8CN/H3zglVfL+TbgiFJ19
-            /LT3ntbNtfNe/aoj1dzL8vhRi3SX9xyk2zLN3mik3Q==
+            TirCqTGzUfph2WnqIzMNbyzFxWW72kFWL9kDZrHuPBGf
-            =fWXf
+            =xH2J
             -----END PGP MESSAGE-----
           fp: 17FEEBB45E4245330507C960653378F10CA6E00A
-    -   created_at: '2021-04-10T09:53:42Z'
+        - created_at: "2021-04-10T09:53:42Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMAzy5uO/X/tdJAQ//VqLu4h/lD+orkYtjVLWU8fiH1OtEi0NsYtD/AqQ7jlC0
+            hQIMAzy5uO/X/tdJAQ//Zkd0RABLC5TQWvJiDSu0kxFXPbrYa4iQ2mC75+icK4qb
-            EfYhAJezkSaZWjY6gtS/W1XBV9+ZBnINICHs2x75PL8m/ubsijK3kzAIQJIeY74z
+            MoqkDKSozOph5GUg0T4ULNWpmzSJlHruTwrsuNGelbfyjMo5BwrTKwMtcx3u1Y4g
-            u7zDtJebN09CbIMlgfQwgoyI26iXZzpZlj2ZYxV0DSYzSwmp/tms4qnrk9My/3EJ
+            JVbNSEFnri8sLhyBZBfvr2CSlnb28qjcEUlGl72Oz7NnyaqGRJ5p2Uvhtg17BMfu
-            BSJPkN5g9sVpO0vX9byuTvFTKUw4w4wSbSHGDDKLSjnM7clexv/uGX1Sl/kkJLwU
+            L+jhgm30ZlEcTsfH7UbY+OEZ0pfAsyAho6BTB7pxERkhsMhMjXI4GlQCCFbu1d/C
-            QDs8yR7+SFtoEmNrnc3t2NFpOEjUaIL8sL5Q7nyw0wFh8dlCH9E4sxYqSyH6C2HI
+            AAb1nRzawMECfmPh8RnYtf5VK6SCAegq4K4R8UWsuQRJSG7dcY8Ift4GBLh0LLd2
-            AmDaskRB5YDG4tkGGssdO63OTkq3Js+7yq1rNgV2+OrCa26OG6Y3SBaY2Js5rWtJ
+            1bJ6gMyl/yFvLqpEi0attLnMV1vZ0u2YSB7zCCQanq+ewlNcpEkR68z+Q/S5Q3zM
-            3fcNuuOxVt1pgLqp0GdLP/W7H0igHsoafqeqM3W0OliouMDOEFhDczkW+x9oEZ0A
+            xXOhqi7886r8/0EOabWzPDkXj/Qu8OFYFp5Ug/6e6mdfhqgCyyOHB6gIQdM3ZDct
-            9UKP/PPZodQItUlTaO49JUsQBNPjYhOAqV88INp3j/li6dFCNW5qwmhZsXDn5FVo
+            2x12BjFL337qdRVihQxFF2YitcROclnWFtn30R/i/HokGKCxjtFkI0T/r5BhWpEU
-            tXVaazk/BdCD0CgIHKol2X80h0UyiI5B+Aupv6bLHrqS15b6+nCD2Ryq64uHeOjY
+            /VVeKgP016JlCX9bs7gcOUJaYQXNdOEDeFZwEdiZghPhUT0fmZHp5wrTz6koqQvO
-            dAM2oixv1r1B6zP4LtjorB/cJAfqjNAqV23PQM3kH4EqzVcRb7qVm/RI6ONs94hO
+            HuLX+lAynvHqvKNPOvGMLp+ynKdx9DhTu79AETFLLJUj9uOfTuowUbUcIXdgOQY2
-            ggZpVRl7vxNUXgcFBGAn7yBdXROyFsDOZVFNCx9a8B/6glfcEouK0O2r7y31sEDS
+            oT2PMg2WWyjH7BZK4/jra7VMSCpw8M8iySMBTVrNHge9iJbRcGeYIwaZeqU5LB7S
-            TgF5BaI4EqHxgxJdO4RrzqCLXGZukLg62Ss5kz/QhrG2mIf7SC57MQUsLn3fPLBn
+            UAFzP9B1JJtjId9Thz+pMDigTENImWp5WbyyM64c3cgPtrIZ03o1VC0z51olEXIL
-            l2nEVDoUPQJWCoGjjpfx+hN5vaT8/57sK5WqEnNvwg==
+            dvPwqySmsZyUMC/z86wzHRg0zi498hQ+aqAduMkxxCnf
-            =wusq
+            =3EfM
             -----END PGP MESSAGE-----
           fp: BB046D773F54739757553A053CB9B8EFD7FED749
-    -   created_at: '2021-04-10T09:53:42Z'
+        - created_at: "2021-04-10T09:53:42Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA2nIGHycQ3VOAQ/9Euuu6Mh7tD1sc6/it+8gl+CF/BgLv8fNDyECim2VU4Mp
+            hQIMA2nIGHycQ3VOAQ/6A8GlAzgAvhk/WTMmeJos4NLvcY81gg/r3eMFN9ejZwuh
-            xU2DczCCGutKqKjB9oZHid28IiaYFN3rY5y1yoiDPiYvE8oRVADu0Me6jOl2hz1a
+            t5Vk2RuvkhiOjzrwixXMjN9swf3luFEtPUj3qkkIQhhMPqnu4K76JG3MmZzNNw8J
-            DP8TOilKsTa0CSVn1tgqdIF21UHH5eb4fal8IXcven23Yb/Zo5WFk3eVZv3pId6t
+            mMZz1x5xEqWzeyWhqLjZ7Tb6dI8Yh7bAFpf/nq8Jvo26MA7zF/sP8VKw47juXPhj
-            kCrqk2l5gsCa5MuzLgM9tKOr97HVY1fdd6xg6LHqwsYpIG4OwLkgsYVPJGsKG+C5
+            uS5DKTH71RBp9HNefphdmJv/VYnRhLerWgj/bN6z1X3CoY1t1YdCNsvloOi9pPvz
-            B9m5HGNO1r+Qbeq0V2Ct/n/cx/Ttk4QU79AhGoX9VnwObFVubQzFLapCzOnn88mU
+            Epi1tKCLqSQ0eMK3rnI7yOfOaRxVszB41GJ/MXQ3Cz2KBMa8rEvfzxNWgXAL5f9r
-            k65MP0590n2Bnvw9nmxCAEr4cmdCA/1ykWG1JHMZnG/c/FpJ3S61sEgmUPongdXm
+            ksm6RtELB1OOIXBatg8kFUwY+NnUKvd9Bapzl4N6x63E+WXKyJyM5h1KqY8jvYNE
-            McL+bpHfMZw3sLeEnx37rDHimANkMZ1VvDl2TZs0/1S/dpEDhA7ft6/Ovx6JzWhj
+            3knY04g5M4YGUo+Y0lNGAjbbAYC07OOh8q574vWqV9nRUDTf+OpvmnPvyS6VhD17
-            A6kjDxvtHi4TIWfiYrM8UqiXbEr9qUtHZ3lphAYKUAkNFCzMpEjfp8EJ3NRVUbK4
+            NIQV5zOytvCY5SghsAtBhzUBf4jOazxK27Hf5q5530+tfEn7+nxb6GAg+/WYe3g8
-            gCBqIEhjGfpLfYDVfA8mPmIuQJE8Bu5TQEPsAySfM8TS0jNNeWCq1oM7ILW6I9jo
+            DFCgslGebaLzwH6yCL1IDe6yx4pobyPLNku1jCka/6qXIjF1hnMpoMX2wiKKZGnY
-            r3CAud5rf5RrVWY0GhQtJ1jRyEbYJMVKzgF7aak46moSO/PwjI/k0URWhvlO7KNA
+            DtuCXOUFl0k2t8YvfABNbyuBDfrJka7BH8vEbpwDPzWW9y4IsSQHxNrkFZl1OuS1
-            35HBiouBqcXEorYeOQLwZjg6FDzX+2VlaBKShcokgzgMwXflvsF7R0TDKL1A6bDS
+            ICwSCymhD7TCGWo8u27SugeRuLGPOwN4xu+o9kRBfdip68fBDKyyWwflbpMc90bS
-            TgEr6XEguo81Xh4Ah4gwVvNtIF1R0VkyH0wMVFv3243PvjRTSFZyBfwnf5KFNqkC
+            UAHzWSz+bbuo5HuSYfartrhbeRIzSCqv9DeKEbMR4a+0hUBksO5BEiN7/yuGNEAK
-            wAdhHWI4861DYOfnEvzkXD37PR87R8hoERZECYGJdw==
+            WLZ39VlQWNO6Sk35TFpKb5PGRNiF6CglDKPgMZ01t4H4
-            =N6wA
+            =Cmy7
             -----END PGP MESSAGE-----
           fp: 2372651C56E22972C2D9F3F569C8187C9C43754E
+        - created_at: "2021-10-05T18:29:56Z"
+          enc: |
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA0Sjf6jBUFOzARAAsCXr2zM1CNKojRcUlBHTSm7e2TszwbGkkt3r6PJBysIc
+            Ok/llzi5rNaTh+N0Ot9fuaR9/hSBD7cXFFLxrt2QiPXWz6XGCLjTYgLbkeGb0fv9
+            vb1XIE/npZ9+RvkVVSb29UXNZVw9dbSffOCukO3pmRyz5gWGnXE3N9E//CpGWmCM
+            kr9r3G7nkrPxSSnt5BvLYa6t2A6CdvK8KhvvIHlhPJ0n/umgo50RtnRHNWpxfed4
+            yMR2cL+39MTNOLP/ChawoAZLfDvUu77Qim6DrqQfgMJU8RDXNI1Coe78FXVZcWEv
+            wTRiXNH+uFVDBejyczNK2Vnhn2zgMA7k5SDh+n/Q9KmUhrLUcQy40bGcS7ByjLue
+            0vP0OUWAq6FUSqlwf/biodWTr+QcQmZqaMA0C3II1ujV89M2PnFCR0Afh+DJuILK
+            LSGobj0zFUUOr8T3ICHvXxqygSJgcmNx3JuOZZK97PF1eI+fo1X4wlCHTA+cohy1
+            5aDsIOPgtGib3uyvvXfHne0ivji1F2ad5/w30ky7cX15GWzn1sw/yoNrbyBsrWHW
+            ipubiDWIGmtGEjxsZlvWBwoR4nxEuCDLqaKnzdZZ12XufH5JlhSEwyq079CwLfgv
+            IpnBwCTudcgtUC6EacE3aVePNrzuRJ0RgMCiC1S8pyU5Wz30dOM6u7ff8CqHyFjS
+            UAH30aaKWD5zw8QXyhi4AsplhACl9kjh9Rc4btYzKlTT8WiHJIWwOv8V/a+yiqtg
+            VMWj+4byuxL/Vk44imF5xiPPfOFCTjGU28onxwIGyne0
+            =ZkEQ
+            -----END PGP MESSAGE-----
+          fp: 23EEDF49AAF1B41DCD1CD10F44A37FA8C15053B3
     unencrypted_suffix: _unencrypted
-    version: 3.6.0
+    version: 3.7.1

users/simon/modules/sway/kanshi.nix

@@ -25,6 +25,25 @@ let
         }
       ];
     };
+    mayushii = {
+      standalone.outputs = lib.singleton {
+        criteria = "eDP-1";
+        mode = "1920x1080";
+        position = "0,0";
+      };
+      home.outputs = [
+        {
+          criteria = "eDP-1";
+          mode = "1920x1080";
+          position = "0,424";
+        }
+        {
+          criteria = "Dell Inc. DELL U2410 F525M0A104NL";
+          mode = "1920x1200";
+          position = "1920,0";
+        }
+      ];
+    };
   };
 in
 {