feat(modules/matrix-bridge): target Go mautrix-signal

2 files changed, 7 insertions, 13 deletions

diff --git a/modules/services/matrix-bridge.nix b/modules/services/matrix-bridge.nix
index b2c089f..a9d3c4f 100644
--- a/modules/services/matrix-bridge.nix
+++ b/modules/services/matrix-bridge.nix
@@ -86,12 +86,7 @@ in
 
     services.mautrix-signal = {
       enable = true;
-      package = pkgs.mautrix-signal.overrideAttrs (prev: {
-        propagatedBuildInputs = (lib.lists.remove pkgs.python3Packages.mautrix prev.propagatedBuildInputs) ++ [
-          # mautrix-signal wants <0.20, but nix supplies >=0.20
-          pkgs.python3Packages.mautrix_0_19
-        ];
-      });
+      package = pkgs.mautrix-signal;
 
       environmentFile = cfg.secrets.mautrix-envs;
       serviceDependencies = [ "matrix-synapse.service" ];
@@ -132,10 +127,9 @@ in
             require = true;
             allow_key_sharing = true;
           };
-          # NOTE: python bridge - managed via env variable
-          # login_shared_secret_map = {
-          #   "${cfg.domain}" = "as_token:$DOUBLE_PUPPET_AS_TOKEN";
-          # };
+          login_shared_secret_map = {
+            "${cfg.domain}" = "as_token:$DOUBLE_PUPPET_AS_TOKEN";
+          };
           permissions = {
             "@sef:exotic.sh" = "admin";
             "exotic.sh" = "full";
diff --git a/systems/cobalt/secrets/secrets.yaml b/systems/cobalt/secrets/secrets.yaml
index 14e0df2..ec5b6aa 100644
--- a/systems/cobalt/secrets/secrets.yaml
+++ b/systems/cobalt/secrets/secrets.yaml
@@ -8,7 +8,7 @@ matrix-shared-secret: ENC[AES256_GCM,data:Xv9pOMA/kUJUrYxdXRA7NTrbkFvVsA==,iv:J3
 synapse-extra-config: ENC[AES256_GCM,data:bJh9nMzZvP36Uwe7x03MLEk2N+FKq2V2YAFJT43vhMQ/XkvdN9yAeWhlxPGNEtl2wcMpCLnqbVAtfhJVI4VI5hGnue5HZz4Q51lbVQr2ZwzWuU6I25mY,iv:2qJuuyBlwgSWx5dkxGDbHhTW7ajI68lPgrvjdHmNTZ8=,tag:xRM6XGlitvcf+MrxBQ9GDw==,type:str]
 mjolnir-password: ENC[AES256_GCM,data:dyM2VVxn1PFRXy5dgfvq3EuWyGDhDZvJOd1sTnKE5q0Arv1y,iv:DD80um8QXLybj1w4ZsxPbv3+s2NrQfpPDAEpkztkMFo=,tag:3ZEJ7V+ICh2Ip5gZt06zjA==,type:str]
 #ENC[AES256_GCM,data:Qp2qzobiQ1q5JQboo9fRG/HUhyqoYEF4EmBd/DFt46Y9i4dCU+kbEHnqGOvb6zdOgAcIo1L/8Z4ZutGiRnvkJFnrbA6r/bf3LJOilLsVbg==,iv:TCj3cjZcLhHNVv6fDwx092D2YHRwIwaRj1Vuw56BYQs=,tag:gMAkM++w92fFwRrMv5AGLA==,type:comment]
-mautrix-envs: ENC[AES256_GCM,data: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,iv:KjkrFePP86nV3wGkaNhJvRnXcB+Jqkj1FncPxVTrOPQ=,tag:SbH6fcbB3x52FEfUs2DowA==,type:str]
+mautrix-envs: ENC[AES256_GCM,data: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,iv:1sve+pizjAp1CsGFoCjAvE/jJRH6SSUoXIkgwu/TsAM=,tag:nl00+myKsxjE+EUwD/xDuQ==,type:str]
 double-puppet-as-token: ENC[AES256_GCM,data:q7zsHsm9JvKfQkLxLZb44cuUse3+JdJKjC1Z8erAVaNZjDNvBzqHZv6hgWLnRvjD5htCOZyDk0cAdg17/wNWsA==,iv:KTUJsLfit9vXuVD8ba2QyCS1v7dRgDfgnrE+1nkHL5c=,tag:keLyl4TS2RQ6li07JCn+7A==,type:str]
 double-puppet-hs-token: ENC[AES256_GCM,data:iHIjy5pcjgVJF39XXj6WCdFslRmkLRnrCs95mjzmzRHCPEgWbmTqlqBuQVGIOkKhcyTZtflpC1D0/NtoBlmtFg==,iv:iDLvhGBABbgGSH9Q/FfgSMcw0srwL1KX6P87zAjn70k=,tag:pmTecoXSMVsRPZ5OhaD5Jg==,type:str]
 dendrite-envs: ENC[AES256_GCM,data:67FnrGQUZWFfHAoUM/idTZlBX7aek3fbPkswB9+3pjLNQuXpIWYoa2vpdGt7zec2n9o9z0V3LdlkookjS95aPpZmKYwPaKkH2L7Jaxw=,iv:c4lEReLizcQeTTiG7cJwd+2sBH+EKBGycKeoDgJ/394=,tag:zBBxIcXn+8Q90BkPidltfQ==,type:str]
@@ -45,8 +45,8 @@ sops:
             cUpBZ01CMEFjNnNuWjlYejVKajkwcGMKehqYCZP0zZHDTfJrC/5LYiE/3doa0OiM
             OKXhOuUX8HF8RfkyiOSMpntxuNX2jSvd9sQRYnHkUvgm793+IuQjrg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-12-22T14:57:57Z"
-    mac: ENC[AES256_GCM,data:l0dP/78qh+urLgW0ga+WOiOalGVXpaJv89PtWwmxAfPfIQ4zPfe3EnfCWqs65VZRD6ZAZXDVgHfrSn6htElAFCGY3Y5zw00+n7fXdAOQ5pahwA4FsJQy8yxS0XlRZ0HpIXpklbbhUp71Tq1m+0KCG+eBZg2MyIfsljlwHVuPiss=,iv:F/NM0f5xXYMOUSmwJ1GuJnIyGKjoqyNF9Rxfo765FTo=,tag:RM4OkjjkyibMfnpG5fxxsg==,type:str]
+    lastmodified: "2024-01-11T08:23:58Z"
+    mac: ENC[AES256_GCM,data:6eDImCPA4Nq/MizIFMiha4H5Mc38zPhBeA1WWh0ALAI46ynGHwTpGdw8dCTBliy0BfTJBvixS6Tz/3Wv5YMy944WmAIU686+o123btREObwlZwmdHU3Spiox59i2xchoe8S8a9W8wsPUx16M1rkcwPMaUnxyI7VBhYYeQJAMIx0=,iv:bJpnmYMef+wy4LjwBAoZQxGPmXMnyLKEci33S2VCs9Q=,tag:WtoKzjuyaCapKyDEyH/eoQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1