From 030d344ea2fd956ac00f0c71bf8a6b0216d8bf0c Mon Sep 17 00:00:00 2001
From: beatzaplenty <wayne.bennett@live.com>
Date: Wed, 1 Jul 2026 20:58:19 +1000
Subject: [PATCH] moved docker data mounts into one module

---
 hosts/docker/configuration.nix |  6 ++---
 hosts/server/configuration.nix |  1 +
 modules/nix/docker-data.nix    | 40 ++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 modules/nix/docker-data.nix

diff --git a/hosts/docker/configuration.nix b/hosts/docker/configuration.nix
index 074cf45..fa3d670 100644
--- a/hosts/docker/configuration.nix
+++ b/hosts/docker/configuration.nix
@@ -17,9 +17,9 @@ in
       ../../common/configuration.nix
       ../../modules/nix/cache-client.nix
       ../../modules/nix/remote-builder-client.nix
-      ../../modules/nix/mount-docker-config.nix
-      ../../modules/nix/mount-docker-volumes.nix
-      ../../modules/nix/mount-docker-databases.nix
+#      ../../modules/nix/mount-docker-config.nix
+#      ../../modules/nix/mount-docker-volumes.nix
+      ../../modules/nix/docker-data.nix
     ];
 
 # nixpkgs.config.permittedInsecurePackages = [
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index a66363e..2e12eb6 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -55,6 +55,7 @@ services.nfs.server = {
     /tank/docker/config 192.168.2.0/24(rw,sync,no_subtree_check,no_root_squash)
     /tank/docker/volumes 192.168.2.0/24(rw,sync,no_subtree_check,no_root_squash)
     /tank/docker/databases 192.168.2.0/24(rw,sync,no_subtree_check,no_root_squash)
+    /tank/docker/nextcloud-data 192.168.2.0/24(rw,sync,no_subtree_check,no_root_squash)
     '';
 };
 
diff --git a/modules/nix/docker-data.nix b/modules/nix/docker-data.nix
new file mode 100644
index 0000000..c165c08
--- /dev/null
+++ b/modules/nix/docker-data.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, ... }:
+
+{
+  fileSystems."/mnt/docker-config" = {
+    device = "server:/tank/docker/config";
+    fsType = "nfs";
+
+    options = [
+      "nfsvers=4.2"
+      "_netdev"
+      "x-systemd.automount"
+      "noatime"
+    ];
+  };
+
+  fileSystems."/mnt/docker-databases" = {
+    device = "server:/tank/docker/databases";
+    fsType = "nfs";
+
+    options = [
+      "nfsvers=4.2"
+      "_netdev"
+      "x-systemd.automount"
+      "noatime"
+    ];
+  };
+
+  fileSystems."/mnt/docker-volumes" = {
+    device = "server:/tank/docker/volumes";
+    fsType = "nfs";
+
+    options = [
+      "nfsvers=4.2"
+      "_netdev"
+      "x-systemd.automount"
+      "noatime"
+    ];
+  };
+
+}