feat: add sync task, improve Docker user handling, and optimize shell/prompt configurations for ttyd compatibility

Author: msavdert

.github/workflows/docker-publish.yml

@@ -8,6 +8,10 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
+  # Flexible build arguments
+  DEV_USER: ${{ vars.DEV_USER || 'savdert' }}
+  DEV_UID: ${{ vars.DEV_UID || '1000' }}
+  DEV_GID: ${{ vars.DEV_GID || '1000' }}
 
 jobs:
   build-and-push:
@@ -45,6 +49,6 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            DEV_USER=savdert
-            DEV_UID=1000
-            DEV_GID=1000
+            DEV_USER=${{ env.DEV_USER }}
+            DEV_UID=${{ env.DEV_UID }}
+            DEV_GID=${{ env.DEV_GID }}

Dockerfile

@@ -5,7 +5,7 @@ FROM ubuntu:24.04
 ARG DEV_USER=savdert
 ARG DEV_UID=1000
 ARG DEV_GID=1000
-ARG TZ=Europe/Istanbul
+ARG TZ=America/New_York
 
 # Environment variables
 ENV DEBIAN_FRONTEND=noninteractive \
@@ -34,34 +34,40 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN locale-gen en_US.UTF-8 && \
     ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime && echo ${TZ} > /etc/timezone
 
-# Create the user with sudo privileges
-RUN groupadd -g ${DEV_GID} ${DEV_USER} && \
-    useradd -m -u ${DEV_UID} -g ${DEV_GID} -s /usr/bin/zsh ${DEV_USER} && \
+# Create the user with sudo privileges - Handle case where UID/GID 1000 already exists
+RUN if getent passwd ${DEV_UID} > /dev/null; then \
+        EXISTING_USER=$(getent passwd ${DEV_UID} | cut -d: -f1); \
+        usermod -l ${DEV_USER} -d /home/${DEV_USER} -m ${EXISTING_USER}; \
+        groupmod -n ${DEV_USER} $(getent group ${DEV_GID} | cut -d: -f1); \
+    else \
+        groupadd -g ${DEV_GID} ${DEV_USER} && \
+        useradd -m -u ${DEV_UID} -g ${DEV_GID} -s /usr/bin/zsh ${DEV_USER}; \
+    fi && \
     echo "${DEV_USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
-# Install mise globally
-RUN curl https://mise.run | sh && \
-    mv /root/.local/bin/mise /usr/local/bin/mise
-
 # Setup project directory
 WORKDIR /workspace
 COPY . /workspace
-RUN chown -R ${DEV_USER}:${DEV_USER} /workspace /home/${DEV_USER}
+RUN chown -R ${DEV_USER}:${DEV_USER} /workspace
 
 USER ${DEV_USER}
 
+# Install mise for the local user
+RUN curl https://mise.run | sh
+
 # Install tools via mise during the build (caching tools in the image)
 RUN mise trust --quiet && \
     mise install --yes
 
 # Symlink configurations to the user's home directory
-RUN mkdir -p ${HOME}/.config/zellij ${HOME}/.config/nvim && \
+RUN mkdir -p ${HOME}/.config/zellij ${HOME}/.config/nvim ${HOME}/.config/mise && \
     ln -sf /workspace/configs/.zshrc ${HOME}/.zshrc && \
     ln -sf /workspace/configs/starship.toml ${HOME}/.config/starship.toml && \
-    ln -sf /workspace/configs/zellij/config.kdl ${HOME}/.config/zellij/config.kdl
+    ln -sf /workspace/configs/zellij/config.kdl ${HOME}/.config/zellij/config.kdl && \
+    ln -sf /workspace/mise.toml ${HOME}/.config/mise/config.toml
 
 # Expose the ttyd port
 EXPOSE 7681
 
-# Command to launch ttyd with zsh
-ENTRYPOINT ["ttyd", "-W", "-p", "7681", "/usr/bin/zsh"]
+# Command to launch ttyd with zsh (as login shell)
+ENTRYPOINT ["ttyd", "-W", "-p", "7681", "/usr/bin/zsh", "-l"]

configs/.zshrc

@@ -1,17 +1,22 @@
-# --- Mise-en-place ---
-if [ -f "$HOME/.local/bin/mise" ]; then
-    export PATH="$HOME/.local/bin:$PATH"
-    eval "$($HOME/.local/bin/mise activate zsh)"
-elif command -v mise &>/dev/null; then
+# --- Language & Locale ---
+export LANG=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+
+# --- PATH Setup ---
+# Ensure mise binaries and shims are always in PATH
+export PATH="$HOME/.local/bin:$HOME/.local/share/mise/shims:$PATH"
+
+# --- Mise Activation ---
+if command -v mise &>/dev/null; then
     eval "$(mise activate zsh)"
 fi
 
-# --- Starship Prompt ---
+# --- Tools Initialization ---
+# Initialize tools after mise shims are in PATH
 if command -v starship &>/dev/null; then
     eval "$(starship init zsh)"
 fi
 
-# --- Zoxide (Smart cd) ---
 if command -v zoxide &>/dev/null; then
     eval "$(zoxide init zsh)"
 fi

configs/starship.toml

@@ -1,4 +1,4 @@
-# Starship configuration
+# Starship configuration (Browser/ttyd Compatible)
 format = """
 $username\
 $hostname\
@@ -12,15 +12,21 @@ $character"""
 
 [directory]
 style = "blue"
-read_only = " 󰌾"
+read_only = " (read-only)"
 
 [character]
-success_symbol = "[➜](bold green)"
-error_symbol = "[➜](bold red)"
+# Using standard characters that work in every browser font
+success_symbol = "[>](bold green)"
+error_symbol = "[>](bold red)"
 
 [git_branch]
-symbol = " "
+symbol = "git: "
 style = "bold purple"
 
 [git_status]
 style = "red"
+format = "([\\[$all_status$ahead_behind\\]]($style) )"
+
+[cmd_duration]
+min_time = 500
+format = "took [$duration]($style) "

mise.toml

@@ -11,5 +11,12 @@ bat = "latest"
 lazygit = "latest"
 "1password-cli" = "latest"
 
+[tasks.sync]
+description = "Sync dotfiles from GitHub and update tools"
+run = """
+git pull
+mise install
+"""
+
 [settings]
 task.source_freshness_hash_contents = true