home/modules/gui.nix

@@ -281,10 +281,6 @@ config = lib.mkMerge [
     };
   };
 
-  nixpkgs.config.permittedInsecurePackages = [
-    "olm-3.2.16"
-  ];
-
   # some packages require a pointer theme
   home.pointerCursor.gtk.enable = true;
   home.pointerCursor.package = pkgs.vanilla-dmz;

system/hosts/nixmsi.nix

@@ -51,7 +51,6 @@
 
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
     "steam-original"
-    "steam-unwrapped"
   ];
   hardware = {
     opentabletdriver.enable = true;

system/hosts/router/metrics.nix

@@ -19,8 +19,7 @@ in {
     };
     unbound = {
       enable = true;
-      # controlInterface = "/run/unbound/unbound.ctl";
-      host = "unix:///run/unbound/unbound.ctl";
+      controlInterface = "/run/unbound/unbound.ctl";
       listenAddress = netAddresses.lan4;
       group = config.services.unbound.group;
     };

system/hosts/server/home.nix

@@ -283,7 +283,13 @@ in {
         job_name = "local_medium_freq";
         scrape_interval = "15m";
         static_configs = [ {
-          targets = [ "127.0.0.1:9548" "127.0.0.1:9198" "127.0.0.1:9173" ];
+          targets = [
+            "127.0.0.1:9548"
+            "127.0.0.1:9198"
+            (let cfg = config.services.matrix-appservice-discord.settings.metrics;
+              in "${lib.quoteListenAddr cfg.host}:${toString cfg.port}")
+            config.services.matrix-sliding-sync.settings.SYNCV3_PROM
+          ];
           labels.machine = "server";
         } ];
       }
@@ -367,6 +373,9 @@ in {
     host = "127.0.0.1";
     port = 9173;
   };
+  services.matrix-sliding-sync = {
+    settings.SYNCV3_PROM = "[::]:8011";
+  };
   services.matrix-synapse.settings = {
     enable_metrics = true;
     federation_metrics_domains = [ "matrix.org" ];

system/hosts/server/keycloak.nix

@@ -15,7 +15,7 @@ in {
       http-host = "127.0.0.1";
       http-port = 5739;
       https-port = 5740;
-      proxy-headers = "xforwarded";
+      proxy = "edge";
     };
   };
   services.nginx.virtualHosts."keycloak.${cfg.domainName}" = {

system/hosts/server/matrix.nix

@@ -11,6 +11,7 @@ let
   matrixClientJson = {
     "m.homeserver".base_url = "https://matrix.${cfg.domainName}";
     "m.identity_server".base_url = "https://vector.im";
+    "org.matrix.msc3575.proxy".url = "https://matrix.${cfg.domainName}";
   };
   matrixServerConfigResponse = ''
     add_header Content-Type application/json;
@@ -41,7 +42,8 @@ in {
     locations = {
       "= /.well-known/matrix/server".extraConfig = matrixServerConfigResponse;
       "= /.well-known/matrix/client".extraConfig = matrixClientConfigResponse;
-      "/".proxyPass = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}";
+      "~ ^/(_matrix(?!/maubot)|_synapse/client|$)".proxyPass = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}";
+      "~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/)".proxyPass = "http://${config.services.matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
     };
   };
 
@@ -112,4 +114,13 @@ in {
       }];
     };
   };
+
+  services.matrix-sliding-sync = {
+    enable = true;
+    environmentFile = "/secrets/sliding-sync/env";
+    settings = {
+      SYNCV3_BINDADDR = "[::]:8010";
+      SYNCV3_SERVER = "https://matrix.pavluk.org";
+    };
+  };
 }