From a8d300cada5c7e873f886c061fe1467e719a43da Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 30 Dec 2022 18:42:08 +0100
Subject: [PATCH] add submodules

---
 .gitmodule       |  0
 vm-nextcloud.nix | 14 ++++----------
 2 files changed, 4 insertions(+), 10 deletions(-)
 create mode 100644 .gitmodule

diff --git a/.gitmodule b/.gitmodule
new file mode 100644
index 0000000..e69de29
diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix
index 1632180..9642a31 100644
--- a/vm-nextcloud.nix
+++ b/vm-nextcloud.nix
@@ -24,13 +24,6 @@
       adminuser = "admin";
       adminpassFile = "${pkgs.writeText "adminpass" "test123"}";
     };
-    extraApps = {
-      circles = pkgs.fetchNextcloudApp rec {
-        url = "https://github.com/nextcloud-releases/circles/releases/download/0.21.4/circles-0.21.4.tar.gz";
-        sha256 = "sha256-gkW9jZvXS86ScuM434mUbvQajYKwHVjm9PfTMNgHL/Q=";
-      };
-      mail = pkgs.nextcloud25Packages.apps.mail;
-    };
     extraOptions = {
       mail_smtpmode = "sendmail";
       mail_sendmailmode = "pipe";
@@ -105,6 +98,10 @@
       ${config.services.nextcloud.occ}/bin/nextcloud-occ user:setting admin settings email "admin@localhost"
 
       ${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable calendar
+
+      rm /var/lib/nextcloud/apps
+      ln -s /var/lib/nextcloud/server/apps /var/lib/nextcloud/apps
+      ln -fs /var/lib/nextcloud/config /var/lib/nextcloud/server/config
     '';
     serviceConfig = {
       Type = "oneshot";
@@ -114,9 +111,6 @@
     wantedBy = [ "multi-user.target" ];
   };
 
-  # FIXME debugging
-  environment.systemPackages = [ pkgs.php82 ];
-
   system.stateVersion = "21.11";
 
   documentation.info.enable = false;