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

---
 .gitmodule       | 0
 .gitmodules      | 3 +++
 calendar         | 1 +
 vm-nextcloud.nix | 7 ++++---
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 .gitmodule
 create mode 100644 .gitmodules
 create mode 160000 calendar

diff --git a/.gitmodule b/.gitmodule
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..0845f03
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "calendar"]
+	path = calendar
+	url = https://github.com/nextcloud/calendar.git
diff --git a/calendar b/calendar
new file mode 160000
index 0000000..ac58a9b
--- /dev/null
+++ b/calendar
@@ -0,0 +1 @@
+Subproject commit ac58a9b16e4c9c24a42333bc2a76a63b159ca96e
diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix
index 9642a31..78aef12 100644
--- a/vm-nextcloud.nix
+++ b/vm-nextcloud.nix
@@ -6,6 +6,7 @@
         # Remove first run wizard and password policy check from Nextcloud
         # package
         nextcloud25 = super.nextcloud25.overrideAttrs (oldAttrs: rec {
+          src = ./server;
           installPhase = oldAttrs.installPhase + ''
             rm -r $out/apps/firstrunwizard
             rm -r $out/apps/password_policy
@@ -34,11 +35,11 @@
   # Mount our local development app repository into the VM
   nixos-shell.mounts.extraMounts = {
     "/var/lib/nextcloud/store-apps/calendar" = {
-      target = /home/onny/projects/calendar;
+      target = ./calendar;
       cache = "none";
     };
     "/var/lib/nextcloud/server" = {
-      target = /home/onny/projects/server;
+      target = ./server;
       cache = "none";
     };
   };
@@ -101,7 +102,7 @@
 
       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
+      #ln -fs /var/lib/nextcloud/config /var/lib/nextcloud/server/config
     '';
     serviceConfig = {
       Type = "oneshot";