From b1ff58b3d999f12cf126927cf5c95e2d1c8e4d3d Mon Sep 17 00:00:00 2001
From: Amanda Graven <amanda@graven.dev>
Date: Sat, 3 Aug 2024 20:40:14 +0200
Subject: [PATCH] Upgrade nixpkgs to 24.05

---
 README.md                                   |  7 +++++++
 config/hosts/rudiger/services/nextcloud.nix |  7 +++++--
 config/hosts/wind/services/synapse.nix      | 10 +++++-----
 config/sources/nix/sources.json             | 20 ++++++++++----------
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index b9a9709..0388c24 100644
--- a/README.md
+++ b/README.md
@@ -18,3 +18,10 @@ Deploy by running the generated executable.
 ```sh
 $ ./result
 ```
+
+## Switching nixpkgs branch
+```sh
+cd config/sources
+niv modify nixpkgs -b nixos-xx.yy
+```
+
diff --git a/config/hosts/rudiger/services/nextcloud.nix b/config/hosts/rudiger/services/nextcloud.nix
index 96ecc98..940166a 100644
--- a/config/hosts/rudiger/services/nextcloud.nix
+++ b/config/hosts/rudiger/services/nextcloud.nix
@@ -4,7 +4,7 @@
 		enable = true;
 		hostName = "cloud.graven.dev";
 		https = true;
-		package = pkgs.nextcloud27;
+		package = pkgs.nextcloud29;
 		autoUpdateApps.enable = true;
 		maxUploadSize = "10G";
 		webfinger = true;
@@ -14,9 +14,12 @@
 			dbuser = "nextcloud";
 			dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
 			dbname = "nextcloud";
-			defaultPhoneRegion = "DK";
 			adminpassFile = builtins.toString config.secrets.files.nc_admin_pass.file;
 			adminuser = "root";
 		};
+		settings = {
+			default_phone_region = "DK";
+		};
+		phpOptions."opcache.interned_strings_buffer" = "23";
 	};
 }
diff --git a/config/hosts/wind/services/synapse.nix b/config/hosts/wind/services/synapse.nix
index 48cb0b0..8d4ab4d 100644
--- a/config/hosts/wind/services/synapse.nix
+++ b/config/hosts/wind/services/synapse.nix
@@ -5,11 +5,6 @@
     enable = true;
     withJemalloc = true;
     extraConfigFiles = [ config.secrets.files.synapse_extra_config.file ];
-    sliding-sync = {
-      enable = true;
-      settings.SYNCV3_SERVER = "https://graven.dev";
-      environmentFile = builtins.toString config.secrets.files.synapse_sliding_sync_env.file;
-    };
     settings = {
       server_name = "graven.dev";
       enable_registration = false;
@@ -71,5 +66,10 @@
       ];
     };
   };
+  services.matrix-sliding-sync = {
+    enable = true;
+    settings.SYNCV3_SERVER = "https://graven.dev";
+    environmentFile = builtins.toString config.secrets.files.synapse_sliding_sync_env.file;
+  };
 }
     
diff --git a/config/sources/nix/sources.json b/config/sources/nix/sources.json
index 546d71b..af306ef 100644
--- a/config/sources/nix/sources.json
+++ b/config/sources/nix/sources.json
@@ -17,22 +17,22 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7b49d3967613d9aacac5b340ef158d493906ba79",
-        "sha256": "1v8lddagjyjy4xm9l103qbqplh13hblkf030yc9r8760d1wzdibv",
+        "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
+        "sha256": "0598kqgr03zk3i6bzqsphs7l2vav83901h2gs7i1fh1rqzicq4nv",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixos-hardware/archive/7b49d3967613d9aacac5b340ef158d493906ba79.tar.gz",
+        "url": "https://github.com/NixOS/nixos-hardware/archive/14c333162ba53c02853add87a0000cbd7aa230c2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-23.11",
+        "branch": "nixos-24.05",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "25cf937a30bf0801447f6bf544fc7486c6309234",
-        "sha256": "1j5vs24bgy2arl342lrh3znc1pdz68kcjp2rpgy3sccpd9sibqqn",
+        "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b",
+        "sha256": "06490pn22x9xl4chfx12iwdgx7nlbn14v8x05rnv2y1nancljisl",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/25cf937a30bf0801447f6bf544fc7486c6309234.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/05405724efa137a0b899cce5ab4dde463b4fd30b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixus": {
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "Infinisil",
         "repo": "nixus",
-        "rev": "9becb43c79661b3f407c2fdb90e2ae1bc64b8c95",
-        "sha256": "1q34x4wsrd4g1h6vikrj1pqzv0gq2yr2kqiqvdy6bqr4pqffvdxj",
+        "rev": "0aa59229988b741006743de6a64952bda85a3905",
+        "sha256": "129pvwr38vadwnd70mzp2lyavr7h1yh8jjk347lqqchsl4107zjb",
         "type": "tarball",
-        "url": "https://github.com/Infinisil/nixus/archive/9becb43c79661b3f407c2fdb90e2ae1bc64b8c95.tar.gz",
+        "url": "https://github.com/Infinisil/nixus/archive/0aa59229988b741006743de6a64952bda85a3905.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }