From 471e943c6e52f68537f06768acaa47bdefd55d80 Mon Sep 17 00:00:00 2001
From: "xyno (Philipp Hochkamp)" <git@xyno.systems>
Date: Fri, 25 Aug 2023 22:23:38 +0200
Subject: [PATCH] matrix: enabled sliding sync for xyno.space

---
 hosts/picard/xynospace-matrix.nix  | 25 +++++++++++++++++++++++++
 nixos-modules/services/synapse.nix | 25 -------------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/hosts/picard/xynospace-matrix.nix b/hosts/picard/xynospace-matrix.nix
index 7fff7de1..de65fc3a 100644
--- a/hosts/picard/xynospace-matrix.nix
+++ b/hosts/picard/xynospace-matrix.nix
@@ -26,6 +26,31 @@ in
   networking.nat.externalInterface = "ens3";
   networking.firewall.trustedInterfaces = [ "ve-+" ];
 
+  users.users.slidingsync = { isSystemUser = true; group = "slidingsync"; uid = 990; };
+  users.groups.slidingsync = { gid = 988; };
+  virtualisation.oci-containers.containers."matrix-sliding-sync" = {
+    image = "ghcr.io/matrix-org/sliding-sync:latest";
+    ports = [ "127.0.0.1:8009:8008" ];
+    user = "${toString config.users.users.slidingsync.uid}:${toString config.users.groups.slidingsync.gid}";
+    volumes = [
+      "/run/postgresql:/run/postgresql"
+    ];
+    environmentFiles = [ config.age.secrets.picardSlidingSyncSecret.path ];
+    environment = {
+      SYNCV3_SERVER = "https://${fqdn}";
+      SYNCV3_BINDADDR = ":8008";
+      SYNCV3_DB = "host=/run/postgresql user=slidingsync dbname=slidingsync password=slidingsync";
+    };
+  };
+  services.postgresql = {
+    ensureDatabases = [ "slidingsync" ];
+    ensureUsers = [
+      {
+        name = "slidingsync";
+        ensurePermissions."DATABASE slidingsync" = "ALL PRIVILEGES";
+      }
+    ];
+  };
   containers.xynospace-matrix = let ms = config.age.secrets.matrixSecrets.path; in {
     config = { config, pkgs, ... }: {
       system.stateVersion = stateVer;
diff --git a/nixos-modules/services/synapse.nix b/nixos-modules/services/synapse.nix
index bcecb39f..48074618 100644
--- a/nixos-modules/services/synapse.nix
+++ b/nixos-modules/services/synapse.nix
@@ -47,32 +47,8 @@ in
       ];
 
 
-    };
-    ragon.agenix.secrets."matrixSecrets" = { owner = "matrix-synapse"; };
-    users.users.slidingsync = { isSystemUser = true; group = "slidingsync"; uid = 990; };
-    users.groups.slidingsync = { gid = 988; };
-    virtualisation.oci-containers.containers."matrix-sliding-sync" = {
-      image = "ghcr.io/matrix-org/sliding-sync:latest";
-      ports = [ "127.0.0.1:8009:8008" ];
-      user = "${toString config.users.users.slidingsync.uid}:${toString config.users.groups.slidingsync.gid}";
-      volumes = [
-        "/run/postgresql:/run/postgresql"
-      ];
-      environmentFiles = [ config.age.secrets.picardSlidingSyncSecret.path ];
-      environment = {
-        SYNCV3_SERVER = "https://m.ragon.xyz";
-        SYNCV3_BINDADDR = ":8008";
-        SYNCV3_DB = "host=/run/postgresql user=slidingsync dbname=slidingsync password=slidingsync";
-      };
     };
     services.postgresql = {
-      ensureDatabases = [ "slidingsync" ];
-      ensureUsers = [
-        {
-          name = "slidingsync";
-          ensurePermissions."DATABASE slidingsync" = "ALL PRIVILEGES";
-        }
-      ];
       enable = true;
     };
     services.postgresql.initialScript = pkgs.writeText "synapse-init.sql" ''
@@ -117,7 +93,6 @@ in
               "m.homeserver" = { "base_url" = "https://${fqdn}"; };
               "m.identity_server" = { "base_url" = "https://vector.im"; };
               "im.vector.riot.jitsi" = { "preferredDomain" = "jitsi.${domain}"; };
-              "org.matrix.msc3575.proxy" = { "url" = "https://slidingsync.${domain}"; };
             };
             # ACAO required to allow element-web on any URL to request this json file
           in