bind-mount attempt

files/system/usr/bin/mount-nix-overlay.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-mkdir -p /usr/share/nix-store /var/lib/nix-store /var/cache/nix-store /nix
-
-# Skip if already mounted to avoid errors on reload.
-if mountpoint -q /nix; then
-  exit 0
-fi
-
-mount -t overlay overlay \
-  -o lowerdir=/usr/share/nix-store,upperdir=/var/lib/nix-store,workdir=/var/cache/nix-store \
-  /nix

files/system/usr/bin/mount-nix.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Bind-mount /var/lib/nix-store to /nix.
+# If /var/lib/nix-store is empty, seed it from the baked store in /usr/share/nix-store.
+
+mkdir -p /usr/share/nix-store /var/lib/nix-store /nix
+
+copy_seed_store() {
+  if command -v rsync >/dev/null 2>&1; then
+    rsync -aH --delete /usr/share/nix-store/ /var/lib/nix-store/
+  else
+    cp -a /usr/share/nix-store/. /var/lib/nix-store/
+  fi
+}
+
+if ! mountpoint -q /nix; then
+  if [ -z "$(ls -A /var/lib/nix-store 2>/dev/null)" ] && compgen -G "/usr/share/nix-store/*" >/dev/null; then
+    copy_seed_store
+  fi
+
+  mount --bind /var/lib/nix-store /nix
+  mount -o remount,bind,exec /nix
+
+  # Ensure daemon paths exist and labels are sane.
+  if command -v systemd-tmpfiles >/dev/null 2>&1; then
+    systemd-tmpfiles --create /usr/lib/tmpfiles.d/nix-daemon.conf
+  fi
+  if command -v restorecon >/dev/null 2>&1; then
+    restorecon -RF /var/lib/nix-store /nix || true
+  fi
+fi