From 2f00e84a4bbb5915296563069a7116d482f628ac Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Mon, 13 Oct 2025 13:34:33 +0200
Subject: [PATCH] nixos/nextcloud-notify_push: remove not required mkMerge

---
 .../web-apps/nextcloud-notify_push.nix        | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud-notify_push.nix b/nixos/modules/services/web-apps/nextcloud-notify_push.nix
index ce4986b2cfa2..bf0e5a2e5989 100644
--- a/nixos/modules/services/web-apps/nextcloud-notify_push.nix
+++ b/nixos/modules/services/web-apps/nextcloud-notify_push.nix
@@ -159,27 +159,24 @@ in
       "::1" = [ cfgN.hostName ];
     };
 
-    services = lib.mkMerge [
-      {
-        nginx.virtualHosts.${cfgN.hostName}.locations."^~ /push/" = {
-          proxyPass = "http://unix:${cfg.socketPath}";
-          proxyWebsockets = true;
-          recommendedProxySettings = lib.mkDefault true;
-          extraConfig = # nginx
-            ''
-              # disable in case it was configured on a higher level
-              keepalive_timeout 0;
-              proxy_buffering off;
-            '';
-        };
-      }
-
-      (lib.mkIf cfg.bendDomainToLocalhost {
-        nextcloud.settings.trusted_proxies = [
+    services = {
+      nginx.virtualHosts.${cfgN.hostName}.locations."^~ /push/" = {
+        proxyPass = "http://unix:${cfg.socketPath}";
+        proxyWebsockets = true;
+        recommendedProxySettings = lib.mkDefault true;
+        extraConfig = # nginx
+          ''
+            # disable in case it was configured on a higher level
+            keepalive_timeout 0;
+            proxy_buffering off;
+          '';
+      };
+      nextcloud = {
+        settings.trusted_proxies = lib.mkIf cfg.bendDomainToLocalhost [
           "127.0.0.1"
           "::1"
         ];
-      })
-    ];
+      };
+    };
   };
 }