From a183ad7ac69746d5847ccfd80bcd33c5ff0847b5 Mon Sep 17 00:00:00 2001 From: Joakim Persson Date: Sun, 12 Apr 2026 16:59:31 +0200 Subject: [PATCH] Add neovim 0.12, bat, eza, zoxide, tmux, htop to base image Replace vim-tiny with neovim from GitHub releases (pinned, multi-arch). Add bat, eza, zoxide from GitHub releases and tmux, htop, patch from apt. Move tmux from OMOS-only to base image. Set EDITOR=nvim. Add neovim config mount option to docker-compose and docs. --- DOCKER_HUB.md | 18 +++++++++++++++--- Dockerfile | 37 +++++++++++++++++++++++++++++++++---- README.md | 21 +++++++++++++++------ docker-compose.yml | 3 +++ 4 files changed, 66 insertions(+), 13 deletions(-) diff --git a/DOCKER_HUB.md b/DOCKER_HUB.md index 69103f1..9b67fa2 100644 --- a/DOCKER_HUB.md +++ b/DOCKER_HUB.md @@ -9,7 +9,7 @@ Two image variants are published for each release: | Tag | Description | |---|---| | `latest` / `vX.Y.Z` | Base image — opencode, Node.js, AWS CLI, dev tools | -| `latest-omos` / `vX.Y.Z-omos` | Base + [oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim) multi-agent orchestration, Bun, and tmux | +| `latest-omos` / `vX.Y.Z-omos` | Base + [oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim) multi-agent orchestration and Bun | Both variants support `linux/amd64` and `linux/arm64`. @@ -207,6 +207,17 @@ docker run -it --rm \ When a config file is mounted, the `OPENCODE_PROVIDER` auto-config is skipped. +## Neovim Configuration + +The image includes neovim 0.12 with `EDITOR=nvim` set by default. To use your own neovim config (and have plugins auto-install via lazy.nvim on first start), mount it from the host: + +```bash +docker run -it --rm \ + -v ~/.config/nvim:/home/developer/.config/nvim:ro \ + ... \ + joakimp/opencode-devbox:latest +``` + ## Using docker-compose Create a directory with a `docker-compose.yml` and a `.env` file: @@ -251,6 +262,8 @@ services: # Optional: mount opencode skills from host # - ~/.config/opencode/skills:/home/developer/.config/opencode/skills:ro # - ~/.agents/skills:/home/developer/.agents/skills:ro + # Optional: mount neovim config from host (plugins auto-install on first start) + # - ~/.config/nvim:/home/developer/.config/nvim:ro volumes: devbox-data: @@ -287,7 +300,7 @@ docker compose run --rm devbox bash # interactive shell - **opencode** — AI coding assistant - **Node.js 22** — for npx-based MCP servers - **AWS CLI v2** — SSO and Bedrock authentication -- **Dev tools** — git, git-lfs, ssh, ripgrep, fd, fzf, jq, curl, wget, vim, tree +- **Dev tools** — git, git-lfs, ssh, ripgrep, fd, fzf, bat, eza, zoxide, jq, curl, wget, neovim 0.12, tmux, htop, tree - **Non-root user** — runs as `developer` with UID auto-matched to workspace owner (sudo available) ### OMOS image (`latest-omos`) @@ -296,7 +309,6 @@ Everything in the base image, plus: - **[oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim)** — multi-agent orchestration plugin - **Bun** — JavaScript runtime required by oh-my-opencode-slim -- **tmux** — terminal multiplexer (used by OMOS for agent pane integration, but also useful on its own for managing multiple terminal sessions) - **6 specialized agents** — Orchestrator, Explorer, Oracle, Librarian, Designer, Fixer ### Additional runtimes (build from source) diff --git a/Dockerfile b/Dockerfile index 4beff8e..b9cd8bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ fd-find \ tree \ less \ - vim-tiny \ + htop \ + tmux \ + patch \ + diffutils \ sudo \ locales \ procps \ @@ -59,11 +62,39 @@ RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "amd64" ;; arm64) echo "arm64" ;; git lfs install --system && \ git-lfs --version +# neovim — modern text editor (pre-built release from GitHub) +ARG NVIM_VERSION=0.12.1 +RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "x86_64" ;; arm64) echo "arm64" ;; *) echo "x86_64" ;; esac) && \ + curl -fsSL "https://github.com/neovim/neovim/releases/download/v${NVIM_VERSION}/nvim-linux-${ARCH}.tar.gz" | tar -xz -C /opt && \ + ln -s /opt/nvim-linux-${ARCH}/bin/nvim /usr/local/bin/nvim && \ + nvim --version | head -1 + +# bat — syntax-highlighted cat replacement +ARG BAT_VERSION=0.25.0 +RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "x86_64" ;; arm64) echo "aarch64" ;; *) echo "x86_64" ;; esac) && \ + curl -fsSL "https://github.com/sharkdp/bat/releases/download/v${BAT_VERSION}/bat-v${BAT_VERSION}-${ARCH}-unknown-linux-musl.tar.gz" | tar -xz -C /tmp && \ + install /tmp/bat-v${BAT_VERSION}-${ARCH}-unknown-linux-musl/bat /usr/local/bin/bat && \ + rm -rf /tmp/bat-v${BAT_VERSION}-* && \ + bat --version + +# eza — modern ls replacement +ARG EZA_VERSION=0.23.4 +RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "x86_64" ;; arm64) echo "aarch64" ;; *) echo "x86_64" ;; esac) && \ + curl -fsSL "https://github.com/eza-community/eza/releases/download/v${EZA_VERSION}/eza_${ARCH}-unknown-linux-gnu.tar.gz" | tar -xz -C /usr/local/bin && \ + eza --version | head -1 + +# zoxide — smarter cd command +ARG ZOXIDE_VERSION=0.9.9 +RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "x86_64" ;; arm64) echo "aarch64" ;; *) echo "x86_64" ;; esac) && \ + curl -fsSL "https://github.com/ajeetdsouza/zoxide/releases/download/v${ZOXIDE_VERSION}/zoxide-${ZOXIDE_VERSION}-${ARCH}-unknown-linux-musl.tar.gz" | tar -xz -C /usr/local/bin zoxide && \ + zoxide --version + # Set locale RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen ENV LANG=en_US.UTF-8 ENV LANGUAGE=en_US:en ENV LC_ALL=en_US.UTF-8 +ENV EDITOR=nvim # ── Node.js (required for opencode v1.x install + MCP servers) ────── ARG NODE_VERSION=22 @@ -107,13 +138,11 @@ RUN if [ "${INSTALL_GO}" = "true" ]; then \ fi # ── Optional: oh-my-opencode-slim (multi-agent orchestration) ──────── -# Installs Bun runtime, tmux, and the oh-my-opencode-slim npm package. +# Installs Bun runtime and the oh-my-opencode-slim npm package. # Runtime activation is controlled by ENABLE_OMOS env var in entrypoint. ARG INSTALL_OMOS=false ARG OMOS_VERSION=latest RUN if [ "${INSTALL_OMOS}" = "true" ]; then \ - apt-get update && apt-get install -y --no-install-recommends tmux && \ - rm -rf /var/lib/apt/lists/* && \ curl -fsSL https://bun.sh/install | BUN_INSTALL=/usr/local bash && \ bun --version && \ npm install -g oh-my-opencode-slim@${OMOS_VERSION}; \ diff --git a/README.md b/README.md index 3d58f0e..8a94892 100644 --- a/README.md +++ b/README.md @@ -127,6 +127,15 @@ volumes: - ~/.agents/skills:/home/developer/.agents/skills:ro ``` +### Neovim configuration + +The image includes neovim 0.12 with `EDITOR=nvim` set by default. To use your own neovim config (and have plugins auto-install via lazy.nvim on first start), mount it from the host: + +```yaml +volumes: + - ~/.config/nvim:/home/developer/.config/nvim:ro +``` + ### Rebuilding the Image `docker compose run` and `docker compose up` use the existing image — they **do not rebuild** when you change the Dockerfile or build args (e.g. updating `OPENCODE_VERSION`). Rebuild explicitly: @@ -153,7 +162,7 @@ docker compose build --build-arg OPENCODE_VERSION=1.5.0 |---|---|---| | `INSTALL_PYTHON` | `false` | Python 3 + pip + venv | | `INSTALL_GO` | `false` | Go toolchain | -| `INSTALL_OMOS` | `false` | [oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim) multi-agent orchestration (installs Bun, tmux, and plugin) | +| `INSTALL_OMOS` | `false` | [oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim) multi-agent orchestration (installs Bun and plugin) | | `OMOS_VERSION` | `latest` | Pin a specific oh-my-opencode-slim version | ## oh-my-opencode-slim (Multi-Agent Orchestration) @@ -170,7 +179,7 @@ A pre-built OMOS image is available on Docker Hub as `joakimp/opencode-devbox:la docker compose build --build-arg INSTALL_OMOS=true ``` -This installs Bun, tmux, and the oh-my-opencode-slim package into the image. +This installs Bun and the oh-my-opencode-slim package into the image. **2. Enable in `.env`:** @@ -191,7 +200,7 @@ On first start, the entrypoint runs the oh-my-opencode-slim installer in non-int | Variable | Default | Description | |---|---|---| | `ENABLE_OMOS` | `false` | Activate oh-my-opencode-slim on container start | -| `OMOS_TMUX` | `false` | Enable tmux pane integration (tmux is included with `INSTALL_OMOS`) | +| `OMOS_TMUX` | `false` | Enable tmux pane integration (tmux is included in the base image) | | `OMOS_SKILLS` | `true` | Install recommended skills (simplify, agent-browser, cartography) | | `OMOS_RESET` | `false` | Force regenerate config on next start (backs up existing config) | @@ -303,12 +312,12 @@ Host Machine Container (Debian bookworm) ├── opencode binary -├── oh-my-opencode-slim (optional — multi-agent orchestration plugin, includes Bun + tmux) +├── oh-my-opencode-slim (optional — multi-agent orchestration plugin, includes Bun) ├── AWS CLI v2 (SSO + Bedrock auth) -├── git, ssh, ripgrep, fd, jq, curl, fzf +├── neovim 0.12, tmux, htop, bat, eza, zoxide +├── git, ssh, ripgrep, fd, fzf, jq, curl, tree ├── Node.js (for MCP servers) ├── Bun (optional — included with oh-my-opencode-slim) -├── tmux (optional — included with oh-my-opencode-slim, also useful independently) ├── entrypoint.sh (UID adjustment, git config, provider setup) └── /workspace ← your code lives here ``` diff --git a/docker-compose.yml b/docker-compose.yml index cc234c4..31291eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,6 +41,9 @@ services: # Optional: mount your own oh-my-opencode-slim config # - ./oh-my-opencode-slim.json:/home/developer/.config/opencode/oh-my-opencode-slim.json:ro + # Optional: mount neovim config from host (plugins auto-install on first start) + # - ~/.config/nvim:/home/developer/.config/nvim:ro + # Optional: persist opencode data (auth, memory, etc.) - devbox-data:/home/developer/.local/share/opencode