move settings

1 files changed, 34 insertions, 33 deletions

diff --git a/host/Rory-synapse/configuration.nix b/host/Rory-synapse/configuration.nix

index 632d834..9af744b 100755
--- a/host/Rory-synapse/configuration.nix
+++ b/host/Rory-synapse/configuration.nix
@@ -100,17 +100,40 @@
       
       # Alicia - types: https://github.com/NixOS/nixpkgs/blob/release-22.11/nixos/modules/services/matrix/synapse.nix#L410
       listeners = [
-          { port = 8008;
-            bind_addresses = [ "192.168.1.5" ];
-            type = "http";
-            tls = false;
-            x_forwarded = true;
-            resources = [ {
-              names = [ "client" "federation" ];
-              compress = true;
-            } ];
-          }
-        ];
+        { 
+          port = 8008;
+          bind_addresses = [ "192.168.1.5" ];
+          type = "http";
+          tls = false;
+          x_forwarded = true;
+          resources = [ {
+            names = [ "client" "federation" ];
+            compress = true;
+          } ];
+        }
+      ];
+      dynamic_thumbnails = true;
+
+      presence = {
+        enable = true;
+        update_interval = 60;
+      };
+      url_preview_enabled = true;
+      
+
+      
+      database = {
+        name = "psycopg2";
+        args = {
+          user = "postgres";
+          passwordFile = "/run/secrets/matrix-synapse-password";
+          database = "matrix-synapse-rory-gay";
+          host = "192.168.1.3";
+        };
+      };
+      app_service_config_files = [
+        #"/etc/matrix-synapse/appservice-registration.yaml"
+      ];
     };
 
     plugins = with pkgs.matrix-synapse-plugins; [
@@ -118,29 +141,7 @@
       matrix-synapse-pam
     ];
 
-    dynamic_thumbnails = true;
-
-
-    presence = {
-      enable = true;
-      update_interval = 60;
-    };
-    url_preview_enabled = true;
-    
-
     
-    database = {
-      name = "psycopg2";
-      args = {
-        user = "postgres";
-        passwordFile = "/run/secrets/matrix-synapse-password";
-        database = "matrix-synapse-rory-gay";
-        host = "192.168.1.3";
-      };
-    };
-    app_service_config_files = [
-      #"/etc/matrix-synapse/appservice-registration.yaml"
-    ];
   };
 
   services.mjolnir = {