feat: misc, matrix fix

2026-02-09 04:19:19 -08:00 · 2024-10-18 16:01:54 -04:00 · 2024-10-18 16:01:54 -04:00 · 83317bfa8d
commit 83317bfa8d
parent 28ee21b60b
17 changed files with 449 additions and 171 deletions
--- a/nixos/profiles/gaming/minecraft.nix
+++ b/nixos/profiles/gaming/minecraft.nix
@ -3,5 +3,6 @@
    enable = true;
  };
  environment.systemPackages = with pkgs; [
+    prismlauncher
  ];
 }
--- a/nixos/servers/matrix/cleanup.nix
+++ b/nixos/servers/matrix/cleanup.nix
@ -8,8 +8,9 @@
  };
  systemd = {
    services.synapse-cleanup = {
+      restartIfChanged = false;
      serviceConfig = {
-        Type = "oneshot";
+        Type = "exec";
        User = "root";
        EnvironmentFile = config.sops.secrets.synapse-cleanup-environment.path;
        ExecStart = "${pkgs.synapse-cleanup}/bin/synapse-cleanup";
--- a/nixos/servers/matrix/discord.nix
+++ b/nixos/servers/matrix/discord.nix
@ -1,6 +1,6 @@
 {config, ...}: {
  services.mx-puppet-discord = {
-    inherit (config.services.matrix-synapse) enable;
+    #inherit (config.services.matrix-synapse) enable;
    settings = {
      bridge = {
        bindAddress = "localhost";
--- a/nixos/servers/matrix/nginx.nix
+++ b/nixos/servers/matrix/nginx.nix
@ -1,5 +1,5 @@
 {config, ...}: let
-  fqdn = "${config.networking.hostName}.${config.networking.domain}";
+  fqdn = "${config.networking.hostName}.inskip.me";
 in {
  services.nginx = {
    virtualHosts = {
--- a/nixos/servers/matrix/postgres.nix
+++ b/nixos/servers/matrix/postgres.nix
@ -0,0 +1,13 @@
+_: {
+    services.postgresql = {
+        ensureUsers = [
+            {
+                name = "matrix-synapse";
+                ensureDBOwnership = true;
+            }
+        ];
+        ensureDatabases = [
+            "matrix-synapse"
+        ];
+    };
+}
--- a/nixos/servers/matrix/restic.yaml
+++ b/nixos/servers/matrix/restic.yaml
@ -9,42 +9,87 @@ sops:
        - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBucVprY3BObU8rUzdnMkM4
-            bTh3WWZKM29DMUhteFdVUUdoUmVUc0d0TlhRCkZHSmpnVGozMG12MUloOER1RElE
-            RkRJc2lhZHJOZjF3T3RBSDE4OHM0cFkKLS0tIEs0RkQzVjBjS21YTjR5dmdrR3F3
-            bXM3OVBzRzl2Rjd4STlOaFdNbmswL3MK80DU00rZ/D6rTnGkGsrgXqihm0Ew5FRA
-            X9Lor6cfGe2x6ygZMsLCYf3feKqRyAoke17IHxA99XqzEGiTqNgkkg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrTlBZWlVwczdEeHdpSDlP
+            ZEpGbnhKb1E4T2VpWnV0bWFEN1pHWTFLZGxJCi9mMG8wM2pMUmZKS1p5K3ZxQm81
+            c3BjWldxejRacUtIVFFxNjVjOTBzK28KLS0tIDlsQ2trcVZEanVWd2ZnOURUOHpN
+            YXh1TDNuNFA4RTVHREhWVEM0V1I3WFUKk+IRPTvljn7ck7tOfNlapLehWPU4+M7I
+            QEzvy5E0hzUYABBo5jYA+ChBItSMygVEjgwQowx8uTzlXVB/fAJLaA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQejdUV2tkbVhHVEtyUkU2
+            MUFNRmdCNVY3ZXVVaEJmbzlyK01DaTlZWFJJCitYS3FHZnIrMGlGV1RGdU1QTEZS
+            dkEvMmFMRXh2TEJBRGJvWk4vdDU0OFkKLS0tIGk5ckF3cGNnU0I5T1lGcUo4SzNO
+            V2RWSURCWFpOazFUNVpSbjZWN2xFM00KQfLaH44aJrpqXIbrzH7LrWkgjIJ9X4x6
+            lpVZm85GWRzKTTuVQB1d3mSy/NtseP3MNwaUJ3PCm4a3MF3idnj8+g==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1nr0qds8w3gldmdvhwu0p6w2ys8f4sd0h3xy94h9dsafjzttaypxquzmswc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNSmR3Nm53UDJLZlBnSWgy
-            WHpBeHBtZGczeUZRdVhTN0FkNWczUEJEL1VjClRhT2FjSzNld0NES1pyTk5zOUZS
-            eEhRMkduZ2J5YVAxMnFHSFFEcTFWQ0UKLS0tIFB5MjJNMFlYb29OVnlCSkkydTll
-            Z0QvRVBWb3hoZ0FoQmtKTmRweU1IRlEKUYwURRVLK2udhfuR2yuPenS2j2gkxu0s
-            5O2b9BMMtC7IGm7PsEZBIG6AOoEKY2HdhNqTQWp/u202fXIhWeZ7SA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOYkl5N095TVdpR09zWkdS
+            d2RVZVZraHFQc0JkQkRzNnY4dUV2d2JTOFhzCjF3ZW1LUEhtNWgrMC8xckF0MHF6
+            TEt2OXpUY0ZDRkVpRUNLeDJZMjJjZ0UKLS0tIGNTL2sySVM0UnFpN1hRL1BQMHZn
+            eTRSYUxjWVlSSy9BNlBBRDVaZWhrYU0Ks8sq0EeYOh80D+8AO9w+8aQACNK0xUwl
+            gAVwtTV76bN7ZdmtEqcV3IaqfbYWeZeq5PyMnPlWoUFgEixK1H/1Lg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsZlJvNkZ0RnRhbjV5eXVz
+            WGxkYmZwZGppRkFIampsMGhnUERweitINlQwCldxdVZVYmNrZy9YNkRVb0ZFMkd4
+            UWJPelN5Mi9IOG94WVE1b1FrSVBSQmcKLS0tIE5CSkYxc1VFWUR3RVg3Um9Jdy8v
+            VCt1dnNkRWVORWJNQU9vNjRlS2VkUUkKSl4WT/IIzGl1NvqkxCgueVzHZiyZvxqh
+            KkJ8VIvy7hrDS91itEeAB131t1nJJREQ0Rw6MGqdqTPEH6BvBUMHsw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBya2RRMGEwSnVuUnhGRTd2
+            Uk9uUVd5TDd4YTJXeFNqWHlud3VYY0dwVnpzCmF2akVRcU5vRms5WkdFYmpvVFBZ
+            emNGZWtzYm04SDRxa21jNlNoNHBlUncKLS0tIGdBL3V3Qjl2L0Z4NjM5QnhXZDNB
+            Q1U3czBQY3h5WVcrY01NWEFPY1BoZEEKsenCUyRQpZyAPVCtSKj8CkIKriddcv0v
+            jjlkMU5YAnSUC9DUhQfLlL+YjPzknVgUfFaSeFZ9BCuCWakJ3uTgXw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArdDR6emRicm5VdURQQ205
+            NFFtd1pFckdxMTZJWEdTN08wMUU0N1J5cVNBClU0bzdVVEVIWS9yN3F0djVLY1M0
+            WnhjMWYvT2l0em9sR1NIRXFHZVJyRTAKLS0tIGxNRjByTFBlb0k5MlF6WFRWNVpJ
+            UWlmS1AyZG1WamI2V0tEaERFbmVMbGMK21yT/osVi0P9HQeHVL5FdzShT8pq8tv4
+            r+Ami4saqiV5sTFfxqtTzkh5qheIbkDB8BmmYIIuwG1qzBXY/S6pOA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwbXRoeEs1VnlHQSthUVlL
+            N055cmpQSE5rOTRpUnJDOHRpa0F3eWIwYlNNCkFjakpCUjZ1SkVEMGc0OGpRN0dO
+            QnJWL0JRVFNjWFpZRk50MDhBWFVzZGcKLS0tIDhiclBUQzBpY1BycWVHV1ljSko2
+            b1VDWnViWHVLNkVoRS9KMksrUDAzbW8K2WrnGOjauWFiqGNrzKrc689QTna16vok
+            oa9hDQRUtkzgXTBD/PunR0Q3g+mZMij7pcxkCd/PskIMtvFLrmG2mA==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2024-04-21T18:13:24Z"
    mac: ENC[AES256_GCM,data:eDKIeCDMIKCrfypT09VUWbvUzSWze8xE9l3on6vgYOcxAnIFDlF7UnlZP/G+rU2+grxEluZV+ApUwC71LuunTNHHvEjudxp6yGHV7OrYUu+i5PuTzL0KNpt+cLr5pNYGiYWE2J4RpWmilbthVnLLJDuHlKqSAWjwdNIrEgOokR4=,iv:Yqu28Wjut7scV/iDMQVMffqdduHDbUetWvu3CVjVz3I=,tag:gggRhdXvVXxfGS7/Wp5jwg==,type:str]
    pgp:
-        - created_at: "2024-04-21T18:13:19Z"
+        - created_at: "2024-10-13T15:38:07Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA82M54yws73UAQ/+MTe8Q8NpjT7BLPK5qHjA8LcF0Qs+yf8UrQddS1aEMEru
-            6lVLy2MdPKPjeb1PFu3ldZznOFD3vUet3B8mlFwv1AidQJcZPimHEVvxF7wfpJYq
-            m+9e232Y/eVbGYduHVM1ehm2mjYiL//xXWmLwxB3j5D7bll1VT/LZRKMMlc84FOb
-            S87dt/voJmXIa8lj8VJEcKyd0oS+1+Q2i6gy+phKHc7kT7z0KYnPcHhy+vpra+l5
-            orSV73e5jyf9ZGVqypeI7ZfzALXxLQWnFYAtg34F5H9drZJjzKbzUsEtO5L7ybKq
-            ofam9QrdRcXhHKZLN55XETR1ONi/gdpNQOTvltZRyBLdiyqmWEvvvIBIR+8gbt89
-            44tuKU3xEy4A/4pWxmRBO+H0XL2qupNPbCBf8ky/jsLlaIb+DihH+VeOlwIPztvY
-            PO9PPT8TgAGKQZsboBgTD5Zbrpu3moQlj36yhTrL0AHRRp+/w/71CP+/kGaj1V4n
-            rjVIek1V/v/34bd1ype2KgvAf4YMiXRf6ydH5c1H+GVUFXVU5FRBwwaa5n8FiX86
-            nCKsh04mQvLXI8TOvrW5AmVzZa5Mghj8cYIKhS39SUVF3tRs0Se/+9GXTBNy5m5v
-            DDNdZUdkxwBFSerDj1n4t46N8ZLV0qh7YN1v1Wxc+rMg3BwhaSR+ZKBlA0MEn4bS
-            XgFGxWOX26uYzAVdWjk9NxXUOvZoTEhX6oe/wU+INUAmddUo90AYtIoETwsrlR8e
-            36Fw+Zqh5Dz+FgRKe6nQdLt25e7zRwqPdLC0ltxvk6VoRBDFm2MmFs8VW4AjPq8=
-            =w6oq
+            hQIMA82M54yws73UAQ//WIs7xa1kdgrF4jz8TWUNGGJaqBA17YjP40JkuOXkXI8z
+            qHfgqkGs5dO8KNz9ui60cUtLhiZ8tOMFdf0VGbJeeFwZ6d3inmMQbaYyc2+LbbaD
+            8Abx520n9Q4Egw2umssyGw8TXHp54kpr0Jwr/e0KwVyVLj0+bxoeQQiDaV/bPjnM
+            3lWuUpSH5KHMe4wpslyZ7ATfccr2egYO3gNwxiJyZB2Tj8KzejrpgB3YzdfgWgUR
+            DFeImL0fL+qrrnuYY/cREBAb9IR58ULIfaDmXHnbJEGSq3Jmn4UkYq1/QRJ3ASjQ
+            6zEoSsRw0xzhcTQFzG6PoxkVQSaBx7t6jfISie5+WVEzZP6RpkKL7k7akq15GDvp
+            snSpceDg3+IYGH0A5Uyp0TZyLkodwWIU2P8xucL0NwTPQe2o4BPehjvXz+z3LZUA
+            4uSSy5S770eGBH9vUZxJD93/3W+eog+Uch7SWrqHGgpi269U9J0DerjyV8FVtvG3
+            9v69I+4TzR6IWfqysXSXZdRItdm5v978mR1GxkpciF6+bb+eaMXApoD9ieytOS+l
+            PFll13axsBMBhR7EeMfPo7x5J5LtV/yjAMsZKAsHnwTtrH27xwUaGXRT7kF+HYLz
+            QO4o60q20k0s5NL5mVROZNQk5HNRyjZBS1GhWxk4WdY8Ps29GOyF6XVW3G9seijS
+            XgFNC5YTgaawVc53hR1VgiuctGpFdzbkuqduWYmG4ErA1B1hJ5UgBEccmNQXboqN
+            4dZZ/2RpgfcUrXFHTyUon0o9zpteuaOuDnACdhlyV7Ytn6PpoI4yQrUiSd3ii9s=
+            =MTvc
            -----END PGP MESSAGE-----
          fp: CD8CE78CB0B3BDD4
    unencrypted_suffix: _unencrypted
--- a/nixos/servers/matrix/secrets.yaml
+++ b/nixos/servers/matrix/secrets.yaml
@ -1,6 +1,6 @@
 matrix_shared_registration_secret: ENC[AES256_GCM,data:DsCqfbS2yxN7nVRevcjpfO63jBUsyQHfEfbpZpD3cBtPf+JuZ8TFPBNNQwx2NYdyty60INdr4w==,iv:pSf6VDS9bqZIq8ZqOW0v4siRbDp9EEdw7TtSSjjrC6A=,tag:V61OqmdsNzczOzf+2Y6LSA==,type:str]
 api_id: ENC[AES256_GCM,data:z1FqOKDSG1uo4BYgt2Ct9cUUy/daSgMNCnOHsdhG0ocw7eNI,iv:2cpOFO0Fcv/Y2xj/5UErbZ9qiLtn0QUWUg12Z9z/Ug4=,tag:cYEgrUM8GJ+uGNXKz4GpdQ==,type:str]
-synapse-cleanup-environment: ENC[AES256_GCM,data:4/9ynVfsDZw8MiaGFOwrjexaQWx3+z39wLrwfWVfHQ5MYvIKRRlUBLg4zELEdszhoA6JRMaGGmS4FnnasyS69OaBO5uvK/fE5V2alKgmk+Ro+FmzRml3sow45Z/ppwW0rHAV8Ck6skjoC//s1RAwzQBf8n51EOcMtHwINHXCnyslQ6lJFxHtjd3oYdcK4m4rgCUxquYKwcEXXHlQhGomMmoFsXIMAncmzEyt7Go0nzpwj7lS3AfVn47UKc1mAzNWbUU4n6YHMwizziaCdJn1ybBQV1ZnbyAYjLI0jZB/jPC5,iv:JMYQhrNMpuFBozbOjR1VwvDREnXvWNMPmtPh8xiVYtM=,tag:X//QCU4z0+WnU6/e1HvMqg==,type:str]
+synapse-cleanup-environment: ENC[AES256_GCM,data:T9c2bcdoKmB3l4G07x2FKLY8YCPpmd5efRgO/hJQBM9fKZrz1t/0VsPRy5SnjKkGm5Xib2u/MOcBTrtU4mkbO+5/ZrYFRjJNu/sLAeXOD+3MkA/uL0GXR6VpSaGrqv9F6ofaUq5zBcFU7EQXfLWq3fpj3RPA14JhavYVNta01pnUbu4pMhFmnRMYBsZhgTFoDJVbuk1VW3w+I2Y2Sg4t4Kzmq8MLukHzqRtkSNSelevX1wJNfyVo+IwiXhtCLvyjsaQ31WzlSqiH+sTNU+I62PP1ORXnFVrwBgH9qqo+WMdZ,iv:0EyveHiZyeDqFcgaHTF3hTmmUUHLTo4AEbXBw/VMdTI=,tag:iboMxPRt0Ib0vJF51rQQkQ==,type:str]
 sops:
    shamir_threshold: 1
    kms: []
@ -11,34 +11,88 @@ sops:
        - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBaTgyQVhRZHRPTzRSNW9Y
-            SmRFVXl2TTV3RWF3QUlneDl4ZFFvS0ZHREVBCnNxUEdwRS9ObEZKNTM2dHAxRlhS
-            M0R5TithU0ViZUc0NHFHM3JrdE13V0kKLS0tIFhFZ2dZc21hL2RtNzZ0djVqUjlD
-            eWdDbGxobFlkZG1SL3UrTEJXajU3RXMK9ULFsUDHxBtzCy5tbwSFeKm18TRjX1mO
-            B1SbGXUNG1XreeRpb5n7r01njVrPpbJI3DPtjvoKquNTc2BhZHi0Xg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVWHA4UHBzWW5JeVNNMnBI
+            ZEJqU3NPVVQrbEpXMnF2TXZrM3hRZm5BQUdRCndzV0thRm9zMG0zRGRhc1poRTlI
+            TW8wMy96MHN6Y1d3M0dZTGRCdVF0cXcKLS0tIDdIcUhHRlVwS2syTTFPYWNxVVQz
+            T29ZZzhTZEFGMGJiSjc4cVdxUktWeEkKIASJ+MeHmAlH6zJE1x8vYV/a0xDDiEiv
+            uUdxaD2CyNmu3uU1Z+V264zC6SRs1wRmck68kl10iD8rldq7DsPAQA==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-25T02:14:06Z"
-    mac: ENC[AES256_GCM,data:Jy3jgbmueseKgSpoltuTcCAKikwAIxqD+A7uwLKSmyOW+DCzqNcSiSCjbeOlH3z/wiudFLo4uvFBIxp4wHRK/9PdWAKs9RGjkNAgEtPgyhsudhf8WjfWdb42/O7//6A2PbJJeO1iNvitkaPuL7rvkto1sf60o2DN3l142alnYgo=,iv:eLi5U62mv0C9SIH6cbQOY+KHPHw2rleJWiaOPqsqq3I=,tag:t2z2HzE8GMLK65nxYEYDpw==,type:str]
-    pgp:
-        - created_at: "2023-04-25T21:47:23Z"
+        - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh
          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4cDVYN1o2YkdtbmloZkN4
+            MCtUU0tJUG5iOEdGZ2hQb1lVQ0k2K3RrWXpJCmxCUHpESTRwOWM0bnFHbjdhU245
+            cVpNY0NzazY2dVY4WHNSRDdoY1ZXd00KLS0tIDJqbFJVNFVuZjRPakJROUZCYktx
+            Y3VyVUp2eGowVWJ5NVByQ2RhTllQY2MKHGahQwJ6CHS/8wa1NcoSDx6GdBw2TPEg
+            jCub+HoTkyYU1mz8pIi+5ZIukEUctCT+lYyG2abFem6fhI899i6o2Q==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1nr0qds8w3gldmdvhwu0p6w2ys8f4sd0h3xy94h9dsafjzttaypxquzmswc
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyOHZFRkxja0FGc3lnVFd1
+            VFBsM21zNXhHNHpEa2RhL1pnWlo1dzlIZVFJClF2ck44MGZKVHZTaWp5K0FTYTNH
+            TVlzV0lRKzR1Zm4yM3FOOUxNS1ZRMmMKLS0tIEV5RS96RXVrTWRPOHNvK09KK3Y0
+            cE5FejkyT3NEMlZ6SEN6KzZzaUdHOW8KwVlGLRaWMp8QhdoE+jj6TG73/NQyCxdz
+            1lqujbLX9LQNKmP+lshzgv+xzScUECtsfwjwcac/nxesyIXrHZw8wQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRSG5ZcEJQcnNmN2FHZU5R
+            b0tJOWZHMUdsTCtyakdRM0NkYmI2M1JJVG5zCjBwZCswUGNvTXpVKzliWnJ6c2Vx
+            djJXaWpRMEo1MGhmTjhmVjd2U25od1kKLS0tIEdsbWI5RTQ3SWphWDhuSitOMjhJ
+            UE9rM0xDL1p5Wi9FdVdpUWt3ZjZZTTQKQF5t/3Ia4F1DczklJPBODKqcbH+kvaXJ
+            g16voIMF0Vy9ev6Y0UjtMjirNIajvTKyDUllqvcoau0EFFyH3ry57A==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1bFhTbkRsa0JuYW14cTBM
+            RnBScFRxcnY4SFhpYTZHQ29nSTY1L2R2aUNrCkh1dDVJUXNFYmRldW1xY3dPcCtE
+            UFlyR1QzUUpERVdjNnE1NW1mc2g1TzgKLS0tIHMwWi91eTZhVkV0alQ1SFdDSDRJ
+            cmFTNVBDSXBoR1pOWGk5dWgyVGhNRTQKre8iFx4zwGkxZSps1HZoyw4X/7pl/8YA
+            +7s0d0tV/9V60N6doVLRIeneGLUt5RawR6OSzBADIi281NE2R61kBQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1M0dNdlR1ZEYrS1hRRXRB
+            c3VlUldQWW4zTkg4QTZVUVRZcG1BV2hUeTBVCm81eVI2S3pMRkpTbkJFTlVlTlZ1
+            a0dqUXRORm9lbzUxKzZTYU5sZUZTTmsKLS0tIGlJZGJ2YVRSZ1FwbzBLS29TYm9S
+            WkQ0ckJITWJ4K0FDVXBDWEREU08yTmcKU6l9f9XWInhhu90VsU+atGfr1VlBPNv0
+            sy1LXOhXvFBP8rn4lMS57FCvHqTxu4LJBKbyB1cYv2AwpNGrAG1vlw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAySWk5dzVrZHlFbVFmWmcw
+            TmVwbU1XU1NEZzd4aktCeXdNem00NGgrckRZCjlTRkFrSkV1OC9IMjJEbnJNa1JB
+            M0RkSkxLV2JHN3hOb21wMVJOUElodDgKLS0tIFBvazRVK0NpZm9mVU5rQXIrWjFI
+            MFNRS0RBeUdzZW1FK3pmVm16ZS9JL3cKzaCjTG7EFvUynFT9r3liQrLUXsO2VVE3
+            LGPAsuWYPoggHvJfyXlca06GVP6+6v4HiFL2RQhRECTBsyAVHPCB8Q==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-10-10T00:10:05Z"
+    mac: ENC[AES256_GCM,data:FT+6/Cexyf+B95gjQmsQ9Ri40aXA6/UnCZgXhxNDNp1zj5m6J065R+IbdrLoLDjG9FU2MplEg1dZNksvcXlSi34Sbzmmf3OMGm73Yzsr6/KhCoU9nGfJmSpXJXeOBS6ahAIobGfbjOzWN4ljy4EmDC/UUSeVKcs4sGYQ207kVcs=,iv:tf1GvJA6q7DztRA3LjlQUH16GitiuyqUhHiukG59ydc=,tag:bg7Sv5581bYeQ/NdO2XxIw==,type:str]
+    pgp:
+        - created_at: "2024-10-13T15:38:09Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA82M54yws73UARAAvW2vHtvnKwV0K6b01vK/6T5SnJERlDfTKLpv3sLYlii8
-            FysxBaODgYvnR37/hf2CoWRlYFYZt7wqj811vUMkayBey9FY8nj1k0t5wyM0T1AU
-            qFz5fBCjP6tyhk2RBkWCLVfnLUvhnN7h/XIc3W/05VnIMQF39SbXIQ2gfqnI7R6V
-            keLoHXT0DBwboFVTdA9HjSFc5riEY+fadQf0PZT/xVCTCJH4yeZ/ba6pa/9yX2PU
-            UbHqnoR+M7RkQBrFn0r4nH9r3jFR0VkGri20v9IIby59wkCPVdhX7VPBRtQm0xXN
-            /EqtLMsR+U5bOPvKPM0s2BXXrTTACmsJ9AN2n70l1Sm6/5E3QoTQ7lbH5qSv/wXT
-            ZUkZmqxv3OHJIez2VHqjW6vlraPDL++H/4rsX3DBvK0BSAtr53r9KFoMwgMnMj2N
-            ucX+Sa7ZiI8vXGn3rjfj68Kc0BqzrFgpY8ZrH1RM3weGrsyAugAP4iunnqjYhxrc
-            y2Hh2NZFyRBGTCrbxAr6vJ3MJXLlyNbofPi9Bnx0clI83ksju11rZjb9yFRCLJ+/
-            oRxws+jq7t/lbMVhKaVQjY0LVLn6MCFbb5j5ulQXq9qiv1x+XuRTiPyPJksIiJDE
-            vjf7dMshIooWVNoECWfilEdVCldnYEmxEgr7gZHcTpgDjgeY3fCVvAS7SfD/BDfS
-            XgFw8C3nv2I9zHZZCI0XKFlmNU/MCBOfyK7mHv6UZtUx1YC2lw783R1uGHXZbVu4
-            iPKkytzxgOZms45CfxL3xEPTwO2lZL9GTCZ8pMbwB1jjP1bsH8nyro8vRZRuVoo=
-            =4YT5
+            hQIMA82M54yws73UAQ//esx5TB08mehyLiad+Ypo/1PWjER++VgjWSa/tD+Ml7iZ
+            sc1WI+X0JOg1dcVG+nxfJ9wqIVYUeWGIXjeD7x8AAJjTypkPcmSk7CG7IoyZOXAz
+            uYRLz7yFmZViFYw1VTKryFt4h87G9+V1YM9phXn896A9G60qf6BgXs533z/vk57g
+            TwKvdbliRiznaJdptNsBNrnXQ7VjVtOZrxX+I4zR6b9RJlPcCqSbz3OMoklfS5QB
+            57Csni/iurwmNQP2R35o9hARw1GtVzalISUJHj4Uvf1KJA/5SDu9qooxZIje5sjc
+            3iFzyzMQBjK5A/8eVRKOFHvhiHHBlrBTbuvpWHWWCIs41hIrBjkQtVFF9g7mIlw9
+            g+uMnyspaai/OIxxy6sChgsh3Q2T96PMXtmixCzawQL85maHCAGiy4hw++YVliBJ
+            qGnZO+VjhIsxOwfqKWl9OOlddzT03ZGTayIXQyY09kuz7p2eg8Ev/wTKBhCuVXhy
+            IxxrI0Gum8RELAktkRvd0aU2/NpH6Np6peZGoRgms0KOzNkYi4t/mRWAfZ28Yz9M
+            rPU3cqOJPjaN5UmKzJVTYxJaiPXHwahycibd4itTDHagDO730idrEg7kOKd8gOt6
+            xQVVv2vuB3mx8lj2QsaqU2EYH1Wec+CW9fQRfm9BBSG8bnblsJ8Fpa6JOIS080HS
+            XgEeHpPbVfOEWaSbityJxYBsR+shUGLPloYpSc1jMkh4Qf4F4Zvv0AJPuQLIQHN5
+            U6tDFBvlhW726F+LfdCJBAEhpHvznzhQFpC91Q6ndcNfr+IqDa3iCTI22y/3AyE=
+            =hmUt
            -----END PGP MESSAGE-----
          fp: CD8CE78CB0B3BDD4
    unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.1
--- a/nixos/servers/matrix/signal.nix
+++ b/nixos/servers/matrix/signal.nix
@ -3,7 +3,7 @@
    sopsFile = ./signal.yaml;
  };
  services.mautrix-signal = {
-    inherit (config.services.matrix-synapse) enable;
+    #inherit (config.services.matrix-synapse) enable;
    environmentFile = config.sops.secrets.mautrix-signal-environment.path;
    settings = {
      homeserver = {
--- a/nixos/servers/matrix/signal.yaml
+++ b/nixos/servers/matrix/signal.yaml
@ -9,42 +9,87 @@ sops:
        - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYSCtsT1pPUXpXdnhjcTR6
-            aUVLb0x4NzFsSlJONUlkYzZNUTloMm96K0ZnCnAzcW9yclZrSldLNXhZRXg4V01Q
-            YUx2a2RLeVVaNTNhZnJTdHg4RFUrS3MKLS0tIExyQVpVM1ZSNnZUanpvSUdTRFp6
-            OXBObGJDaUVENXo0eGFUZTRPUUUwek0KDptKKzMHR6bs4wPH9eqsPGhqzmf//261
-            TDSQz+ep0FsP9ZnuJs3YdmsZAiUXlHKoFt7B2Ar2rMSfA3hYF+eTRA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEdTBVT0dtbFNPT1dNUHdU
+            YW5kOUhNR1lFaDcxeGp1WEhSbkRMdGZLa0c0ClZ2Z2JLcjMyWjE3WkViUDNsdlRP
+            cEVzZzZHWnM3UUkxN2xrWXYveW81YUEKLS0tIFJ3UEs1RnR0MTFob2tpSVp3c2hS
+            dGI0YmRzUUxlbzhrK1c3UWdYcTRpTUUKHU5CVdoujk0M2zNIKqMqIEcCE3YEWz6o
+            qGzxuDqXmoJN0zqLgjMwaFQFYzEDLLK3qi8MQGOipl2usmvxMoCezg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1cU1BQWoxTENvQVA2cjJo
+            UUV1d1ZxckNDZ1lIWVpDQis3N214eXp0S0U4CklwN1U0UW5hWSt3QUxJcGx0OGlX
+            VXhITit6Nzc3NVc3Mi84MGFQd1FQeFkKLS0tIEovc1lvRno1ckFHYTZiaVNiMVRl
+            Zmt6Rk16Qy9HM3lxdkxRckUzS1pYRHcK5YJousajaNHv5vtAgQ6ladBROiuCKdoA
+            bHGk2Lz36rIP5blK96BxANYNQcovDoAaiyuILCpmbAvXgm9DTkXTEw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1nr0qds8w3gldmdvhwu0p6w2ys8f4sd0h3xy94h9dsafjzttaypxquzmswc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHTE5jS1d5NnNacW5mLzVo
-            VFlnK3B2VkpNUjV5QUVlYTcrdUsreklUMkd3CmU5MlBUeGp1bzVVMGV1bkNZQkJV
-            dHdVMDVyYUpueTBONjVOZFh3Y3N4MWsKLS0tIEF1YnpxcFRuSm9JU2VKdFJjVi9u
-            SndnKzY3R0MzV3pqbmxyYjNXV2p6bkEKS27XLdXlFy28qy6HlKlebp2/sqP4WKf1
-            tCy/n4Dk8Gh+2Ss5+r+pqgoTHiZG/a6NqvJCpsxRsNxx+GZOpr6RcQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMZmVTc1ArdkdkeEdIZU1i
+            ZWVmbisvSGVrTHJkc2dUWUlvL0xNZlBDSHljCkdHUkdsaC9oVEcxMFp4VTRRV0Fx
+            ZmNaL2NNZlRVZ2ptVGlPYUJPUGFFWGMKLS0tIGxTTlFkQVVhdDJkL3JJQWJhQWtj
+            SXk4akpkcUtIREl4Q2RDQ21IWjhYNGcKHsU6zTA1qkrePzWcNdWRBDPXZtlt5buz
+            Sx45ib/h6AXaQ79ISvv3F0YoYSIWifAGbGbQszkPlaeqiA1inLRkqg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvUXRnWmJXRnN2MjZIN2ZY
+            dG9MQ3d6REdPYmlnLzFSVGxKam1hQTFJaEFBCnh1ekNraEJENm9BL0M2bzBmTWFJ
+            enp2MUNRSHBoTmxBQ2c3QldCNnNlamcKLS0tIEcycjFvOU1BZWxZQllMZTM2Y1Vv
+            TUtpejY3VlpBcWhWL3hnWUlEdW45d3MK+pG/G1J1abRCZ3PYzjUY+d65JhcVYUEP
+            r/J2Fb8vYHR/Z7bMZ7S9JrSlRVvxvjft3ukFiQk6M+2JBcaRBe0mjg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnRkU4SFlkTk4xTTdhdjMr
+            OUxzSVhrbUVvWkd2SnRRMnFxcy9BZ1hWQVg0CnNTVTY5RzJmbjNEaVp6Smh0QmdI
+            eDFNKyszMTJJMEM5TDlOYU5BS2JMa1EKLS0tIHNjMFB3ZDEzNXFEVzBPM2l6UVFO
+            NWFsSW5LY0JadzJzcDloWkVPL2pGbFUKOzdl5EzcHrY4z2tnARfLFKt2s8nPvAF3
+            bJOFZ1QP3gyqtT23QaUg4KkuhS+MGgrpMVci5ec+PZx8xtd5/1Ai2A==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGNVJnMTAreFhOOWFoblpF
+            S2NrdlFiTTNXYUZWR001N2VkY0ZaYUxJRzE0CmlTbS9wNlV2ZE00QVFjNGxQQStL
+            WDdsWlZpUUxsd2kxUDh0Z2JZYzNPVVkKLS0tIDlrVGNlaTE0a2J1c3h3bGtaeGJy
+            RXlsSFdubVgrUHBtSTBsMkFtWmFmRncKyCNz9EHs/n0XdEHL/nwu7pSieVuGUui3
+            VB1pxcDw8f9n8VUACpwGYprRQ9O4JuhoySZ3QjDrE5sHmJja6p/HiQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCK0tqUmNnYzZaN0Q4d3I2
+            T1MzUTM5MHk0YXlsWjdLMlZ0VFRKNDErL2pNCkpVcnVyM1VpN0F2cGgvd1psWXdw
+            YkkxdnNZcllabDI0UExyajRGWmoxelEKLS0tIENtZ0laZ3NQdE9yY2RNOGplYklm
+            bEpqMWpUdXhGL0lDWHB3TEVzVTk5QWMK5IrtLxmAXejvYMZ12wZzfcPKXfWJB/Ec
+            uAHaRDdmYAKBavVwaDDdxyZQ5r0eBwwZq5rWFR7HFlArCsMre6/bgA==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2024-05-14T03:15:49Z"
    mac: ENC[AES256_GCM,data:YKuPtzHtVqPeFKmm5OsR1btshycWB/++TLOEvjoMvIvsiFCo/YaPqyWebpSUOtvg2h/AwJY/6hPX15DPzDe4B2HePHDiiu5ItkspW3XJUkT30Ul4aAhE4hP0wotBQlYJro7mF41dejctLVpVi8V3zqTkr3nHgcMUa6EblUtPIWo=,iv:WsmM7VQrT0QIJjqQUsxW25jO3xSeLuAJEW6kiMQviW8=,tag:B1O/YWlL39PPoaOJNkl9yg==,type:str]
    pgp:
-        - created_at: "2024-04-21T21:50:24Z"
+        - created_at: "2024-10-13T15:38:11Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA82M54yws73UAQ//YGGe9BTb6b1uJ7YOCLXev7M1hewxFSN6u7ExbLlsaLYK
-            q1qAsmpFXL63jzT698sCdg66HA0I00+OHbs3e21lIB8jA5GpE902LrN8H7CTJeaI
-            44+uKHEcpKJEVS7VjoaHirrIJLd52GCvXbHtHqJ+s3ReJ2E1nP9Y7EVv6Z0c8BGB
-            xpNgPry5K3CrcTh1ehjARn2gxt74HuktGkd9HPbeqODdulHyb+PXShhpuT4KgiI0
-            Afw0pNHxHfaJFypYaC4jldrTapRqYpAWF9KC4J8ZrROdvn7kf4B5QdTTVBjl9ec7
-            l2TMMorlR+M02Yc9J/4BsqK25DOZ3UQJ84QiGasrXyCA/rSyU8OZNmib7nr+uE1y
-            029YsCytKAYnDLgpTkB0ot/fqt6bLG0m3lYrcwBoC760nw6+JkGOuoNJjmSSpiKg
-            eih/9LskXGHmNesSHiM+2b4aNRUKLwmj5ewdGjNOQ3cfVYNxYrhGqmI5su4wakwD
-            Ug6KYXx+qDrOPNi547Qog4xDJ0nKcIuq1/DPVBU6kk6quzT73Z4tgiDJMsf0FoKH
-            10LT0uwZ5pyudpKG6Hdvst9xkDt5iLDk72eJRbjBIulwYfWngtUvG0ZjUrjUCP4q
-            8jFYZXSEFdgJJQQFyDsxkBLXHC1v/jFas1zKJ0lGZbj+u9lay+E7ZiBspNc2uP7S
-            XAHUxbuLhQtgoKBu5MWXEvQ6mvj3gqh9XXpbZMhEnBanVkD2QVl7MRnHtOChgjDf
-            k3hRdlGoaKykniKGwdKjdhqOSKFDeWEAOtxv/YKtzMW3d2XHSKGs1I4SiXqc
-            =ITAO
+            hQIMA82M54yws73UAQ/+KQf6heRJusUdxgqOrE2tEA8D8A9PBhd5EeURcRv5xG8f
+            pm3RC60eD4ZzyM3S9WKqbZiZLOiY5FmrcAUFzISrLG34wwzO47iXQ4P5vxgWtWTC
+            bezv2w+c1C2ymnRN+32OXAnNb4Z89AzJKgcZtKU52XDWKnZfX0knI8X9UXWQ3Dwx
+            Xm/XVCMiSgY1OfHCH7q1H2VjxwbQXxS97kIzq70QIkLQFU8n05/vrYAuBf4w/VjO
+            s0/pdVBlQsg4PEsqAY6DdRET+82+xgkRAzDXnGZzpsoBdBHoJ1pSvOlXC3M4mGeW
+            QbnUPluCrjThlEL4wHSWK0zfwqISkKYPYKiirRGlU9/q/Ab9L66Z0Y351uEmZNUl
+            pfXrK+qeraJ/YO22kKcBPMhfSa0X6+Z0cbJxKAeruytmmTWYCL/UMoEhmrpDcikV
+            JMzLeWIVws+Esoua4+dyNYl3kUq9p2e00j71dl/Vc3uR+cqWu5RGEEn6Zl5PhCzM
+            dKgVTJgL51k0FaJRkRZ6Ky+UndZli/1/O4ASeUAXnvPklv+LOsaJ40RyPeXscXr3
+            CoX85AkFsR7opPWhj3+loZbvta4YWyiNGBkRi1G8cTnWTm87cQJWyTDxFnUXAppp
+            k1omhKR/2JJugg5t/4eoQ5OOj3zvaC7pEAN9kg6Ki4tBXh2FkCE57QiHCZdQ6mDS
+            XAG2ir3vcQe7mEqOkhBC6WOZgdoS0eneZJtIpW7Fc6WxN5wvhD8fJo4p0GdSUlU4
+            wnsG6AKHDsOpbu/qXErJNJr79E+xAWIBQmxPoFtu13IhBOmaIgVZhTicMn9u
+            =MuZ/
            -----END PGP MESSAGE-----
          fp: CD8CE78CB0B3BDD4
    unencrypted_suffix: _unencrypted
--- a/nixos/servers/matrix/slack.yaml
+++ b/nixos/servers/matrix/slack.yaml
@ -9,60 +9,87 @@ sops:
        - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzQm9XUWR6MEV2S3JFNWNB
-            VkFuYTNjZEJYakFTYWI5T3ptRmJBb09oRzN3Cms3REZlOFBWQ3hzTVlKallOMjhS
-            bjVjYloxNDdRK2lWdjhIalYwajRBRk0KLS0tIGNmcy9ZRDMxQVdTaDM3WXFRUkdK
-            c1dieVNqS1Y0emM4aXliVTB6TVl5RFUKXoBohKU7Z2QZouD9OGWWloZ7DMoVfT7x
-            DglOnTdIvN6jI8cgRtIJQM31PEcGuEuEyXsyRPjGs5qoAspWQPgl+A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLbis1NUtCcWpmakRZdDc5
+            UkJ6aDdZUUJWZHl0WVBaMkpVaWYvY0NmdGlVCjJBckl4ZXA0NzdtbjkweFRtK3hD
+            bXRSVEJnVExTMkNXUWFjVkVJYWFPcmcKLS0tIExXbHhkVU9ZQmxOd2llNFh0VUlF
+            WW1vYmRSUWgvVDJ0QXFNOWExRWtDd0kKOMb+gV3+UQ4/5jceMq0yKqgb2HfXkexR
+            WZ5nJIggrSJ0KBYQnwjamNyccgUYT8rPDPaYKh9+e9/gF3qaCJsZoA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDMVIxbE52UnFhVjlka2V5
-            cHNLeVhsNWFXeVRPYWxvSHdGWEpCMEVvYUY0ClRwNlQ0T2phdkR3RkQ4MkdXYXkw
-            UHBDUitjTGdvSndpMVZGTUpoNHpWVDAKLS0tIHJGZkpWUGw5WmJWaWJxRmM0cUpi
-            Z2xOWkdoTDFoNnFybjc2d01ZTGhrV0kKNRJpTwsbHowfrr/oDb0Hzsx63m0Dk+ol
-            2dlAHJyNgdnQAdssDb4NERkUzjZMmXexbUMWjqGHtmHGyPTRDSpGsQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTTHM0YVZEMGlTb2RoeWVU
+            MU9XWjFvUExuR1ZGZVJ6TVAyMDJaeTE1TlI4Ckh5TWNiZ3Yrb2kzbVM1bFNWTHc5
+            cUJYWFVHNEdzTkErNGtNV21vMHZGeEEKLS0tIDZxU1h1VVoyNklyTDE1b3EvU0kv
+            S21MVGxrZFdmTGUyd3MxVERlZmVJTVkKddw3OD/joGMojptWKiS77t/dpvUieU9c
+            kDRhgfFForSlWRJdA53Cx8wwRciedQ7IOENy3kRJH96gEmUuHW45Bw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1nr0qds8w3gldmdvhwu0p6w2ys8f4sd0h3xy94h9dsafjzttaypxquzmswc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0ZWo0TDZtZXh0VS9QSWtl
-            d3hLbVRVOGl4ZUdLN2hGVUpjcVJ2TGN5b2dBCmdWcmhmNlBJNFFDU2xnL2pSaTB1
-            VW10MEhPZGo3WDFPNllwQlJOa3VGN0kKLS0tIC9lYXdmbHNZcWl6cjBWYmJNSWFR
-            QmZxMVVpd1FtbUg4bmlhaG9IdmxFbk0KPYOtCiD42R2uo2qzuIFPq70wlIOeWW1J
-            H1DBYQWqBnCF74cxsvbhClEBm/VSn32sDwxgfT4lj4OkdFmfOfxSbw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNaXREdzh4bTZ0QjZTNmxX
+            R0hRaWJUOXRpSnBzcXZ0aEtRUmJvVVQ4ZEFRCkNUTkoreGN6VzYxWWljN2NDU3Fn
+            RG1jRU5XeDltTjRkRDlUWW9rSEN6R28KLS0tIFI1TmxEMStmOW41R21rb01heXpB
+            WXhhUUlRY3RrbGRYemFzb04xMkFFdUUKodjzLW+mm3dWekEG8JeklCqpntJ4FGlz
+            cAwapbNGYsldcyv4MsSjTz7efebtiE0sgWUTsF/ZKM0jZOHq/0bO3w==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYZ256bDBlWjFybWMxS3Iw
-            NXZxaHZNTDJFN0J4aEZzdlpMYlFYY1JIVlY0CkQyTXQ2MjRYU01Qa3lob3dVeXEv
-            dE9ra0I1ODF2VURFclIwNFRVY2FxNkkKLS0tIEJNYlV6KzdsS1pNNXhzelMxekdW
-            dDVPR3QvQ3k4NVNpckVid0VQUEd4TTQKyztuaRZZbiuSN5aaQOz0CkqikpAQcyYw
-            EjXtMYn23+wp0JyaMpIUhCAGbwVOw+hg3ddV5vRbNZ8rZMSHXfTvhg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByM0dRV3o3QjZyajYxQzBh
+            U0JzSWdxTjZsSWhQZU5ibW9aNmRGQ3pieEZVCktrd0RXazVjN1Y1TnFvOGdqUGJr
+            YVR5QzZ4OWdHUnhkYzJzdFZTb2pCUmMKLS0tIFRnK0pZVE1wREdyWWpTa3AvcFVX
+            WDNkazQvVWtlbHdUa2h3NExxcG9WdnMKN7ekB6/fkmoQEPIfAVQ++xTR5tXInnJy
+            Vbee57LONM4ymqz5LE+SPKS0HPebEs31zs4ueuqEqeK1vfQHfrRGiQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVc1VLZTIydzFDc2JRSFNC
+            YjkwUnZTZzFSQ2xsUzd2WFBGYm5pekNJMHowCmNZU3BWWU9OZThjVnpHNDlCNjkw
+            WGtPamNpclptK2o1VW1KK1IvbG1UYTQKLS0tIHFUZ3UwL1B4SGtWcE0vYzBBMnVS
+            bW5SMWdveDZ4Y0gvdVZldWpnYlBSY3MKqnQSaHCQTaXWZw+6I56oBEvLHg3ruGyH
+            FVXhJIkli8OeXchQAsPjtTPIpuCetxns5bCCSflbfEUPRPerZ3AKxw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRS2dQdXJPRW4xdE8vU1FG
+            VzdyZVVGSXlSQWxuU0E3VGMwSkxFQ1cwL1VvClpxSUxEVVFleHRzcGNnUFU3OFBo
+            cWlCRXljTms3WTZrVExlSndjR3laKzQKLS0tIGh1Ym5DN21rZHpvSnBqWFRPL0VL
+            UVBzS2VDTEpWOFd5bzV1T3lJbnBHN3cKg2Uo6WZDjKKInOW2kbrdTy1jsb1tPWmp
+            1AAKQRvw7K5m6gEe3klrOX3YW2JrttOi5Pry9eukvXFGi5R6Mb4b4Q==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzdm9vb0w2NFBia2ZaU01G
+            L0VkNnZIZWwyaHBzbFl6OURXLzAyVnRJa1FnCllNOXNKZDBQVm9waFViR2xzZ2Mr
+            VTliZG81UDFDTEJPZHFWelNiTCt3bTAKLS0tIElJK1pkTE9Td2RscnM0ZFdNVlB3
+            VmwvUnJKVy9KRm1kZmE5Q081UGF2ZzgKi5osVYd2bAKZ68TZhxrK3xXDpQ/DXvVf
+            t2PlR1hlSO4snOcA6B/uCud7K6LuaN8/bl5Sa0MitRFBRSH39Efwmg==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2024-05-14T21:01:48Z"
    mac: ENC[AES256_GCM,data:s3zdz0zOXo9YPt0V9il2MVRKBuaMZ8iIR9267y23IrwH914P+YVYQ9i7tTDfEG5+R1TEbLjli8oNxvLpH/BEicGygR/lEBnrp17ccd3RqCcrKHgFyp/QihJ7cCuBtcDO/0kPKSLWsa51hz71heYJLXaFCcZjvWm6R/z0hh3dE9I=,iv:Dt05Fdgk9YYVAwZgrpvxv8A7I6VG+TRRnPjRx4GZqrc=,tag:G7bFoIVXAd84Eqf+qJRiAQ==,type:str]
    pgp:
-        - created_at: "2024-05-14T20:57:53Z"
+        - created_at: "2024-10-13T15:38:12Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA82M54yws73UAQ/7B7lozfjMMT+j/f2KGdegu0Jjctprhn1OCvQICo6JfMau
-            w7BzKYUsRQiTMPWW91K3SNKcSnYJ02hYQBBaWEk/SX/fhv4bqvuCKitxHdxNvBFN
-            zI3Syjg1Ztc/u/OxLzrPKe0BFn3tnIQ5U6c4ti9FV3SXf5q6N1GLTjfAhDoC/0Hc
-            QEFInSCYNFbtjnafEx2wbkadyzyRq4g4T0YRRzM6HYXzUVfBJSwtpanLdmpuo4+0
-            moDM3Hu3XBLM61uajmHFN5sBlSuwA8QAZ0BBLCAumBQ5YfGSoowZBc7rJezDs3Gg
-            TQ2yogiB9v4edNAVWiBH8KVnHRlLqiIsZdLgbVd2dhEp/AdPWAbgX5ZBm6JK9+io
-            i7QrfLAvw+2ezhflpiOUx6OPUuQvZdgTveAuSesJoR20GW9bgtkkkeS8whMjgt3g
-            yhh89+7+zn4VBgFzful7Qed4Oy5GFPfDsflLv03bagHTwtbv+fQo153/7Po2HS/O
-            yHMa8fr82uUUA7Q8ZQUMtoAWMJwpwG8gHqybCbuem5ZshJKHCc8jow74n4Lc5HgQ
-            MsuDVf32nVWS2iAn+mJ5eTGW2BJ9XYNqX7ac1yWWtnR+9gTmGPuaq7xMMVtNindC
-            5idSpuH7orG4z7HU80q3XWfGVciegNvlNx4RHvTXyc39FtAozc86s3lMjyyPgPzS
-            XAGIdjvxcJgpwzAA7u9oo/OnO+0eQ8upxieLPPICNfjZ9bXj4m3Z8UsoCE7aRKac
-            3ybcy2emTybV/8+Jq1Os2b6cbwJMJSeln1+CvFTdKagMI8f41aXUfIhMnb7E
-            =NkQx
+            hQIMA82M54yws73UAQ/9EJtTZLkljQoVLYcLw6RR+VgCInhPtAyXsh8srpQqPVAl
+            3T3Nm5GLghAkRXFc9ppfXVf7MoChP3j7U6XIgM0x9QvJVozsiwzVT6c8wVxe81Ws
+            hOew8RrLVnkWeM0ZAv8/gt4q1qAAFBVAZwajYyDHcP1bXe8dXB0SIEWyREQaZuei
+            zhp/LjyJ28W9jQiO7OhtnPOMwzgXHf2VoeNDZ1SwMtxq3+JYUA33S9dHAIfMSDJb
+            XQ3r+VCG3iafe+f7aJUPdDIIkAewwsc3Gpeu/n17PJhX4B5YFBDmU9ie5TgxkjJg
+            /ugLc1hH6Jy+jjY1RqVThkRvT2vNr0OqfIp+Xa+sbXRwWohMLlPM7kHfggc2T6G8
+            i8hmAgi+P2XAbc4+NsTUQttydVjA9rWq81eLTpuHOZiiX7F8sSaaCnWxyxlMAbvg
+            Vd3V3RMMDd2BQAQ4GxV6HAtfIPhuEHHmDy0SkUMeuRGSulg8TYCkMnfGWizaLgoO
+            2GajM4j0nmIGf1h+d4htOetM5yK6PYm8bAQfxG/h/C/VpFfk34rWdSXXBe/v5TwQ
+            0919VwQC+LI2cTfM83XJe+Ki8iYEsKjLp2Q0djOaas26Th4DoGQReefTa6HrIp/+
+            8vUXBlTvS6j2vhj5BjW+Ge59SR3d5zeqgDJqWwjMfucQdH8SzTov3t76u1Wp8z/S
+            XAEOc7cOwDZVdc5jRJqzfr74Ef/bARVX2I7cotRRQ5dBeyuiHo7NPSMOldIp+Ekl
+            SMBhodlWGWgyV7BCF2cYNaZ6deCPDd7mUDnxEMoSKGNZ3y9DtY4VNRGxQb7r
+            =Gv5z
            -----END PGP MESSAGE-----
          fp: CD8CE78CB0B3BDD4
    unencrypted_suffix: _unencrypted
--- a/nixos/servers/matrix/synapse.nix
+++ b/nixos/servers/matrix/synapse.nix
@ -5,7 +5,7 @@
  ...
 }: let
  inherit (lib.modules) mkDefault;
-  fqdn = "${config.networking.hostName}.${config.networking.domain}";
+  fqdn = "${config.networking.hostName}.inskip.me";
 in {
  services.matrix-synapse = {
    enable = true;
@ -24,11 +24,11 @@ in {
      allow_guest_access = true;
      suppress_key_server_warning = true;
      use_appservice_legacy_authorization = true;
-      app_service_config_files = [
+      /*app_service_config_files = [
        "/var/lib/matrix-synapse/discord-registration.yaml"
        "/var/lib/matrix-synapse/whatsapp-registration.yaml"
        "/var/lib/matrix-synapse/telegram-registration.yaml"
-      ];
+      ];*/
      log_config = pkgs.writeText "nya.yaml" ''
        version: 1
        formatters:
--- a/nixos/servers/matrix/telegram.nix
+++ b/nixos/servers/matrix/telegram.nix
@ -3,7 +3,7 @@
    sopsFile = ./telegram.yaml;
  };
  services.mautrix-telegram = {
-    inherit (config.services.matrix-synapse) enable;
+    #inherit (config.services.matrix-synapse) enable;
    environmentFile = config.sops.secrets.mautrix-telegram-environment.path;
    settings = {
      homeserver = {
--- a/nixos/servers/matrix/telegram.yaml
+++ b/nixos/servers/matrix/telegram.yaml
@ -9,42 +9,87 @@ sops:
        - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoMnd1ZW9RNDdLeno4SGJC
-            QlBldUMyb0I3R2FnWVFCL3VDWENqalhBb2o0CmdHWVprVHl4cGhtbDJ3TWNINGdl
-            cHlKVWxNRkFBQTNJQm5lRjUwdlk1aTgKLS0tIHdnd3ROaDVPdE5GZHF5M2VJNnRs
-            N3ZzdTYvb1dRWGREdGpBeXFhZlViOG8Kz5LXrmv15SJO66Br1tFMHucah7VIbqh0
-            sYlfWvw2YOHlZROSjHtQSA8rvwvXdYUko6QxgLsXsE4jcwOy+9QP2g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyUjNNRlZUS09URW9nZFFu
+            eUlBWHZab0loaWd0YWM1c2lQNUE1V2xuV3drClhEZVp1a0c5bG1ZNTBHWlM4aGRn
+            Mk1JL1ZHTFpwdkVDM0k2dklwYXlhbDQKLS0tIEE1QSsvanVZVk5vMGtHUjNxZ2Jz
+            aHNzdjJTSE9zS2tuamQra1FoeE5IbEEK0rOUaPW4kT9QcCygkGHKvFbgXHkeBHO4
+            xc1EpOXhPnKg+Ng8bEKJbXfkx5z7Siqh+5TJB/BF/+Ez1MG+t2XJqQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSSUlxT0JjdE5CbWxESERw
+            MkFVSklYWFBPS0tEMzVlalpJQzBHQkFzNUJ3CnhXUDlIcitDblgrb0lzMDhyKzJE
+            NEJ0NmJaNU9NeHBxcUpKcUhyWVRtdXcKLS0tIFJncHZjRnMxbXg4ZTZ5SGtsdXJs
+            NGEvK2JUVkNud3hDU0xyYytCby9iVEkKfhp83sAUbzeBUfEb27HkDWs6nCPoe7s8
+            /rdPZnyMOoQIl4cOwDE6xXqbQ2tz02sbcUao66KQnIM3nFkLzfa5+A==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1nr0qds8w3gldmdvhwu0p6w2ys8f4sd0h3xy94h9dsafjzttaypxquzmswc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBscUtTeVlRb1ZKei82bHd0
-            TU5VUXQxWW9SenhEOHJtVG1ndWNVTGtLWGs4CjR6SXBlYzduSUVEZ1Y5eldYb28v
-            MDRNME5rT2pPbVpZRUNTY09PTGlBclEKLS0tIHFQY29td2NqUXh2c1RTSmY0STNS
-            dktRcWMxdEpVOTJNN3lBam1kZEhIYm8Kl3wo4mPpdz1Q2UyLxHxfFEWmpBo/gQxU
-            9LBzKX9SDcFEfFbR75zhmnRTvNb0Rm7GC4Y7Xa8Pvbkli6AeELmXDg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4MUVwTXp3SlJvbktBRHRR
+            S0t6ZVNLWU55K0RtT25LY2g1QVdMRUZPMGlVCis0elpsQXFWZ0xtRDZtdjNWbVB3
+            ZlVRcVpyckp0bmtndm1uQ28vSmdtQWcKLS0tIFlBYkxXaGZSQkZyN1R5S0twQ2lB
+            SlY5U0w2ZUQ5RnNoZWIzaXYzTkgyemMKMPKWO+sYyAkXB0bHiwf5MpeX7ILoxsPr
+            o8y8vPVP9rD6mY7Q9+bhNXyeEdTr6+ptUskC40AWpWerPLCz5wHKPg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJbjI5QUExWThLL3FBVGFr
+            N1pYQWwxQkIwNGx3MitsSHFmOTRMS1AzeVVrCjRNeHFLbFptL2FUTnBzNnZqR3BV
+            ZXl5SzlwRjhkaTl2QURQTmVJKzJ0cUEKLS0tIFMzdzkzZEpiVjNUOU5ZSkFldlNz
+            VWZTNTcyT0VsT29KMm03RUl2bllibDQKA/UzD87nBh9Z3WoZhFSqMa6lubvWS7T3
+            o3qLoRMOvzmP9KjlxnOS5wOPc7V2iYilP4FnY/h24YOtPfjrwSKv0A==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5SkZLY2cxbkh4TVNpT3A5
+            N2FTbGUwOGprU2xDKzRJQ2VCcEljRE1tb1dRCkxNeVRpYnl4MC9TdlF0MlZkYjdR
+            UjVWTnR6TDdSSnZGbjZueXdOUXh6Zm8KLS0tIGFWMmdMaHhRUTJoQmNHbDZPckdV
+            c3MyQWllNkhnL1plak5NTVFQM1YvS1UKNy8eMl3fk1hgQqTbQvlPmb6w+R47YKbJ
+            Oat1wO5lAkkszXF+DfWaWDdDB9Owz8fq4jV+vNoJ31bwIARw81nItQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyclhhUUxicHJ0dzdQQXZl
+            eUtPWmZ0ZHFkR1h0UHB6Z0RWNkFEWnRrTUJJCjZ4d2JSYmdaeWlQMDB0QWVIanUz
+            Rnl1L1ZqZnR5SHVpUFlaR0FvQmloK3MKLS0tIHNPbHZNc21DbWw3V2E2eUd5S0Jp
+            V3h1RTBSKzdJZ3BXMTUwWjhlTTlyTG8KbgDmrQvf0sMGUteFLMGjIp/Z/v9xysLc
+            MRArAbw7iysjrCeBbwDxZKnglygpqT3lbzsflx1mPKXPHLonCpFmmg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkaENVN0Fma1ZZUzV1eTlv
+            RDc0WEM0b2FKY2JDVUlPd0JPY2JaaC9zRkF3CmtaTGZKM3ZaYzRQNE9OT3RpUTla
+            TlU0UXRwOUppdWlQVDZNMFBJS0s4L2MKLS0tIENZVXNmVXBydWMyMFhwamM4Tmly
+            QlUwYjUyNGMyT3BoSG9uMVVTOHhwMmMKku+m7l7WkzkJ37PzYDRuGpL2iQ4TSvEM
+            3JLLpVuiZnRXHG6Y8Z0Aw/YerNrP4n34ZKLCglqCYMfY4RX0FduEaA==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2024-04-21T21:17:03Z"
    mac: ENC[AES256_GCM,data:FxmPFJXQ1oCFA7K3bXuAcKDDCzDQpVsVSZksz9NHw3p7J5kKNy/M3PulXJdlC8pw5NbtK8nLlYP6mcjgSRICaXXUbked13gDD2bbB6DrjcXjhes5ccwcPOb4kLuUcTgGJ8q5BSD3isLOO31E4RZHmX10F8lJLPqR5whoDs3IajE=,iv:FExSdR/+CdFkcP2V6C7n4NgvbdibRol3lTVBjUlhWWE=,tag:nSHHoo/ykTzZNZlXDePW5g==,type:str]
    pgp:
-        - created_at: "2024-04-21T20:44:52Z"
+        - created_at: "2024-10-13T15:38:14Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA82M54yws73UAQ//bj8ST8QZfc7WPOpSv5CtYa10jaKt3XwLMeFvOuY/5F6Y
-            K/LnSbkv1W55Cpi+XwRBDmfVDSnIGtx3a3+K5QPQbQfvj5csd94SmNrVDh4gSrLo
-            7uz84uTf6KuL535+JrGNeEPqQHmSkHwaaBWATwWWSs7CbUg6hVbeGG6xveEKAQhB
-            ZxUUTceaL02NAqTsFqZ6poY2fcCWDUWBZTIwmH3/nFus2wIqvR0SrThg2TyypKAx
-            s7fwf1tJtPpl/XKvsC7ywFNBM5LYCfDyNz7qicHirCy7sbptoCoDNy1aIKMxbsEr
-            quDKEI9u/GicW7hymSI2b/CG/jRRdg218qZciiDf/HyB0/JsYZBnI6cVOpFqe7Fn
-            a0eAGp/ZS0p8VyrGd3T4G/0SX5jj1RxQ33J7t0Cso4Z3eZ6CwPkjQsmMi4g4jPjy
-            vKRVVi5rCkFFstMG6KzACCvv5yMIvVDqaKI+kNCxkCMZaHcQJsaGD4ibF1Ch78cc
-            7BsD5hXsVZwlXS+7OYWbvWqBSMTV9JXxrL/NkkKOt3fqS7yVQ1hyxl8wnLYULGcv
-            aeS1oIEy7diPLKXNmK6D2Ve7fM8tHEio5kdfJqM14kDaMWhBJcHlzta33Kupltn0
-            oxg58Vzrl1womxFOjuG7lU3ZYFCFhFhLak3rMlcaZk5MIkWqousIb9tj9AWLtCnS
-            XAExxNtxPDWHPnSgB44irxkGOvSJyRrhX1bww9Ax5MUzfjTDh+yghA/y60TDTkFD
-            xFoPVvPymnL3XPonbtyU8GXCYDf5K1vfThm7r+jTwVqRH1negthAn3vCju6C
-            =dL3u
+            hQIMA82M54yws73UAQ/+Kv4HQOCgLmNHLyODZBna3nCVUX4CHwBglOKQwixU9UyZ
+            I7XNT2SWc9HzrQJFKDtRV+5o9OjNf3UTOyUAM5H0UGN/9KLZX2KbqOrFNklgg+Lu
+            PnEUgAD7xgmie1ZAuiIaB5C5Mnjd0KmsClbFEdHekY/8vYpTDjyD3sZhyXRdcKBt
+            lakS3JUkGCjP/3Mf5spSy3D4pZ3sCzAurft+kwHPiOV+YExJZCLXZRatohjFhAUA
+            tsDxACMDDsejnCsXREUTRLjt3RBZX9m5K62dMvZUm4hqC4QLX7pFBjbermYzJFHc
+            27eksYh64zWP7b+CPL5dmtGf+prJMdl0hZWPzC2ZMi1DpfimEhgbYjPy2WNNYuY3
+            ACHXK5QLHw5AHHd1D71EOSk45W3PvUxqUUdXwJ+esxr+vfSf5bNU6y8DZj3EVzW1
+            mR3SE0JMYh7K1hoeFJzy90Omx4Sxu61qS1iHBHkkcFUrIpurMFTXoum66bpk8Hyq
+            OkHLcVj52kY5+Khx2fogwziAb0r3739WZB2JGXc/GNLa5yizRi3GEMZrUZPFizmx
+            osTorxDorL+KSIXHtV5K8Ws38DVanPlWFeAwxFHKFDnBfvwhK5rWOZiVqa/G7v+m
+            RtRv7FrWCjanH/0kFQU3t93hv0H4/qMYZ56P1gn5pFYhX6WGd8Czz0Yb3xfOtXXS
+            XAEBOyPmuMIbfJdm3chEyW4GM8hgT6CWM6GUVXtQjrKu54NZJTzUOOL6sMMmo2WZ
+            fcbR9P3tZItACVUBn4L5/kVM5l5n7HM7ibITR4TaDuMhuB7MN5oK5PlqiV/s
+            =qJB/
            -----END PGP MESSAGE-----
          fp: CD8CE78CB0B3BDD4
    unencrypted_suffix: _unencrypted
--- a/nixos/servers/matrix/whatsapp.yaml
+++ b/nixos/servers/matrix/whatsapp.yaml
@ -9,42 +9,87 @@ sops:
        - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRYWMwcEh0SVZKbWlybEp3
-            bjhYdFN5dmhHWDlJeTBNcWlOcCtzV1gxZGhJCnk2MnJjSlNOMitQR1NBVUdDRjdL
-            dXhoL2I1WUZWeDI0SGZINGVDWGxWdkEKLS0tIHkrdEJUbERLbjd6bndaSnFvTUxm
-            YWhFK2FNYWVRaDhndkdLYjV4QkhjaFkKl2x+nwGz7Zh3GqQBEAJ9nqTDzd4ZK1nG
-            PV9eJz6P9uSDDix0klyg5e/DDnw38OZZo9Sh04TVm6x0ehVCdz2L4A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwNXY1NjNvbFFjSW16TEZZ
+            ZCsyY0VORnVyTXNrSHczQWYyODBXbUUrMlJrCmZiMEgxVWFMZTVYMG91Q0pxQm1V
+            WEJuN1BYbWlDUVU1cDlhZFJlL1dZajAKLS0tIGZoRlFIeURLWnNobUZ3bmQvdmE3
+            dm1LTGhwTzRVeEV5UGsxYXpTd0xNUjAK42JAXCAunf2DtVTy62DzWHt+8aeK4iWX
+            TMrwT3713vnbZ0ihNCysXWTtQnjD6DbjJyEukxl3tp1pao/7RZx/jQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIdnNKbW9mcjNhZ0ZNTlRh
+            VHdjYVRkdHVUbE5GbWNUaFhiSEkreHBIQ1RZCjR1dUg3TVVES21sMlR5cmNhMGRq
+            MkxZOGdhZFBEbzVjQ3cvZ3kvRlBWaEUKLS0tIFBSWXdYUHhpU0lXc1R4RnhBNjFD
+            UlNwQjNxaFJDK1hUcXYxZ1gwUEhtbG8KztbM37ZIuPRgakP3IzMjvY06YFG87b0W
+            6Se4FNDjci0skTPWtfdraGmRj5K7GVBHtNpBqCp8ywTl1aV6O1eCZA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1nr0qds8w3gldmdvhwu0p6w2ys8f4sd0h3xy94h9dsafjzttaypxquzmswc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBETUE0ZHNZS3F3OC9oSERC
-            Z1ZxM0VwRkVEaXZsbE55bUM5Mk5JN0Y3OFhBCmxPc0RnQVozSTNmclZIVENJbVM2
-            WVVBcWRHeVY3M2VCUFJzSTNQclo3NWMKLS0tIDBiYUQ5LzRYRVRSdWdWWm5jRktJ
-            c1UySUtGYTc4R1hoeHZkUnV2eGRhU1UKK7OG7F4AGspRUxKlp9HBAIe5vtlZxHO3
-            hZ5qMO00qcNzeWaxrIP2R2I6yxEieGDsR8pgq+q1Ma8Y/uJiiW756A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXRFVTa1hvYlMrckpvUXo3
+            Mm9YM2xtY2lnZWdRajZRRXNhVldjYXpWWENjCk1ybmFQcW9WM0pTTjdRZ3B4eXJl
+            QndTUlUxZU9VWVE2N3RkOGYxaC9leFUKLS0tIFZkRGxydzI0bU9SOWs0MGF1bE1i
+            d3ZXRUZBME1DUnhyMEhTNGlXOS9VUjAKVJnAOi71+fzcObyj3OR0qYjSU56qbZlH
+            GrkO8B2FUgjqJgKJaMzlHjrDq0mlPcOT827K9+LNI2Y9lU90tVCijQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGUGNoWmsrV3JOUnRPZS95
+            YWlscjNNM1VTTE5mQ1JoQjJIUlJ4dGlDaUFZCmc4REVWMUxKNk13MFBzNk9IaHRR
+            SHl6RU40bW00RTZRdUk0YTROZXRkcjgKLS0tIFNFREFra2JNQnVXYnRhQWl3dGpP
+            TzRzaCt4alllR2d4N1ZOdnBJT05tQjgKhtmLG6ikrhJCVNHIjgAZKdirQT235vEv
+            BPStfI9nb4QW6JHUEj6NfiajnH3H1kfDAgX+IcqpgWGiCIKl4l8fxA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBVkZ0eEVQaUJaL1MyMEdL
+            TlVEZk1WaEhWVWVxWDdXYTVpcmswLzdFWWdFCndBN2VDRlV5R2h1ZkhTRks1WEdG
+            dDM0bHIza1duYURkOGNVeDQ1dE5CUGcKLS0tIG5ISjFaTHZhUkRMYmdFQW1ocXgv
+            VVZ4QmYzbDZNTWxoK2M5b2l4TjFDWVkKZBPKspz9m0vFJEJ34/0PbvFXVN2FlNKq
+            1jk162n0F3dyfePbqNQQzkd0aBFc+BoApCY9c/TnqhRvc7cf1caEFA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvODFYTDA5M0Y5YVB4aVpH
+            VDRxZWxJSllpdmJ6YmM1MU1rY0dSUzZnTmg4ClZTc3A4Lyt6ZHlPT3FBL3d0d1E3
+            SDhWbFBDd252VEh2TUJCbGFYTEtWaVUKLS0tIHFIVVJwU0NvRFY1bkhGbzREZXhi
+            MmFZcmY1UWRDSGhnSEJtaEdCbzBIQ3cKM9dunc/nEhqU0jaC5dT78bNFnz4qyPHF
+            Rhr2N36B0XE7jjyC8avcivvtMhPElYdGUuwFzXAhlC1/yD1v9FmRkw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDM0tmaWFPbUczdnU1Mk81
+            K040a2xJU2o2dmRKSmRyU1A4eFJ5YmxNQVVnClF0ajJKblpyMHljRWpibnU4Wks2
+            eUR2ak9FNmc3dEE1YzBkclRwS3FQRG8KLS0tIFJENjd5OStpQzZzOHM0MHFNQkJj
+            LzNCaHJ1Z0hRbUJLd2J0TFJSZjFVM00KPl9+sWncvcHqdDvdA4ys+tvYiuBXn7Qf
+            Sr3L1fER6t44zA4WOz81AoobWrYmHlVSaR4Dm/jutXzMqLN0nd/pWQ==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2024-04-21T22:01:48Z"
    mac: ENC[AES256_GCM,data:MWwXYxo4dC9XlJWA1Tnp0qBzt31E/UuYyIPtMZNjY5o+km0BZrxuGhFwewUadyRajk6vXhbMW2nOYCQBlEjiOENrUOO0sLAIdu8QC00bZ9c4UlSL/OZJosTUVvkFrE14Os697gYV2RNenFZS/+QyvAdiMgVjgNeLjBRj3nt9QBg=,iv:ZVVfiDkUpO9WeusJq91FSTtmhGXnX08WTNW3okqqKxo=,tag:ERe7uNv2p0WcZDwJnWCNpA==,type:str]
    pgp:
-        - created_at: "2024-04-21T22:01:11Z"
+        - created_at: "2024-10-13T15:38:15Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA82M54yws73UARAAvNJgY/53bCwRN4MNQa8mhx3+5xNWeiX33LVbUCrYK6YF
-            eI4bZ7xIlo14xGxY+aSqS4J7GWeMfLz24J3NhOFUO7O3J4gFE18+qdaWQ/7Q+Caa
-            /MVSk86qb0Ol3U8S4lERyUExjLokayWbokolx0LZ/uaVAPmEmLwCYBgJxM4Hw+81
-            YMmizVNUqe+QsClshxc+/bdeJom7WTuowtpRN4sZnqcXq4J/uYudpHCl/tXvggKf
-            lH0Q4E3BAumi3rjJU9S61bTreZRIUeromveUK/GDCW2mwX3RbF5Luy+Mr1P6QEuV
-            FOBHk2ln/9ZXd64qjn3UkrC5m8SkgNk9K6StJ0x8ZTGv6TYexvWY+43D9QWRsP4F
-            uSaqr8SarUFRIr4LwOWLdKjroL3rPsIe5kEMjNxTS2Gj1CZzD1ViqCfQUzW17LC3
-            iJQd8HgKvvUaK4vqoZfM9lId/JL1hxjzE8dwiIWdWJqlAGHHGEN4jgvSqm8Csuwc
-            BbpVV+voXZErZvrZv+GRg5/2ESQYqBgpjvz4y6JD9Yir9KCnr6pT3i9DT8IVi1YS
-            24HcG4aPw8gB2WSB9BUmCaYqvDTSNx6mPU2tDgk+PTUTlhgGQi4NHloAqYREN6/v
-            IuBF+DfJ66dQHji/0sZGHsr+zJJWCXbgtquvqwo+E3keKOowppAeNlgTqqQU2DXS
-            XAHBBhDoF0G5m3vRARohGks69OLBwgfwZRPfNucFyr0pIDvTurTE9jXVS8HiOaXj
-            Rg8QFm2oaRloq5Y+OtO/UgiIPzzUqn8HIw5VNTC4MnMqIr1Xotf1IZ2PNnz4
-            =IQHS
+            hQIMA82M54yws73UARAAyI1qT9LyyTlLcqysusvo3sutXDWEPmu+9iSD3f6OLdSk
+            I6fT7p2Q9GUbO6uBWwL5DoSNEAbd1/zywSBgPQHVTkDYwpfGREXJgyL9CDYAm7e9
+            ST/ImsCiVu9iuW7fDROIAC9pMCcBksCuzs3xmfBm8jVD/v0PoFHbT8A7KCbBe3me
+            MxaDprpXbfdeYont3f+iEcxkfuB1CULOAsAseuZyrUUdwekbZvmhLlb9YQgY/EFV
+            Dm98dsXTQ3B/nN75XqCF5dnEm3CXo9Mz4Hu32S32PqJt11mg2rML+vv5rbUmOHFF
+            9qbziNyrhVfUBJe/9tfwrKGvddZDEkWlMNTeGlmh9/pOBpZikZpGVGztOd+BYyEb
+            MAdEE0Uaaz9AUb8I8r1g6uVqPIskZXM/A7DehTWWrqML0rjXLFznFSSBsAbLizbL
+            gQ+9btxIf2ZvvfGY/5T7Y9u2+QWKs719AoiDQsBiWN4AkwlGM/ULyvrEiQ287GXl
+            EAKNbT1etmMveXPzZ1XYGUj9eduaqa0daClkg50hHbWP6V9Rk7zIocV9og2DJyH5
+            ttTYntBfAQo3bd04vAht9tj7R0e0+muzPCs/QbnRzQqyXQ1U9S6K+Oxm1hq4HtyM
+            tGIffhkM8fTj2MiosLDuHr3Uhu2F/O03z44LEo6G9KdFmtDjKzsi+b0sOjPSc5LS
+            XAE/BTlGX4FWlCjtnuzqsSkOXVVy5Pfu6GA6oUyhzgo0vR09pz237gRxllo7Dfd+
+            ZKE6wtcKbPPoXvU9bZP1haFKzUEeZu05FYEiiJ/BCpm9pRIkVVeLdrC15kXd
+            =2QwC
            -----END PGP MESSAGE-----
          fp: CD8CE78CB0B3BDD4
    unencrypted_suffix: _unencrypted
--- a/packages/synapse-cleanup/cleanup.sh
+++ b/packages/synapse-cleanup/cleanup.sh
@ -66,7 +66,7 @@ main() {

    send_discord_message "Cleaning up media store"
    curl --header "Authorization: Bearer ${API_ID}" -X POST \
-         "https://${HOMESERVER}/_synapse/admin/v1/media/delete?before_ts=${ts}"
+   "https://${HOMESERVER}/_synapse/admin/v1/media/delete?before_ts=${ts}&include_local=true"

    send_discord_message "Deleting empty rooms"
    while read -r room_id; do
--- a/systems/daiyousei.nix
+++ b/systems/daiyousei.nix
@ -16,6 +16,8 @@ _: let
      ])
      ++ (with tree.nixos.servers; [
        weechat
+        matrix
+        postgres
        web
      ]);

--- a/systems/yukari.nix
+++ b/systems/yukari.nix
@ -17,7 +17,6 @@ _: let
      ++ (with tree.nixos.servers; [
        web
        postgres
-        matrix
        public-directory
      ]);

@ -37,6 +36,7 @@ _: let
    fileSystems."/" = {
      device = "/dev/disk/by-uuid/5db295ec-a933-4395-b918-ebef6f95d8c3";
      fsType = "ext4";
+      autoResize = true;
    };

    swapDevices = [];