From ae4c3dba24ccfbc259845090d37aad72ca82c403 Mon Sep 17 00:00:00 2001
From: git <git@nix-config>
Date: Wed, 1 Jul 2026 16:59:55 +1000
Subject: [PATCH] updated config for new ZFS/NFS shares

---
 hosts/docker/configuration.nix       |  3 +++
 modules/nix/mount-docker-config.nix  | 14 ++++++++++----
 modules/nix/mount-docker-volumes.nix | 15 +++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 modules/nix/mount-docker-volumes.nix

diff --git a/hosts/docker/configuration.nix b/hosts/docker/configuration.nix
index 8877e20..9f28ff2 100644
--- a/hosts/docker/configuration.nix
+++ b/hosts/docker/configuration.nix
@@ -18,6 +18,7 @@ in
       ../../modules/nix/cache-client.nix
       ../../modules/nix/remote-builder-client.nix
       ../../modules/nix/mount-docker-config.nix
+      ../../modules/nix/mount-docker-volumes.nix
     ];
 
 # nixpkgs.config.permittedInsecurePackages = [
@@ -25,6 +26,8 @@ in
 #              ];
 
   networking.hostName = "docker"; # Define your hostname.
+networking.hostId = "007f0200";
+boot.zfs.forceImportRoot = false;
 #  virtualisation.docker.enable = true;
   virtualisation.docker = {
   enable = true;
diff --git a/modules/nix/mount-docker-config.nix b/modules/nix/mount-docker-config.nix
index 5515ab3..e959916 100644
--- a/modules/nix/mount-docker-config.nix
+++ b/modules/nix/mount-docker-config.nix
@@ -2,8 +2,14 @@
 
 {
   fileSystems."/zfs-config" = {
-    device = "tank/docker/config";
-    fsType = "zfs";
-    options = [ "zfsutil" ];
+    device = "server:/tank/docker/config";
+    fsType = "nfs";
+
+    options = [
+      "nfsvers=4.2"
+      "_netdev"
+      "x-systemd.automount"
+      "noatime"
+    ];
   };
-}
\ No newline at end of file
+}
diff --git a/modules/nix/mount-docker-volumes.nix b/modules/nix/mount-docker-volumes.nix
new file mode 100644
index 0000000..914257a
--- /dev/null
+++ b/modules/nix/mount-docker-volumes.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+  fileSystems."/zfs-volumes" = {
+    device = "server:/tank/docker/volumes";
+    fsType = "nfs";
+
+    options = [
+      "nfsvers=4.2"
+      "_netdev"
+      "x-systemd.automount"
+      "noatime"
+    ];
+  };
+}