From c7d5cf033bb9678a5c20e77b6556d816a6e8e318 Mon Sep 17 00:00:00 2001
From: Amanda Graven <amanda@graven.dev>
Date: Wed, 6 Nov 2024 17:44:06 +0100
Subject: [PATCH 1/2] Disable sliding sync proxy

---
 config/hosts/wind/data/secrets/secrets.nix | Bin 1660 -> 1548 bytes
 config/hosts/wind/services/nginx.nix       |   4 ----
 config/hosts/wind/services/synapse.nix     |   5 -----
 3 files changed, 9 deletions(-)

diff --git a/config/hosts/wind/data/secrets/secrets.nix b/config/hosts/wind/data/secrets/secrets.nix
index 47c5c6e576357d396caf46ad06a23932484a0caf..d95a37cdb202d2b8128269925995f2641737b549 100644
GIT binary patch
literal 1548
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
ZoD$2+^7r>l)=2rF$%4B)#FjTP005|0^3VVP

literal 1660
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

diff --git a/config/hosts/wind/services/nginx.nix b/config/hosts/wind/services/nginx.nix
index ebafed1..48176d7 100644
--- a/config/hosts/wind/services/nginx.nix
+++ b/config/hosts/wind/services/nginx.nix
@@ -5,10 +5,6 @@
 			enableACME = true;
 			forceSSL = true;
 			locations."/".root = "/var/www/graven.dev/public";
-			locations."~ ^/(client|_matrix/client/unstable/org.matrix.msc3575/sync)" = {
-				proxyPass = "http://127.0.0.1:8009";
-				priority = 900;
-			};
 			locations."~ ^(\\/_matrix|\\/_synapse\\/client)" = {
 				proxyPass = "http://127.0.0.1:8008";
 				priority = 1000;
diff --git a/config/hosts/wind/services/synapse.nix b/config/hosts/wind/services/synapse.nix
index 8d4ab4d..c5899eb 100644
--- a/config/hosts/wind/services/synapse.nix
+++ b/config/hosts/wind/services/synapse.nix
@@ -66,10 +66,5 @@
       ];
     };
   };
-  services.matrix-sliding-sync = {
-    enable = true;
-    settings.SYNCV3_SERVER = "https://graven.dev";
-    environmentFile = builtins.toString config.secrets.files.synapse_sliding_sync_env.file;
-  };
 }
     

From 3d8655d208408a0462ca6902ead1a508ba2f6f20 Mon Sep 17 00:00:00 2001
From: Amanda Graven <amanda@graven.dev>
Date: Wed, 6 Nov 2024 17:44:33 +0100
Subject: [PATCH 2/2] Bump nixpkgs

---
 config/sources/nix/sources.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/sources/nix/sources.json b/config/sources/nix/sources.json
index 07bd927..c961849 100644
--- a/config/sources/nix/sources.json
+++ b/config/sources/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://github.com/nmattia/niv",
         "owner": "nmattia",
         "repo": "niv",
-        "rev": "e80fc8fae87cc91f449533fca6b9cadf8be69e6c",
-        "sha256": "024hnxvqk8z5n2n54rj05l91q38g9y8nwvrj46xml13kjmg4shb3",
+        "rev": "55422d6f2618cd2195eeafa3f16ae63fde723c15",
+        "sha256": "1s6m41hhsydf3lw6ihksc904vcpyd5agwiqq8hb8plyqvsyn74ba",
         "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/e80fc8fae87cc91f449533fca6b9cadf8be69e6c.tar.gz",
+        "url": "https://github.com/nmattia/niv/archive/55422d6f2618cd2195eeafa3f16ae63fde723c15.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-hardware": {
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb",
-        "sha256": "1grc0z1s4imnfy0xn17qg50lsy27d856l48zlk6k0nyhxmhsskrm",
+        "rev": "90642a0deae927fa911d49d4f7c5616257105141",
+        "sha256": "0y2vp5jvjn0bldnram5nw5rbiiky6crzkf2ix5m6qd1mcd26s9n0",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixos-hardware/archive/38279034170b1e2929b2be33bdaedbf14a57bfeb.tar.gz",
+        "url": "https://github.com/NixOS/nixos-hardware/archive/90642a0deae927fa911d49d4f7c5616257105141.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
-        "sha256": "0wmz8y0ac88r53jd61m83bp55h36hdxvdk848iiz1yg51n2qyf1c",
+        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
+        "sha256": "0nh2q19pcw3nccdsr3318zsbsdanfs6ckapi4wrnm4bxdmcbrnbr",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/4eb33fe664af7b41a4c446f87d20c9a0a6321fa3.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/d063c1dd113c91ab27959ba540c0d9753409edf3.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixus": {