From cfe1f1d1e2f01bbda267e8204763d0c949b899b5 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Fri, 5 Jan 2024 04:35:04 +0000
Subject: [PATCH] fix: nextcloud apps routing 404s

due to: https://github.com/NixOS/nixpkgs/commit/bae5e6516269cc804974ef2d5f494d46f7a012c1
---
 modules/nixos/services/nextcloud.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/nixos/services/nextcloud.nix b/modules/nixos/services/nextcloud.nix
index 97dd366..020275f 100644
--- a/modules/nixos/services/nextcloud.nix
+++ b/modules/nixos/services/nextcloud.nix
@@ -49,7 +49,10 @@
             handle = [
               {
                 handler = "vars";
-                root = config.services.nextcloud.package;
+                # Grab the webroot out of the written config
+                # The webroot is a symlinked combined Nextcloud directory
+                root =
+                  config.services.nginx.virtualHosts.${config.services.nextcloud.hostName}.root;
               }
               {
                 handler = "headers";
@@ -58,13 +61,6 @@
               }
             ];
           }
-          {
-            match = [{ path = [ "/nix-apps*" "/store-apps*" ]; }];
-            handle = [{
-              handler = "vars";
-              root = config.services.nextcloud.home;
-            }];
-          }
           # Reroute carddav and caldav traffic
           {
             match =