From 6d2cc86b65f79449263ee265d9899d6aa7d051fe Mon Sep 17 00:00:00 2001
From: David Crompton <davidcrompton@duck.com>
Date: Mon, 23 Mar 2026 21:14:39 -0400
Subject: [PATCH] hippocampus: fix: mautrix-discord misc

---
 machines/hippocampus/configuration.nix              |  1 +
 .../servers/public/matrix/bots/discord.nix          | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/machines/hippocampus/configuration.nix b/machines/hippocampus/configuration.nix
index b5148d6..f37c782 100644
--- a/machines/hippocampus/configuration.nix
+++ b/machines/hippocampus/configuration.nix
@@ -39,6 +39,7 @@
   nixpkgs.config.permittedInsecurePackages = [
     "nodejs-14.21.3"
     "openssl-1.1.1w"
+    "olm-3.2.16"
   ];
   nix.gc = {
     automatic = true;
diff --git a/machines/hippocampus/servers/public/matrix/bots/discord.nix b/machines/hippocampus/servers/public/matrix/bots/discord.nix
index 2169762..7bf7010 100644
--- a/machines/hippocampus/servers/public/matrix/bots/discord.nix
+++ b/machines/hippocampus/servers/public/matrix/bots/discord.nix
@@ -9,11 +9,12 @@ in {
     ensureDatabases = [
       mautrix-discord-user
     ];
-    ensureUsers = {
-      "${mautrix-discord-user}" = {
+    ensureUsers = [
+      {
+        name = "${mautrix-discord-user}";
         ensureDBOwnership = true;
-      };
-    };
+      }
+    ];
   };
   services.mautrix-discord = {
     enable = true;
@@ -367,7 +368,7 @@ in {
       };
       appservice = {
         # The address that the homeserver can use to connect to this appservice.
-        address = "http://localhost:${config.services.mautrix-discord.settings.appservice.port}";
+        address = "http://localhost:${toString config.services.mautrix-discord.settings.appservice.port}";
 
         # The hostname and port where this appservice should listen.
         hostname = "0.0.0.0";
@@ -430,7 +431,7 @@ in {
   services.caddy.virtualHosts = {
     "${config.services.mautrix-discord.settings.bridge.direct_media.server_name}" = {
       extraConfig = ''
-        reverse_proxy localhost:${config.services.mautrix-discord.settings.appservice.port}
+        reverse_proxy localhost:${toString config.services.mautrix-discord.settings.appservice.port}
       '';
     };
   };