Merge branch 'main' into add-netboot

config/programs/ims.nix

@@ -18,6 +18,7 @@ in {
     tdesktop
     element-desktop
     nheko
+    cinny-desktop
   ];
   home.activation.betterDiscord = lib.hm.dag.entryAfter ["writeBoundary"] ''
     $DRY_RUN_CMD ${pkgs.betterdiscordctl}/bin/betterdiscordctl install $VERBOSE_ARG || true

config/services/hydra.nix

@@ -74,6 +74,7 @@ in {
       <git-input>
         timeout = 3600
       </git-input>
+      max_concurrent_evals = 1
     '';
     giteaTokenFile = "/run/secrets/services/hydra/gitea_token";
     githubTokenFile = "/run/secrets/services/hydra/github_token";

config/services/matrix-media-repo.nix

@@ -184,6 +184,7 @@ in {
       handle /_matrix/media/* {
         reverse_proxy http://localhost:8008 {
           header_down Access-Control-Allow-Origin *
+          header_down Access-Control-Allow-Headers *
         }
       }
 

config/services/mautrix-discord.nix

@@ -35,6 +35,7 @@
           allow_key_sharing = true;
         };
         permissions = {
+          "*" = "relay";
           "@lotte:chir.rs" = "admin";
         };
         channel_name_template = "{{if or (eq .Type 3) (eq .Type 4)}}{{.Name}} ({{.GuildName}} — {{.ParentName}}){{else}}#{{.Name}} ({{.GuildName}} — {{.ParentName}}){{end}}";

config/services/mautrix-signal.nix

@@ -48,8 +48,10 @@
         delivery_error_reports = true;
         periodic_sync = 86400;
         permissions = {
+          "*" = "relay";
           "@lotte:chir.rs" = "admin";
         };
+        relay.enabled = true;
       };
     };
   };

config/services/mautrix-telegram.nix

@@ -62,12 +62,14 @@
         pinned_tag = "m.favourite";
         archive_tag = "m.lowpriority";
         permissions = {
+          "*" = "relaybot";
           "@lotte:chir.rs" = "admin";
         };
       };
       telegram = {
         api_id = "$API_ID";
         api_hash = "$API_HASH";
+        bot_token = "$BOT_TOKEN";
         connection.retries = -1;
       };
     };

config/services/mautrix-whatsapp.nix

@@ -53,8 +53,10 @@
         extev_polls = 2;
         send_whatsapp_edits = true;
         permissions = {
+          "*" = "relay";
           "@lotte:chir.rs" = "admin";
         };
+        relay.enabled = true;
       };
     };
   };

secrets/nas.yaml

@@ -16,7 +16,7 @@ services:
         private_key: ENC[AES256_GCM,data:yU7yftN4QRbNgoR3MKeZeZMAlZP/WLIuO11SDmovyot1siq8sfS6enWlHdpxOurB0PWqsLSbkDoPO9g=,iv:GvIBst7+m8gWLhFpou2NJ5Sx7zNNURcumGbjYiCBTK0=,tag:whbtqezK7MHr3+veCHAzcw==,type:str]
         discord-dev-registration.yaml: ENC[AES256_GCM,data:gWZmExd/SiHRWY7fnwsmGzubVpPVxdSbjzwJBHPOO1G9icB+htjIlSdnRAdDCUEMz66As2mNAW6yMb9l8JCvyN6+54hxKMAHFBb0M2fcCnH3/ZYOEb8uW6HJ1lASRhM05BwTRkSXwESe4IJHexzVMAg8+cL+zfXNJCGi2ii1Y3gzKNfaUHo+plevkeVTINzh0bqFeaOsAl9SOTAoCgLEJ/VxUpsyIzvXly2GoGSAcp01D8FSmNbNLZctZ885oKmgc9cO6Hy1u0DSaaq6Z8VMhyzbIYtOTuaA4Y5Du0f5PN9HfmFJbagy4Kjjfedx6woxG58OzHQ/6dx0qGnlXUp7oguAZzb4IUXFR/zGLRdAtBXkAZ5Iz1si1jkMgP68MkSwwQb3VvFcDVQ6WlYP3puP6w6iTUxpG17R1o47WWENOf/AoaHwpbzpjYY/U46hrt3F5P+mBTigO5TnnunO/DOWNCGbff7wohX7XdVN6hV1jchYlVKtFLldVGGSkDFqbSYHPaDiNSQ2MZICQWqT34cDzqEFXh6Xv74I+9jAy2tW1aRIwowRIvWJpOHSL5csbOzKMRfdyenoti0Yv4qadIbaKsOvhxHS5Sr5jodSrry6fdDd98unrOyCvXTsY//Hli5WNXAiXjpnUR79hR6od26WbfW7LgRp0BQvSviaR6+oJkOyNTUMkg19da2BdWAQnLYo6KmivF1/ZBdAgMsMwdqvPU3D2nLCPXxT5IPPC8i4OSh5a36yvvE9H9nUMuMfo2yEIvCdjpYJp/rU,iv:DdY/L7QZOTBH/2ZX2+C57YSB5ChlbOLypCzNoS8tTv4=,tag:MObnLxAf9MYdIKoLbsRl/w==,type:str]
     mautrix:
-        telegram: ENC[AES256_GCM,data:xqGq14icmy8Eapm+aFNf+2wSjjwyjp/8OrOpiHBVqCk87SQ/B8K3o+WN50wjuscg8pe+L9S7xdENLroY/V1wcanvEpY4XcKfatKqw5h+E0O9mGs2GZJqi2dpKt09OTSJ8j1Je1ENPGazHVjBix9jK5x2+qrs0s1Vrqg4do9fBh3CPfDwIBVQCxrz3i5LI8il1Nr6bJ3x83vB22nw21UpqBnVQu//zNjzCPtma0dr5mPuiZkDriKYVaFTsFBRNpADNcHwWqaCkO57UoLhPA==,iv:BFe08lLaA2hjEhq99dmNSHE4rq4TLKHV9k8ZC8eRQhk=,tag:MydlA3g3dJJEdHHLOruHMg==,type:str]
+        telegram: ENC[AES256_GCM,data:3uBKZnZBEC2eMgmLHHgcNmkUDON6uSv+ATqdVG3bNCgMFve1jHAsUQMNzAHSf660aebOqHnSBXAvKfVhmjAT5at/4oRaAoPJL/uxPEGYJThzjINRtbXKXGLoi3mKxAyeuPwPHF3xdaUhI6iIWPMeW1A4ZJV9hKMvlkqJ1t3kzprGsZCwdavFCJl/TukEiAwIAmD0lW8/U8ezrIg/mw6BkMBO41Xmbe9noQGVb27zVdUotkiGOF6+Hna32QMC2hT3HvMFpai5N348u+MlpC9XSbbi8+0CYxwWe84ilUpQSJIGlkfJBhwFA3BwqIa2uUFTYIuOUzKt2Kxz7XWP1RgqCp0gzuAoKg==,iv:WHK8JVTNGUp7siGWrRz3dO9N2lvp+72mlTyBXcrZpi0=,tag:M0KoAruFLw+qOs2P/yBVjg==,type:str]
     hydra:
         cache-key: ENC[AES256_GCM,data:359HiOnMunY5vQowyl79OOYX7ELs1jGkyCMjvuUXUaVnPWu/Nui5UM51O4VKD6+cLvVKyy5QXJxxOVfPO5DHL7gb+rlcbcusdBs8iCLaqlxD7yHqDE6FsncFSB7OqqUKNw==,iv:/NBm6p/vpurdhFzrN7HA9Tu13g6FbWREbKh4yNPryB4=,tag:xTs/KwTOgAQwaukU8+ek0A==,type:str]
         gitea_token: ENC[AES256_GCM,data:v0Ej8841I1F/dK5ZplRzZlvngpueMQKspM5USzX9VkOEmpCs2NA3+Q==,iv:fZisAuyqk7ATFx6qHYkScUeS8SsikjiPzVovZjGnUYM=,tag:7+O+Sn7unPDy88a6T70Jmg==,type:str]
@@ -70,8 +70,8 @@ sops:
             WnV3QWxtalIzWFdoQmpDTmJsNGdNOW8K++rFGXy0G6Gcu2gQwSP6xfXInQ/y5nh5
             2oGp8sfOLFWnNI4SWL0ChP47K3C/9ysUHwQnUYPbRafZ/4X6cN40ZQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-01-17T09:38:23Z"
-    mac: ENC[AES256_GCM,data:QdJlHxF+DHD+X3ETGIhgZal0h1WecrYYZzKjUOIaxM+arlH3fDhBXw3/WGMsiaPCPkURzvJ1QgZ+gvpOqBlcEmJpKbfJnqt4jMonUThrce1OAbd+uoLUd5JW86RPzJMhqaPnULPBfMKIZrZZn3uvbjMPJtC8Bsl61J/7mhluso8=,iv:PqyrW3wKDjfe3DobeJKLbJ0V6TgQ3jH8SSoJ9j2RejE=,tag:pZkKMPu7HpoODoyHcV1Gag==,type:str]
+    lastmodified: "2023-03-20T12:10:55Z"
+    mac: ENC[AES256_GCM,data:qIsjJpu8NHv4VCNxHzQG5TGITWF8TFApkBLI/BY2GGRlifuc+Z5oV7WQQGEAlWXQn0RPIORhIqG11rJva5O8N0vsc0J7GWl8tNCwhE9wWr/lOYnJp6OWiO6b3E/jN/SNXeCYRiTXA6RmEzIns6g4b5xQUUSnynPBwAU6j+W0AdE=,iv:digUNroyiIeZW6J41LHK30ACZQGp5zBQ7d4jzpxkq38=,tag:mU/2MZo9QUzmSUxJqfBaIg==,type:str]
     pgp:
         - created_at: "2022-04-24T10:34:20Z"
           enc: |