Skip to content

Commit

Permalink
release v0.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Waylon S. Walker committed Feb 11, 2025
1 parent f470220 commit 7ff598c
Show file tree
Hide file tree
Showing 46 changed files with 1,382 additions and 414 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
## 0.1.2

* update installers
* add minio client `mc`
* setup `slim_install.sh`
* add nvim-manager starship prompt
* use uv for `venv` alias
* enable nvidia on devtainer distrobox for use with ollama
* add ghostty distrobox
* fix Dockerfile
* add syntax highlighting for `Containerfile` in nvim
* add just testnvim to run quick local tests of a fresh nvim install

## 0.1.1

* update installers
* add gh extension gh-dash
* add NVIM_APPNAME to starship
* update venv alias to not echo error if venv doesn't exist
* add s3-cleanup one-shot-app
* add clock one-shot-app
* install one-shot-apps in container

## 0.1.0

* add tailscale and fuser host commands to devtainer distrobox
Expand Down
17 changes: 14 additions & 3 deletions distrobox/distrobox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ replace=true
start_now=true

[devtainer]
image=docker.io/waylonwalker/devtainer:latest
nvidia=false
image=docker.io/waylonwalker/devtainer:0.1.2
nvidia=true
pull=true
root=false
replace=true
start_now=true
additional_packages="tmux"
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/bin/distrobox;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/kind;
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/flatpak;
Expand Down Expand Up @@ -76,3 +75,15 @@ root=false
replace=true
start_now=false

[ghostty] # also inline comments are supported
additional_packages="ghostty"
home=/tmp/home
image=archlinux:latest
init=false
start_now=true
nvidia=true
pull=true
root=false
replace=false
exported_bins="/usr/bin/ghostty"
init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/bin/distrobox;
23 changes: 16 additions & 7 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
From docker.io/python:3.11

ENV DOCKER_BUILD=true
ENV DOCKER_BUILD=1
ENV PATH="${PATH}:/root/.local/share/bob/nvim-bin"
ENV PATH="${PATH}:/root/.local/bin"
ENV PATH="${PATH}:/root/.local/share/nvim/mason/bin"
ENV PATH="${PATH}:/root/n/bin"
ENV PATH="${PATH}:/root/devtainer/one-shot-apps"
COPY installer /installer
RUN apt-get update && apt-get install -y --no-install-recommends \
bat \
ca-certificates \
chromium \
cargo \
curl \
entr \
Expand All @@ -17,6 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc \
git \
golang \
pciutils \
podman \
ripgrep \
sqlite3 \
Expand All @@ -26,7 +31,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
vlc \
xclip \
zsh \
ca-certificates && \
&& \
mkdir ~/.local/bin -p && \
rm -rf /var/lib/apt/lists/* && \
apt-get clean && \
Expand All @@ -36,6 +41,10 @@ WORKDIR /usr/local/bin
RUN bash /installer/install.sh
# RUN cargo install fastmod

RUN apt-get update && apt-get install -y --no-install-recommends windsurf && \
rm -rf /var/lib/apt/lists/* && \
apt-get clean

# installer does not work with the release format of ttyd
RUN curl --fail -# -L https://github.com/tsl0922/ttyd/releases/download/1.7.4/ttyd.x86_64 > /bin/ttyd && \
chmod +x /bin/ttyd
Expand All @@ -48,8 +57,8 @@ RUN python -m pip install uv && \
visidata \
waylonwalker --system

RUN bob install nightly && \
bob use nightly
RUN bob install v0.10.3 && \
bob use v0.10.3

RUN mkdir /root/downloads && \
cd /root/downloads && \
Expand All @@ -66,6 +75,7 @@ RUN mkdir /root/downloads && \
# RUN git clone https://github.com/waylonwalker/kickstart.nvim ~/.config/nvim
COPY zsh /root/devtainer/zsh
COPY bin /root/devtainer/bin
COPY one-shot-apps /root/devtainer/one-shot-apps
COPY nvim /root/devtainer/nvim
COPY helix /root/devtainer/helix
WORKDIR /root/devtainer
Expand All @@ -82,16 +92,15 @@ WORKDIR /root/util/
# RUN curl -L https://bit.ly/n-install | bash -s -- -y lts
RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
RUN apt-get install -y nodejs
ENV PATH="${PATH}:/root/n/bin"
RUN npm i -g tailwindcss
RUN node -v && npm -v # Verify the installation
RUN /bin/npm i -g tailwindcss

RUN nvim --headless "+Lazy! restore" +qa
RUN nvim --headless "+TSInstallSync! c cpp go lua python rust tsx javascript typescript vimdoc vim bash yaml toml vue" +qa
RUN nvim --headless "+MasonInstall lua-language-server rustywind ruff ruff-lsp html-lsp typescript-language-server beautysh fixjson isort markdownlint stylua yamlfmt python-lsp-server" +qa

RUN chsh -s $(which zsh)

RUN apt update && apt install -y chromium
# Expose port
RUN useradd -u 1976 -U -s /bin/false vhs
EXPOSE 1976
Expand Down
77 changes: 53 additions & 24 deletions docker/Dockerfile.slim
Original file line number Diff line number Diff line change
@@ -1,73 +1,101 @@
From python:3.11
From ubuntu:24.04

ENV DOCKER_BUILD=1
ENV PATH="${PATH}:/root/.local/share/bob/nvim-bin"
ENV PATH="${PATH}:/root/.local/bin"
ENV PATH="${PATH}:/root/.local/share/nvim/mason/bin"
ENV PATH="${PATH}:/root/n/bin"
ENV PATH="${PATH}:/root/devtainer/one-shot-apps"
COPY installer /installer
RUN apt-get update && apt-get install -y --no-install-recommends \
bat \
ca-certificates \
chromium \
cargo \
curl \
entr \
fd-find \
ffmpeg \
fzf \
g++ \
gcc \
git \
htop \
screenfetch \
golang \
pciutils \
podman \
ripgrep \
sqlite3 \
stow \
tmux \
unzip \
vlc \
xclip \
zsh \
ca-certificates && \
&& \
mkdir ~/.local/bin -p && \
rm -rf /var/lib/apt/lists/* && \
apt-get clean && \
cd /root/.local/bin

WORKDIR /root/.local/bin
WORKDIR /usr/local/bin
RUN bash /installer/install.sh

# installer does not work with the release format of ttyd
RUN curl --fail -# -L https://github.com/tsl0922/ttyd/releases/download/1.7.4/ttyd.x86_64 > /bin/ttyd && \
chmod +x /bin/ttyd

RUN python -m pip install uv && \
uv pip install \
harlequin \
ipython \
sqlite-utils \
pynvim \
neovim \
djhtml \
sqlformat \
tidy-imports \
pyflyby \
ruff \
lolcat \
visidata \
waylonwalker --system
RUN bob install nightly && \
bob use nightly

RUN bob install v0.10.3 && \
bob use v0.10.3

RUN mkdir /root/downloads && \
cd /root/downloads && \
wget https://github.com/helix-editor/helix/releases/download/24.07/helix-24.07-x86_64-linux.tar.xz && \
tar -xf helix-24.07-x86_64-linux.tar.xz && \
mv helix-24.07-x86_64-linux/hx /usr/local/bin/hx && \
mkdir -p /usr/local/share/helix/runtime && \
mv helix-24.07-x86_64-linux/runtime/* /usr/local/share/helix/runtime/ && \
cd .. && \
rm -rf /root/downloads

# COPY kickstart.nvim /root/.config/nvim

# RUN git clone https://github.com/waylonwalker/kickstart.nvim ~/.config/nvim
COPY zsh /root/devtainer/zsh
COPY bin /root/devtainer/bin
COPY one-shot-apps /root/devtainer/one-shot-apps
COPY nvim /root/devtainer/nvim
COPY helix /root/devtainer/helix
WORKDIR /root/devtainer

RUN stow zsh
RUN stow bin
RUN stow bin -t /usr/local/bin
RUN stow nvim
RUN nvim --headless "+Lazy! restore" +qa
RUN stow helix
# RUN stow lazyvim
WORKDIR /root
RUN curl -fsSL https://raw.githubusercontent.com/tj/n/master/bin/n | bash -s lts && \
# If you want n installed, you can use npm now.\
npm install -g n
# WORKDIR /root
# RUN curl -L https://bit.ly/n-install | bash -s -- -y lts
WORKDIR /root/util/
# RUN bash /installer/n.sh -y lts
# RUN curl -L https://bit.ly/n-install | bash -s -- -y lts
RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
RUN apt-get install -y nodejs
RUN node -v && npm -v # Verify the installation
RUN /bin/npm i -g tailwindcss

# RUN nvim --headless "+TSInstallSync c cpp go lua python rust tsx javascript typescript vimdoc vim bash yaml toml vue" +qa
RUN nvim --headless "+Lazy! restore" +qa
RUN nvim --headless "+TSInstallSync! c cpp go lua python rust tsx javascript typescript vimdoc vim bash yaml toml vue" +qa
RUN nvim --headless "+MasonInstall lua-language-server rustywind ruff ruff-lsp html-lsp typescript-language-server beautysh fixjson isort markdownlint stylua yamlfmt python-lsp-server" +qa

RUN apt update && apt install -y chromium
RUN chsh -s $(which zsh)

# Expose port
RUN useradd -u 1976 -U -s /bin/false vhs
EXPOSE 1976
Expand All @@ -78,5 +106,6 @@ ENV VHS_UID "1976"
ENV VHS_KEY_PATH "/vhs/vhs"
ENV VHS_AUTHORIZED_KEYS_PATH ""
ENV VHS_NO_SANDBOX "true"
RUN mv ~/.local/bin/* /usr/bin/
ENV DOCKER_BUILD=
ENTRYPOINT ["zsh"]

10 changes: 5 additions & 5 deletions installer/MordechaiHadad_bob.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function install {
PROG="bob"
ASPROG=""
MOVE="false"
RELEASE="v4.0.2"
RELEASE="v4.0.3"
INSECURE="false"
OUT_DIR="$(pwd)"
GH="https://github.com"
Expand Down Expand Up @@ -85,19 +85,19 @@ function install {
FTYPE=""
case "${OS}_${ARCH}" in
"linux_arm64")
URL="https://github.com/MordechaiHadad/bob/releases/download/v4.0.2/bob-linux-aarch64.zip"
URL="https://github.com/MordechaiHadad/bob/releases/download/v4.0.3/bob-linux-aarch64.zip"
FTYPE=".zip"
;;
"linux_amd64")
URL="https://github.com/MordechaiHadad/bob/releases/download/v4.0.2/bob-linux-x86_64-openssl.zip"
URL="https://github.com/MordechaiHadad/bob/releases/download/v4.0.3/bob-linux-x86_64-openssl.zip"
FTYPE=".zip"
;;
"darwin_arm")
URL="https://github.com/MordechaiHadad/bob/releases/download/v4.0.2/bob-macos-arm-openssl.zip"
URL="https://github.com/MordechaiHadad/bob/releases/download/v4.0.3/bob-macos-arm-openssl.zip"
FTYPE=".zip"
;;
"darwin_amd64")
URL="https://github.com/MordechaiHadad/bob/releases/download/v4.0.2/bob-macos-x86_64-openssl.zip"
URL="https://github.com/MordechaiHadad/bob/releases/download/v4.0.3/bob-macos-x86_64-openssl.zip"
FTYPE=".zip"
;;
*) fail "No asset for platform ${OS}-${ARCH}";;
Expand Down
10 changes: 5 additions & 5 deletions installer/argoproj_argo-cd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function install {
PROG="argo-cd"
ASPROG=""
MOVE="false"
RELEASE="v2.13.3"
RELEASE="v2.14.2"
INSECURE="false"
OUT_DIR="$(pwd)"
GH="https://github.com"
Expand Down Expand Up @@ -80,19 +80,19 @@ function install {
FTYPE=""
case "${OS}_${ARCH}" in
"darwin_amd64")
URL="https://github.com/argoproj/argo-cd/releases/download/v2.13.3/argocd-darwin-amd64"
URL="https://github.com/argoproj/argo-cd/releases/download/v2.14.2/argocd-darwin-amd64"
FTYPE=".bin"
;;
"darwin_arm64")
URL="https://github.com/argoproj/argo-cd/releases/download/v2.13.3/argocd-darwin-arm64"
URL="https://github.com/argoproj/argo-cd/releases/download/v2.14.2/argocd-darwin-arm64"
FTYPE=".bin"
;;
"linux_amd64")
URL="https://github.com/argoproj/argo-cd/releases/download/v2.13.3/argocd-linux-amd64"
URL="https://github.com/argoproj/argo-cd/releases/download/v2.14.2/argocd-linux-amd64"
FTYPE=".bin"
;;
"linux_arm64")
URL="https://github.com/argoproj/argo-cd/releases/download/v2.13.3/argocd-linux-arm64"
URL="https://github.com/argoproj/argo-cd/releases/download/v2.14.2/argocd-linux-arm64"
FTYPE=".bin"
;;
*) fail "No asset for platform ${OS}-${ARCH}";;
Expand Down
12 changes: 6 additions & 6 deletions installer/bitnami-labs_sealed-secrets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function install {
PROG="sealed-secrets"
ASPROG=""
MOVE="false"
RELEASE="v0.27.3"
RELEASE="v0.28.0"
INSECURE="false"
OUT_DIR="$(pwd)"
GH="https://github.com"
Expand Down Expand Up @@ -80,23 +80,23 @@ function install {
FTYPE=""
case "${OS}_${ARCH}" in
"darwin_amd64")
URL="https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.27.3/kubeseal-0.27.3-darwin-amd64.tar.gz"
URL="https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.28.0/kubeseal-0.28.0-darwin-amd64.tar.gz"
FTYPE=".tar.gz"
;;
"darwin_arm64")
URL="https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.27.3/kubeseal-0.27.3-darwin-arm64.tar.gz"
URL="https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.28.0/kubeseal-0.28.0-darwin-arm64.tar.gz"
FTYPE=".tar.gz"
;;
"linux_amd64")
URL="https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.27.3/kubeseal-0.27.3-linux-amd64.tar.gz"
URL="https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.28.0/kubeseal-0.28.0-linux-amd64.tar.gz"
FTYPE=".tar.gz"
;;
"linux_arm")
URL="https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.27.3/kubeseal-0.27.3-linux-arm.tar.gz"
URL="https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.28.0/kubeseal-0.28.0-linux-arm.tar.gz"
FTYPE=".tar.gz"
;;
"linux_arm64")
URL="https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.27.3/kubeseal-0.27.3-linux-arm64.tar.gz"
URL="https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.28.0/kubeseal-0.28.0-linux-arm64.tar.gz"
FTYPE=".tar.gz"
;;
*) fail "No asset for platform ${OS}-${ARCH}";;
Expand Down
Loading

0 comments on commit 7ff598c

Please sign in to comment.