From 1291d3c9f6aebc57b46e33f0f28249374712ee6b Mon Sep 17 00:00:00 2001
From: stuebinm <stuebinm@disroot.org>
Date: Thu, 10 Nov 2022 00:40:25 +0100
Subject: [PATCH] move nextcloud.nix to a sane location

---
 hosts/parsons/configuration.nix                   | 2 +-
 services/{nextcloud/default.nix => nextcloud.nix} | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename services/{nextcloud/default.nix => nextcloud.nix} (96%)

diff --git a/hosts/parsons/configuration.nix b/hosts/parsons/configuration.nix
index f44568c..14eb7eb 100644
--- a/hosts/parsons/configuration.nix
+++ b/hosts/parsons/configuration.nix
@@ -8,7 +8,7 @@
     modules.network.nftables modules.nftnat
     ((import sources.nix-hexchen) {}).profiles.nopersist
 
-    ../../services/nextcloud
+    ../../services/nextcloud.nix
     ../../services/mattermost.nix
     ../../services/thelounge.nix
     ../../services/murmur.nix
diff --git a/services/nextcloud/default.nix b/services/nextcloud.nix
similarity index 96%
rename from services/nextcloud/default.nix
rename to services/nextcloud.nix
index 5efe5b2..9595a7b 100644
--- a/services/nextcloud/default.nix
+++ b/services/nextcloud.nix
@@ -19,7 +19,6 @@
 
       imports = [
         ((import sources.nix-hexchen) {}).profiles.nopersist
-        ../../modules/nextcloud.nix
       ];
 
       nixpkgs.config.allowUnfree = true;
@@ -31,7 +30,7 @@
 
       environment.systemPackages = [ pkgs.htop ];
 
-      services.nextcloud-patched = {
+      services.nextcloud = {
         enable = true;
 
         # must be set manually; may not be incremented by more than one at
@@ -49,7 +48,7 @@
           dbname = "nextcloud";
           adminpassFile = "/persist/nextcloud/config/admin_pw";
           adminuser = "root";
-          defaultapp = "apporder";
+          # defaultapp = "apporder"; # TODO
         };
 
         # multiple pools may be doable using services.phpfpm.pools,