Add registration script to matrix-synapse module

flake.lock: Update
Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/786965e1b1ed3fd2018d78399984f461e2a44689' (2024-07-11) → 'github:nix-community/disko/bad376945de7033c7adc424c02054ea3736cf7c4' (2024-07-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/f12ee5f64c6a09995e71c9626d88c4efa983b488' (2024-07-12) → 'github:NixOS/nixpkgs/53e81e790209e41f0c1efa9ff26ff2fd7ab35e27' (2024-07-14) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9' (2024-07-12) → 'github:NixOS/nixpkgs/693bc46d169f5af9c992095736e82c3488bf7dbb' (2024-07-14) • Updated input 'nixvim': 'github:nix-community/nixvim/2c52164a4f1b863f5eda842b4b9423b7f2677ddc' (2024-07-08) → 'github:nix-community/nixvim/eef2f4c6b190d92e296e47e5fe10e7ced65fd959' (2024-07-15) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/2b6bd3c87d3a66fb0b8f2f06c985995e04b4fb96' (2024-07-08) → 'github:cachix/git-hooks.nix/622291c026190caf13cb26f5136616b1ff0a07aa' (2024-07-15) • Updated input 'nixvim/nix-darwin': 'github:lnl7/nix-darwin/0f89b73f41eaa1dde67b291452c181d9a75f10dd' (2024-07-07) → 'github:lnl7/nix-darwin/5ce8503cf402cf76b203eba4b7e402bea8e44abc' (2024-07-13) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/6fc8bded78715cdd43a3278a14ded226eb3a239e' (2024-07-08) → 'github:numtide/treefmt-nix/b92afa1501ac73f1d745526adc4f89b527595f14' (2024-07-14) • Updated input 'plasma-manager': 'github:nix-community/plasma-manager/809d86d6a8a48b6d71b6ece05eeb5e55f554b396' (2024-07-13) → 'github:nix-community/plasma-manager/460b48dc3dcd05df568e27cbb90581d23baec8dc' (2024-07-14) • Updated input 'thunderbird-gnome-theme': 'github:rafaelmardojai/thunderbird-gnome-theme/8641c999d3ae48da638ff597faba1da816ca5fc0' (2024-07-14) → 'github:rafaelmardojai/thunderbird-gnome-theme/8d022af89a8e2014bdf658ada5b0f0f2b6fcd71f' (2024-07-14)
2024-07-15 19:33:34 +01:00 · 2024-07-15 13:24:45 +01:00 · 2024-07-15 13:23:35 +01:00
2 changed files with 40 additions and 35 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -108,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1720661479,
-        "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=",
+        "lastModified": 1721007199,
+        "narHash": "sha256-Gof4Lj1rgTrX59bNu5b/uS/3X/marUGM7LYw31NoXEA=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "786965e1b1ed3fd2018d78399984f461e2a44689",
+        "rev": "bad376945de7033c7adc424c02054ea3736cf7c4",
        "type": "github"
      },
      "original": {
@@ -252,11 +252,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1720450253,
-        "narHash": "sha256-1in42htN3g3MnE3/AO5Qgs6pMWUzmtPQ7s675brO8uw=",
+        "lastModified": 1721038330,
+        "narHash": "sha256-DyIGJ+DEnKeGd346YJCwjmp9hXwiYq8wqGtikgbDqSc=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "2b6bd3c87d3a66fb0b8f2f06c985995e04b4fb96",
+        "rev": "622291c026190caf13cb26f5136616b1ff0a07aa",
        "type": "github"
      },
      "original": {
@@ -392,11 +392,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1720337362,
-        "narHash": "sha256-9TNQtlwu97NPaJYsKkdObOsy0MLN4NAOBz0pqwH3KnA=",
+        "lastModified": 1720845312,
+        "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "0f89b73f41eaa1dde67b291452c181d9a75f10dd",
+        "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc",
        "type": "github"
      },
      "original": {
@@ -478,11 +478,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1720768451,
-        "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
+        "lastModified": 1720957393,
+        "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
+        "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
        "type": "github"
      },
      "original": {
@@ -509,11 +509,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1720823163,
-        "narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=",
+        "lastModified": 1720954236,
+        "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488",
+        "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
        "type": "github"
      },
      "original": {
@@ -536,11 +536,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1720472744,
-        "narHash": "sha256-BJf06/uE8XgjSqXB6ftabinqK+qaAmWA0dLxAfLrAjw=",
+        "lastModified": 1721045803,
+        "narHash": "sha256-dQGvOK+t45unF7DTp5bfO37hY0NkDUw6X3MH5CCTEAs=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "2c52164a4f1b863f5eda842b4b9423b7f2677ddc",
+        "rev": "eef2f4c6b190d92e296e47e5fe10e7ced65fd959",
        "type": "github"
      },
      "original": {
@@ -560,11 +560,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1720896694,
-        "narHash": "sha256-lKInIpVIrI4YOTwbaN6wwQ+EvhL/iVqKhpxcTj4kBhE=",
+        "lastModified": 1720992717,
+        "narHash": "sha256-8j1bZVfKT1vJ0e+U7NYRNBG+DdBj5C/tpwe5krxT4/4=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "809d86d6a8a48b6d71b6ece05eeb5e55f554b396",
+        "rev": "460b48dc3dcd05df568e27cbb90581d23baec8dc",
        "type": "github"
      },
      "original": {
@@ -671,11 +671,11 @@
    "thunderbird-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1720932823,
-        "narHash": "sha256-PGVH1Tw4M+6p1ShyDDxWH6VYlWh4SM8Omxo/zoSC3G8=",
+        "lastModified": 1720976955,
+        "narHash": "sha256-zW04svPauvuC2Jc8vlDGNW4ak1TkISb3r3tLOvMPVvc=",
        "owner": "rafaelmardojai",
        "repo": "thunderbird-gnome-theme",
-        "rev": "8641c999d3ae48da638ff597faba1da816ca5fc0",
+        "rev": "8d022af89a8e2014bdf658ada5b0f0f2b6fcd71f",
        "type": "github"
      },
      "original": {
@@ -692,11 +692,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1720436211,
-        "narHash": "sha256-/cKXod0oGLl+vH4bKBZnTV3qxrw4jgOLnyQ8KXey5J8=",
+        "lastModified": 1720930114,
+        "narHash": "sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "6fc8bded78715cdd43a3278a14ded226eb3a239e",
+        "rev": "b92afa1501ac73f1d745526adc4f89b527595f14",
        "type": "github"
      },
      "original": {
--- a/modules/services/matrix-synapse/default.nix
+++ b/modules/services/matrix-synapse/default.nix
@@ -28,7 +28,7 @@ in {
      default = [];
      apply = bridges:
        if lib.all (bridge: lib.elem bridge validBridges) bridges
-        then bridges
+        then lib.map (b: "mautrix-${b}") bridges
        else throw "Invalid bridge(s) specified. Valid bridges are: ${lib.concatStringsSep ", " validBridges}";
    };
    serverName = lib.mkOption {
@@ -43,11 +43,15 @@ in {
  };

  config = let
+    mkBridgeDatabase = bridge: {
+      name = bridge;
+      ensureDBOwnership = true;
+    };
    commonBridgeSettings = bridge: {
      appservice = {
        database = lib.mkIf cfg.usePostgresql {
          type = "postgres";
-          uri = "postgresql:///mautrix-${bridge}?host=/run/postgresql";
+          uri = "postgresql:///${bridge}?host=/run/postgresql";
        };
      };
      bridge = {
@@ -163,6 +167,7 @@ in {

    services.matrix-synapse = {
      enable = true;
+      enableRegistrationScript = true;
      settings = {
        database.name = (if cfg.usePostgresql then "psycopg2" else "sqlite3");
        enable_metrics = false;
@@ -179,18 +184,18 @@ in {
          name = "matrix-synapse";
          ensureDBOwnership = true;
        }
-      ];
+      ] ++ lib.map mkBridgeDatabase cfg.bridges;
      ensureDatabases = [
        "matrix-synapse"
-      ];
+      ] ++ cfg.bridges;
    };

-    services.mautrix-signal = lib.mkIf (lib.elem "signal" cfg.bridges) {
+    services.mautrix-signal = lib.mkIf (lib.elem "mautrix-signal" cfg.bridges) {
      enable = true;
-      settings = commonBridgeSettings "signal";
+      settings = commonBridgeSettings "mautrix-signal";
    };

-    services.mautrix-whatsapp = lib.mkIf (lib.elem "whatsapp" cfg.bridges) {
+    services.mautrix-whatsapp = lib.mkIf (lib.elem "mautrix-whatsapp" cfg.bridges) {
      enable = true;
      settings = {
        bridge = {
@@ -202,7 +207,7 @@ in {
          };
          mute_bridging = true;
        };
-      } // commonBridgeSettings "whatsapp";
+      } // commonBridgeSettings "mautrix-whatsapp";
    };
  };
 }