From f146b35e184d30340c801027d329b272b14f46a4 Mon Sep 17 00:00:00 2001
From: wayne <wayne@waynehayesdevelopment.com>
Date: Sat, 30 May 2026 21:12:37 -0400
Subject: [PATCH] latest

---
 Dockerfile | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c9d46c2..ddc5a32 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ RUN pacman -S --noconfirm --needed \
     && pacman -Scc --noconfirm
 
 # ── Crown Jewel #2: AUR ───────────────────────────────────────────────────────
-RUN useradd -m -s /bin/zsh -G wheel aurbuild && \
+RUN useradd -m -s /bin/zsh -u 9001 -G wheel aurbuild && \
     echo 'aurbuild ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/aurbuild
 
 RUN cd /tmp && \
@@ -55,9 +55,16 @@ RUN sudo -u aurbuild yay -S --noconfirm --needed \
     && sudo -u aurbuild yay -Scc --noconfirm
 
 # ── Dev user with host-matching UID/GID ───────────────────────────────────────
-# UID/GID match host so /workspace bind mount has clean permissions both sides
-RUN groupadd -g ${USER_GID} dev && \
-    useradd -m -s /bin/zsh -u ${USER_UID} -g ${USER_GID} -G wheel dev && \
+# UID/GID match host so /workspace bind mount has clean permissions both sides.
+# aurbuild is parked at UID 9001 so there's no collision with host UID.
+RUN set -e; \
+    # Group: handle pre-existing GID gracefully (Arch base has users:1000)
+    if getent group ${USER_GID} >/dev/null; then \
+        groupmod -n dev "$(getent group ${USER_GID} | cut -d: -f1)"; \
+    else \
+        groupadd -g ${USER_GID} dev; \
+    fi; \
+    useradd -m -s /bin/zsh -u ${USER_UID} -g ${USER_GID} -G wheel dev; \
     echo 'dev ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/dev
 
 # ── Skeleton: bake dotfiles into /etc/skel-arch-dev/ ──────────────────────────