removed legacy NVIM_APPNAME separation

This commit is contained in:
sgraves committed 2026-10-21 17:12:14 +00:00
1 parent 630de68930
commit d315542ed7
10 files changed
+21 -21

No files matched your search

+2
View File
@@ -1,4 +1,6 @@
.clangd
.git/ .git/
.kiro/
coc-settings.json coc-settings.json
cspell.json cspell.json
dap/ dap/
+7 -6
View File
@@ -22,6 +22,7 @@ MAINTAINER Scott E. Graves <scott.e.graves@protonmail.com>
USER root USER root
ARG NVIM_APPNAME=nvim
ARG NVIM_ARCH ARG NVIM_ARCH
ARG NVIM_ARCH2 ARG NVIM_ARCH2
ARG NVIM_OS ARG NVIM_OS
@@ -31,14 +32,14 @@ ARG TREE_SITTER_VERSION=0.26.13
ENV \ ENV \
GID="1000" \ GID="1000" \
GNAME="neovim" \ GNAME="neovim" \
LANG=en_US.utf8 \ LANG="en_US.utf8" \
NVIM_APPNAME=nvim \ NVIM_APPNAME="${NVIM_APPNAME}" \
NV_DARCULA_APPS="/home/neovim/.local/share/nvim" \ NV_DARCULA_APPS="/home/neovim/.local/share/nvim" \
NV_DARCULA_ENABLE_COC=${NV_DARCULA_ENABLE_COC} \ 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}" \ 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" \ PYTHONPATH="/python" \
SHELL="/bin/bash" \ SHELL="/bin/bash" \
TMPDIR=/tmp \ TMPDIR="/tmp" \
UID="1000" \ UID="1000" \
UNAME="neovim" UNAME="neovim"
@@ -185,14 +186,14 @@ WORKDIR /home/${UNAME}
ENV \ ENV \
GID="1000" \ GID="1000" \
GNAME="neovim" \ GNAME="neovim" \
LANG=en_US.utf8 \ LANG="en_US.utf8" \
NVIM_APPNAME=nvim \ NVIM_APPNAME="${NVIM_APPNAME}" \
NV_DARCULA_APPS="/home/neovim/.local/share/nvim" \ NV_DARCULA_APPS="/home/neovim/.local/share/nvim" \
NV_DARCULA_ENABLE_COC=${NV_DARCULA_ENABLE_COC} \ 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}" \ 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" \ PYTHONPATH="/python" \
SHELL="/bin/bash" \ SHELL="/bin/bash" \
TMPDIR=/tmp \ TMPDIR="/tmp" \
UID="1000" \ UID="1000" \
UNAME="neovim" UNAME="neovim"
+1 -1
View File
@@ -29,5 +29,5 @@ docker build \
--build-arg NVIM_OS="${NVIM_OS}" \ --build-arg NVIM_OS="${NVIM_OS}" \
--build-arg NV_DARCULA_ENABLE_COC="${NV_DARCULA_ENABLE_COC}" \ --build-arg NV_DARCULA_ENABLE_COC="${NV_DARCULA_ENABLE_COC}" \
-f "Dockerfile" \ -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}" popd 1>/dev/null 2>&1 || error_exit "failed to popd: ${SCRIPT_DIR}"
+2 -2
View File
@@ -21,8 +21,8 @@
## ##
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
NVIM_APPNAME=nvim NV_DARCULA_TAG_NAME=nvim
export NVIM_APPNAME export NV_DARCULA_TAG_NAME
NV_DARCULA_ENABLE_COC=true NV_DARCULA_ENABLE_COC=true
export NV_DARCULA_ENABLE_COC export NV_DARCULA_ENABLE_COC
+2 -2
View File
@@ -21,7 +21,7 @@
## ##
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
NVIM_APPNAME=nvim NV_DARCULA_TAG_NAME=nvim
export NVIM_APPNAME export NV_DARCULA_TAG_NAME
"${SCRIPT_DIR}/dviml_common.sh" "$@" "${SCRIPT_DIR}/dviml_common.sh" "$@"
+2 -2
View File
@@ -21,7 +21,7 @@
## ##
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
NVIM_APPNAME=nvim2 NV_DARCULA_TAG_NAME=nvim2
export NVIM_APPNAME export NV_DARCULA_TAG_NAME
"${SCRIPT_DIR}/dviml_common.sh" "$@" "${SCRIPT_DIR}/dviml_common.sh" "$@"
+2 -2
View File
@@ -21,7 +21,7 @@
## ##
CURRENT_DIR="$(pwd)" CURRENT_DIR="$(pwd)"
APP_DIR="${HOME}/.nv_darcula/${NVIM_APPNAME}" APP_DIR="${HOME}/.nv_darcula/${NVIM_APPNAME:-nvim}"
APP_PERSIST_DIR="${APP_DIR}/persist" APP_PERSIST_DIR="${APP_DIR}/persist"
mkdir -p "${APP_PERSIST_DIR}/codex" 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 "${APP_PERSIST_DIR}/undo":/home/neovim/.local/share/nvim/.undo:z \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
-w "${WORKSPACE_DIR}" \ -w "${WORKSPACE_DIR}" \
darcula:"${NVIM_APPNAME}" "${NVIM_ARGS[@]}" darcula:"${NV_DARCULA_TAG_NAME}" "${NVIM_ARGS[@]}"
-3
View File
@@ -21,9 +21,6 @@
## ##
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
NVIM_APPNAME=nvim
export NVIM_APPNAME
NV_DARCULA_ENABLE_COC=true NV_DARCULA_ENABLE_COC=true
export NV_DARCULA_ENABLE_COC export NV_DARCULA_ENABLE_COC
-3
View File
@@ -21,9 +21,6 @@
## ##
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
NVIM_APPNAME=nvim2
export NVIM_APPNAME
NV_DARCULA_ENABLE_COC=false NV_DARCULA_ENABLE_COC=false
export NV_DARCULA_ENABLE_COC export NV_DARCULA_ENABLE_COC
+3
View File
@@ -24,6 +24,9 @@ SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
mkdir -p ~/.local/bin 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}/nvim" "${HOME}/.config/${NVIM_APPNAME}"
create_link "${SCRIPT_DIR}/dviml.sh" "${HOME}/.local/bin/dviml" create_link "${SCRIPT_DIR}/dviml.sh" "${HOME}/.local/bin/dviml"
create_link "${SCRIPT_DIR}/dviml2.sh" "${HOME}/.local/bin/dviml2" create_link "${SCRIPT_DIR}/dviml2.sh" "${HOME}/.local/bin/dviml2"