From a92800cbcc2fa4a96276f70b5255314950293aa6 Mon Sep 17 00:00:00 2001
From: Zuckerberg <zuckerberg@neet.dev>
Date: Sun, 19 Jun 2022 23:59:52 -0400
Subject: [PATCH] Update to NixOS 22.05

---
 common/default.nix               |  3 +++
 common/server/matrix.nix         | 34 +++++++++++++++++---------------
 common/server/thelounge.nix      |  2 +-
 machines/liza/configuration.nix  |  3 ---
 machines/ponyo/configuration.nix |  3 ---
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/common/default.nix b/common/default.nix
index cad8c5f..fdfee45 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -86,4 +86,7 @@ in {
       set fish_greeting
     '';
   };
+
+  security.acme.acceptTerms = true;
+  security.acme.default.email = "zuckerberg@neet.dev";
 }
diff --git a/common/server/matrix.nix b/common/server/matrix.nix
index d5f22cb..7651a67 100644
--- a/common/server/matrix.nix
+++ b/common/server/matrix.nix
@@ -59,23 +59,25 @@ in {
   config = lib.mkIf cfg.enable {
     services.matrix-synapse = {
       enable = true;
-      server_name = cfg.host;
-      enable_registration = cfg.enable_registration;
-      listeners = [ {
-        bind_address = "127.0.0.1";
-        port = cfg.port;
-        tls = false;
-        resources = [ {
-          compress = true;
-          names = [ "client" "federation" ];
+      settings = {
+        server_name = cfg.host;
+        enable_registration = cfg.enable_registration;
+        listeners = [ {
+          bind_addresses = ["127.0.0.1"];
+          port = cfg.port;
+          tls = false;
+          resources = [ {
+            compress = true;
+            names = [ "client" "federation" ];
+          } ];
         } ];
-      } ];
-      turn_uris = [
-        "turn:${cfg.turn.host}:${toString cfg.turn.port}?transport=udp"
-        "turn:${cfg.turn.host}:${toString cfg.turn.port}?transport=tcp"
-      ];
-      turn_shared_secret = cfg.turn.secret;
-      turn_user_lifetime = "1h";
+        turn_uris = [
+          "turn:${cfg.turn.host}:${toString cfg.turn.port}?transport=udp"
+          "turn:${cfg.turn.host}:${toString cfg.turn.port}?transport=tcp"
+        ];
+        turn_shared_secret = cfg.turn.secret;
+        turn_user_lifetime = "1h";
+      };
     };
 
     services.coturn = {
diff --git a/common/server/thelounge.nix b/common/server/thelounge.nix
index 155d423..7914411 100644
--- a/common/server/thelounge.nix
+++ b/common/server/thelounge.nix
@@ -23,7 +23,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     services.thelounge = {
-      private = true;
+      public = false;
       extraConfig = {
         reverseProxy = true;
         maxHistory = -1;
diff --git a/machines/liza/configuration.nix b/machines/liza/configuration.nix
index 3242a5c..7f665eb 100644
--- a/machines/liza/configuration.nix
+++ b/machines/liza/configuration.nix
@@ -107,7 +107,4 @@
     enableACME = true;
     forceSSL = true;
   };
-
-  security.acme.acceptTerms = true;
-  security.acme.email = "zuckerberg@neet.dev";
 }
diff --git a/machines/ponyo/configuration.nix b/machines/ponyo/configuration.nix
index 1857fe4..4bee05e 100644
--- a/machines/ponyo/configuration.nix
+++ b/machines/ponyo/configuration.nix
@@ -163,7 +163,4 @@
       rewrite ^/(.*)$ https://github.com/GoogleBot42 redirect;
     '';
   };
-
-  security.acme.acceptTerms = true;
-  security.acme.email = "zuckerberg@neet.dev";
 }
\ No newline at end of file