From c3ad4e9485f3078769ad25c3f644f63f569e2981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.dev>
Date: Sat, 4 Jun 2022 08:35:58 +0100
Subject: [PATCH] Upgrade bolty to 22.05

---
 nixos/boxes/bolty/default.nix       |  1 -
 nixos/boxes/bolty/matrix-server.nix | 31 ++++++++++++++---------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/nixos/boxes/bolty/default.nix b/nixos/boxes/bolty/default.nix
index a87842be..e480bae0 100644
--- a/nixos/boxes/bolty/default.nix
+++ b/nixos/boxes/bolty/default.nix
@@ -6,7 +6,6 @@
     ../../server-security.nix
     ../../tailscale.nix
     ../cli.nix
-    ./homeassistant.nix
     ./matrix-server.nix
     ./nextcloud.nix
     ./print-server.nix
diff --git a/nixos/boxes/bolty/matrix-server.nix b/nixos/boxes/bolty/matrix-server.nix
index ca443e5c..ba7a33d4 100644
--- a/nixos/boxes/bolty/matrix-server.nix
+++ b/nixos/boxes/bolty/matrix-server.nix
@@ -12,23 +12,22 @@
 
   services.matrix-synapse = {
     enable = true;
-    server_name = "cyplo.dev";
-    enable_registration = false;
-    listeners = [{
-      port = 8008;
-      bind_address = "bolty.cyplo.github.beta.tailscale.net";
-      type = "http";
-      tls = false;
-      x_forwarded = true;
-      resources = [{
-        names = [ "client" "federation" ];
-        compress = false;
+    settings = {
+      server_name = "cyplo.dev";
+      listeners = [{
+        port = 8008;
+        bind_addresses = [ "bolty.cyplo.github.beta.tailscale.net" ];
+        type = "http";
+        tls = false;
+        x_forwarded = true;
+        resources = [{
+          names = [ "client" "federation" ];
+          compress = false;
+        }];
       }];
-    }];
-    app_service_config_files = [ ];
-    extraConfig = ''
-      experimental_features: { spaces_enabled: true }
-    '';
+      experimental_features = { spaces_enabled = true; };
+      enable_registration = false;
+    };
     package =
       inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".matrix-synapse;
   };