From 6be3ce36b6287f03c758adbdd7d57ea582114b48 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Sun, 26 Jun 2022 14:27:03 -0400
Subject: [PATCH 1/3] nixos/nextcloud: use mkOption.default for datadir

---
 nixos/modules/services/web-apps/nextcloud.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index e0aaafd4633..221a77ad950 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -89,7 +89,8 @@ in {
     };
     datadir = mkOption {
       type = types.str;
-      defaultText = "config.services.nextcloud.home";
+      default = config.services.nextcloud.home;
+      defaultText = literalExpression "config.services.nextcloud.home";
       description = ''
         Data storage path of nextcloud.  Will be <xref linkend="opt-services.nextcloud.home" /> by default.
         This folder will be populated with a config.php and data folder which contains the state of the instance (excl the database).";
@@ -629,8 +630,6 @@ in {
           else nextcloud24
         );
 
-      services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home;
-
       services.nextcloud.phpPackage =
         if versionOlder cfg.package.version "24" then pkgs.php80
         # FIXME: Use PHP 8.1 with Nextcloud 24 and higher, once issues like this one are fixed:

From e54ddddd2a80a5897d45d2b4bd84e9bdd650d1cd Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Sun, 26 Jun 2022 14:29:59 -0400
Subject: [PATCH 2/3] nixos/nextcloud: make all services run after
 nextcloud-setup

---
 nixos/modules/services/web-apps/nextcloud.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 221a77ad950..d5bf8597f1b 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -649,6 +649,7 @@ in {
 
     { systemd.timers.nextcloud-cron = {
         wantedBy = [ "timers.target" ];
+        after = [ "nextcloud-setup.service" ];
         timerConfig.OnBootSec = "5m";
         timerConfig.OnUnitActiveSec = "5m";
         timerConfig.Unit = "nextcloud-cron.service";
@@ -839,12 +840,14 @@ in {
           serviceConfig.User = "nextcloud";
         };
         nextcloud-cron = {
+          after = [ "nextcloud-setup.service" ];
           environment.NEXTCLOUD_CONFIG_DIR = "${datadir}/config";
           serviceConfig.Type = "oneshot";
           serviceConfig.User = "nextcloud";
           serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${cfg.package}/cron.php";
         };
         nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable {
+          after = [ "nextcloud-setup.service" ];
           serviceConfig.Type = "oneshot";
           serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all";
           serviceConfig.User = "nextcloud";

From d6f59779c60945aafa416c6e6b0fccb91e49f929 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Sun, 26 Jun 2022 14:30:59 -0400
Subject: [PATCH 3/3] nixos/nextcloud: remove extraneous nginx config directive

---
 nixos/modules/services/web-apps/nextcloud.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index d5bf8597f1b..2130ec252d9 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -916,7 +916,6 @@ in {
             priority = 100;
             extraConfig = ''
               allow all;
-              log_not_found off;
               access_log off;
             '';
           };