diff --git a/.gitignore b/.gitignore index eee97eb..4f1648c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ +.clangd .git/ +.kiro/ coc-settings.json cspell.json dap/ diff --git a/Dockerfile b/Dockerfile index dc79537..d86b922 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,7 @@ MAINTAINER Scott E. Graves USER root +ARG NVIM_APPNAME=nvim ARG NVIM_ARCH ARG NVIM_ARCH2 ARG NVIM_OS @@ -31,14 +32,14 @@ ARG TREE_SITTER_VERSION=0.26.13 ENV \ GID="1000" \ GNAME="neovim" \ - LANG=en_US.utf8 \ - NVIM_APPNAME=nvim \ + LANG="en_US.utf8" \ + NVIM_APPNAME="${NVIM_APPNAME}" \ NV_DARCULA_APPS="/home/neovim/.local/share/nvim" \ NV_DARCULA_ENABLE_COC=${NV_DARCULA_ENABLE_COC} \ PATH="/nvim-${NVIM_OS}-${NVIM_ARCH}/bin:/python/bin:/home/neovim/go/bin:/home/neovim/.local/bin:/home/neovim/flutter/bin:/home/neovim/.pub-cache/bin:/usr/bin/core_perl:${PATH}" \ PYTHONPATH="/python" \ SHELL="/bin/bash" \ - TMPDIR=/tmp \ + TMPDIR="/tmp" \ UID="1000" \ UNAME="neovim" @@ -185,14 +186,14 @@ WORKDIR /home/${UNAME} ENV \ GID="1000" \ GNAME="neovim" \ - LANG=en_US.utf8 \ - NVIM_APPNAME=nvim \ + LANG="en_US.utf8" \ + NVIM_APPNAME="${NVIM_APPNAME}" \ NV_DARCULA_APPS="/home/neovim/.local/share/nvim" \ NV_DARCULA_ENABLE_COC=${NV_DARCULA_ENABLE_COC} \ PATH="/nvim-${NVIM_OS}-${NVIM_ARCH}/bin:/python/bin:/home/neovim/go/bin:/home/neovim/.local/bin:/home/neovim/flutter/bin:/home/neovim/.pub-cache/bin:/usr/bin/core_perl:${PATH}" \ PYTHONPATH="/python" \ SHELL="/bin/bash" \ - TMPDIR=/tmp \ + TMPDIR="/tmp" \ UID="1000" \ UNAME="neovim" diff --git a/build_common.sh b/build_common.sh index c82f18b..51f1aac 100755 --- a/build_common.sh +++ b/build_common.sh @@ -29,5 +29,5 @@ docker build \ --build-arg NVIM_OS="${NVIM_OS}" \ --build-arg NV_DARCULA_ENABLE_COC="${NV_DARCULA_ENABLE_COC}" \ -f "Dockerfile" \ - -t "darcula:${NVIM_APPNAME}" . + -t "darcula:${NV_DARCULA_TAG_NAME}" . popd 1>/dev/null 2>&1 || error_exit "failed to popd: ${SCRIPT_DIR}" diff --git a/build_nvim.sh b/build_nvim.sh index fd95a8e..a1b25d9 100755 --- a/build_nvim.sh +++ b/build_nvim.sh @@ -21,8 +21,8 @@ ## SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" -NVIM_APPNAME=nvim -export NVIM_APPNAME +NV_DARCULA_TAG_NAME=nvim +export NV_DARCULA_TAG_NAME NV_DARCULA_ENABLE_COC=true export NV_DARCULA_ENABLE_COC diff --git a/dviml.sh b/dviml.sh index 4e57d3e..53e563e 100755 --- a/dviml.sh +++ b/dviml.sh @@ -21,7 +21,7 @@ ## SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" -NVIM_APPNAME=nvim -export NVIM_APPNAME +NV_DARCULA_TAG_NAME=nvim +export NV_DARCULA_TAG_NAME "${SCRIPT_DIR}/dviml_common.sh" "$@" diff --git a/dviml2.sh b/dviml2.sh index 23c27fa..bff129e 100755 --- a/dviml2.sh +++ b/dviml2.sh @@ -21,7 +21,7 @@ ## SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" -NVIM_APPNAME=nvim2 -export NVIM_APPNAME +NV_DARCULA_TAG_NAME=nvim2 +export NV_DARCULA_TAG_NAME "${SCRIPT_DIR}/dviml_common.sh" "$@" diff --git a/dviml_common.sh b/dviml_common.sh index 6b5281d..fc4d116 100755 --- a/dviml_common.sh +++ b/dviml_common.sh @@ -21,7 +21,7 @@ ## CURRENT_DIR="$(pwd)" -APP_DIR="${HOME}/.nv_darcula/${NVIM_APPNAME}" +APP_DIR="${HOME}/.nv_darcula/${NVIM_APPNAME:-nvim}" APP_PERSIST_DIR="${APP_DIR}/persist" mkdir -p "${APP_PERSIST_DIR}/codex" @@ -84,4 +84,4 @@ docker run --rm -it \ -v "${APP_PERSIST_DIR}/undo":/home/neovim/.local/share/nvim/.undo:z \ -v /var/run/docker.sock:/var/run/docker.sock \ -w "${WORKSPACE_DIR}" \ - darcula:"${NVIM_APPNAME}" "${NVIM_ARGS[@]}" + darcula:"${NV_DARCULA_TAG_NAME}" "${NVIM_ARGS[@]}" diff --git a/viml.sh b/viml.sh index ca1139c..7289413 100755 --- a/viml.sh +++ b/viml.sh @@ -21,9 +21,6 @@ ## SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" -NVIM_APPNAME=nvim -export NVIM_APPNAME - NV_DARCULA_ENABLE_COC=true export NV_DARCULA_ENABLE_COC diff --git a/viml2.sh b/viml2.sh index 4419b78..c938a25 100755 --- a/viml2.sh +++ b/viml2.sh @@ -21,9 +21,6 @@ ## SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" -NVIM_APPNAME=nvim2 -export NVIM_APPNAME - NV_DARCULA_ENABLE_COC=false export NV_DARCULA_ENABLE_COC diff --git a/viml_common.sh b/viml_common.sh index aadbac0..fe015c6 100755 --- a/viml_common.sh +++ b/viml_common.sh @@ -24,6 +24,9 @@ SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" mkdir -p ~/.local/bin +NVIM_APPNAME=${NVIM_APPNAME:-nvim} +export NVIM_APPNAME + create_link "${SCRIPT_DIR}/nvim" "${HOME}/.config/${NVIM_APPNAME}" create_link "${SCRIPT_DIR}/dviml.sh" "${HOME}/.local/bin/dviml" create_link "${SCRIPT_DIR}/dviml2.sh" "${HOME}/.local/bin/dviml2"