From 0ead32c4935d6dd7d6d6f25db93c6bf2bd91c844 Mon Sep 17 00:00:00 2001
From: Alexander Tomokhov <alexoundos@gmail.com>
Date: Wed, 15 Nov 2023 22:33:14 +0400
Subject: [PATCH] add nextcloud SP module

---
 flake.lock            | 20 +++++++++++++++++++-
 sp-modules/flake.lock | 28 +++++++++++++++++++++++-----
 sp-modules/flake.nix  |  4 ++--
 userdata.json         |  1 -
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8d3ecc6..259d2f1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -55,6 +55,23 @@
         "type": "gitlab"
       }
     },
+    "nextcloud": {
+      "locked": {
+        "dir": "sp-modules/nextcloud",
+        "lastModified": 1700072764,
+        "narHash": "sha256-Jy+bo5/0k0eZkvl/Dhjy5xTHnXUZmI9EaMyfW0g4+yk=",
+        "ref": "flakes",
+        "rev": "c590285ec38f1407f8da0b17dd7953e07badf1c1",
+        "revCount": 135,
+        "type": "git",
+        "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/nextcloud"
+      },
+      "original": {
+        "dir": "sp-modules/nextcloud",
+        "type": "git",
+        "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/nextcloud"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1686476475,
@@ -183,11 +200,12 @@
     },
     "sp-modules": {
       "inputs": {
+        "nextcloud": "nextcloud",
         "simple-nixos-mailserver": "simple-nixos-mailserver"
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-dUVXPMELn6HXgipTuZfGxTQzT+eyjK9XoYZDPgBhTcs=",
+        "narHash": "sha256-K1ADzSKkr+EyJ4m8ambNG5jXbFDa3Qobmszv+I6CHhQ=",
         "path": "./sp-modules",
         "type": "path"
       },
diff --git a/sp-modules/flake.lock b/sp-modules/flake.lock
index 4b452a9..70b18ba 100644
--- a/sp-modules/flake.lock
+++ b/sp-modules/flake.lock
@@ -55,6 +55,23 @@
         "type": "gitlab"
       }
     },
+    "nextcloud": {
+      "locked": {
+        "dir": "sp-modules/nextcloud",
+        "lastModified": 1700072764,
+        "narHash": "sha256-Jy+bo5/0k0eZkvl/Dhjy5xTHnXUZmI9EaMyfW0g4+yk=",
+        "ref": "flakes",
+        "rev": "c590285ec38f1407f8da0b17dd7953e07badf1c1",
+        "revCount": 135,
+        "type": "git",
+        "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/nextcloud"
+      },
+      "original": {
+        "dir": "sp-modules/nextcloud",
+        "type": "git",
+        "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/nextcloud"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1670751203,
@@ -102,6 +119,7 @@
     },
     "root": {
       "inputs": {
+        "nextcloud": "nextcloud",
         "simple-nixos-mailserver": "simple-nixos-mailserver"
       }
     },
@@ -111,13 +129,13 @@
       },
       "locked": {
         "dir": "sp-modules/simple-nixos-mailserver",
-        "lastModified": 1699821470,
-        "narHash": "sha256-I9jlfMzumsL13iM8si4XmJ1LBm/J3Z+9GbIA2VX/yIY=",
+        "lastModified": 1700008280,
+        "narHash": "sha256-/iy/smT1yyeNSYS9Ak8rhdvc7+JtZe08FNb3ggH+N1A=",
         "ref": "flakes",
-        "rev": "80ba7d0bdafe9aad124b2336fb145b9d7a25a239",
-        "revCount": 127,
+        "rev": "4419a1323adb05d542da1cd54c5dbfecb8aa2a77",
+        "revCount": 132,
         "type": "git",
-        "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config?dir=sp-modules/simple-nixos-mailserver"
+        "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/simple-nixos-mailserver"
       },
       "original": {
         "dir": "sp-modules/simple-nixos-mailserver",
diff --git a/sp-modules/flake.nix b/sp-modules/flake.nix
index 3a09f9e..47f19e8 100644
--- a/sp-modules/flake.nix
+++ b/sp-modules/flake.nix
@@ -1,8 +1,8 @@
 {
   description = "SelfPrivacy NixOS PoC modules/extensions/bundles/packages/etc";
 
-  inputs.simple-nixos-mailserver.url =
-    git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/simple-nixos-mailserver;
+  inputs.nextcloud.url = git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/nextcloud;
+  inputs.simple-nixos-mailserver.url = git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?dir=sp-modules/simple-nixos-mailserver;
 
   outputs = _: { };
 }
diff --git a/userdata.json b/userdata.json
index 00d3663..903496c 100644
--- a/userdata.json
+++ b/userdata.json
@@ -29,7 +29,6 @@
     "hostname": "meow-corp",
     "nextcloud": {
         "enable": true,
-        "adminPassword": "tMzoy1yEaBPcgVheoXUj11S5dVlC5I4TSFxr0pCHoeMvOV2YICYqFqFJne2SgbOFr6QxZTw6QGdYmCLW",
         "location": "sdb"
     },
     "gitea": {