From f8dd1681aaee235f2bf89a6cc520ccd8e4b421d1 Mon Sep 17 00:00:00 2001
From: Tristan <tristan@tristans.cloud>
Date: Tue, 27 Feb 2024 17:49:27 +0000
Subject: [PATCH] remove matrix-synapse.sliding-sync warn and add nextcloud
 apps

---
 nixos/services/nextcloud.nix | 15 ++++++++++++++-
 nixos/services/synapse.nix   |  6 +++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/nixos/services/nextcloud.nix b/nixos/services/nextcloud.nix
index 51fce65..9694f16 100644
--- a/nixos/services/nextcloud.nix
+++ b/nixos/services/nextcloud.nix
@@ -36,7 +36,6 @@ in {
     };
     secretFile = sops.templates."nextcloud/secrets.json".path;
     settings = {
-      trusted_proxies = ["192.168.1.1" "127.0.0.1"];
       maintenance_window_start = 2;
       default_phone_region = "GB";
       # https://github.com/pulsejet/nextcloud-oidc-login
@@ -68,6 +67,20 @@ in {
       oidc_login_well_known_caching_time = 86400;
       datadirectory = "/mnt/storage/nextcloud";
     };
+    extraApps = {
+      inherit (config.services.nextcloud.package.packages.apps)
+        contacts calendar mail gpoddersync memories notes maps;
+      oidc_login = pkgs.fetchNextcloudApp {
+        sha256 = "sha256-cN5azlThKPKRVip14yfUNR85of5z+N6NVI7sg6pSGQI=";
+        url = "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.0.2/oidc_login.tar.gz";
+        license = "agpl3";
+      };
+      news = pkgs.fetchNextcloudApp {
+        sha256 = "sha256-aePXUn57U+1e01dntxFuzWZ8ILzwbnsAOs60Yz/6zUU=";
+        url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha4/news.tar.gz";
+        license = "agpl3";
+      };
+    };
     maxUploadSize = "5G";
   };
   services.nginx.virtualHosts.${nextcloud.hostName} = {
diff --git a/nixos/services/synapse.nix b/nixos/services/synapse.nix
index 9e727ec..d5256df 100644
--- a/nixos/services/synapse.nix
+++ b/nixos/services/synapse.nix
@@ -13,7 +13,7 @@
   '';
   port = 8008;
   inherit (config) sops;
-  inherit (config.services) matrix-synapse;
+  inherit (config.services) matrix-synapse matrix-sliding-sync;
   inherit (sops) secrets templates;
 in {
   services.postgresql.enable = true;
@@ -110,14 +110,14 @@ in {
       };
       locations."/_matrix".proxyPass = "http://localhost:${toString port}";
       locations."/_synapse/client".proxyPass = "http://localhost:${toString port}";
-      locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://${toString matrix-synapse.sliding-sync.settings.SYNCV3_BINDADDR}";
+      locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://${toString matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
     };
     ${fqdn} = {
       enableACME = true;
       forceSSL = true;
       locations."/_matrix".proxyPass = "http://localhost:${toString port}";
       locations."/_synapse/client".proxyPass = "http://localhost:${toString port}";
-      locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://${toString matrix-synapse.sliding-sync.settings.SYNCV3_BINDADDR}";
+      locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://${toString matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
     };
   };
 }