2 files changed, 32 insertions, 22 deletions
diff --git a/store/home/bin/neovide-listen b/store/home/bin/neovide-listen
index 2591842..3bcc7da 100755
--- a/store/home/bin/neovide-listen
+++ b/store/home/bin/neovide-listen
@@ -1,43 +1,49 @@
 #!/usr/bin/env bash
 
-if [[ -z "$NVIM_SOCKET" ]]; then
-  NVIM_SOCKET="/tmp/nvimsocket"
-fi
+export CRU_NVIM_SERVER=${CRU_NVIM_SERVER:-/tmp/nvimsocket}
 
 args=()
-MY_NEOVIM_PATH="$HOME/codes/neovim/build/bin/nvim"
-if [[ -e "$MY_NEOVIM_PATH" ]]; then
-  echo "Found my neovim at $MY_NEOVIM_PATH"
-  export VIMRUNTIME="$HOME/codes/neovim/runtime"
-  args=("${args[@]}" "--neovim-bin" "$MY_NEOVIM_PATH")
+
+self_built_nvim="$HOME/codes/neovim/build/bin/nvim"
+self_built_nvim_runtime="$HOME/codes/neovim/runtime"
+if [[ -z "$CRU_NVIM" ]] && [[ -e "$self_built_nvim" ]]; then
+  echo "Found self-built neovim at $CRU_NVIM"
+  CRU_NVIM="$self_built_nvim"
+  CRU_VIMRUNTIME="$self_built_nvim_runtime"
+fi 
+
+[[ -z "$CRU_NVIM" ]] || args=("${args[@]}" "--neovim-bin" "$CRU_NVIM")
+export CRU_NVIM=${CRU_NVIM:-nvim}
+[[ -z "$CRU_VIMRUNTIME" ]] || export VIMRUNTIME="$CRU_VIMRUNTIME"
+
+self_built_neovide="$HOME/codes/neovide/target/release/neovide"
+if [[ -z "$CRU_NEOVIDE" ]] && [[ -e "$self_built_neovide" ]]; then
+  echo "Found self-build of neovide at $self_built_neovide"
+  CRU_NEOVIDE="$self_built_neovide"
 fi
+export CRU_NEOVIDE=${CRU_NEOVIDE:-neovide}
 
 listen_added=0
 for arg in "$@"; do
   args=("${args[@]}" "$arg")
-  if [ "$arg" = '--' ]; then
-    args=("${args[@]}" "--listen" "$NVIM_SOCKET")
+  if [[ "$arg" == "--" ]]; then
+    args=("${args[@]}" "--listen" "$CRU_NVIM_SERVER")
     listen_added=1
   fi
 done
 
 if [[ $listen_added = 0 ]]; then
-  args=("${args[@]}" "--" "--listen" "$NVIM_SOCKET")
-fi
-
-NEOVIDE_BIN=neovide
-MY_NEOVIDE_PATH="$HOME/codes/neovide/target/release/neovide"
-if [ -e "$MY_NEOVIDE_PATH" ]; then
-  echo "Found my neovide at $MY_NEOVIDE_PATH"
-  NEOVIDE_BIN="$MY_NEOVIDE_PATH"
+  args=("${args[@]}" "--" "--listen" "$CRU_NVIM_SERVER")
 fi
 
 if which nvr > /dev/null; then
-  echo "Detected nvr, set git editor env"
-  export GIT_EDITOR='nvr -cc split --remote-wait'
+  echo "Found nvr, set VISUAL EDITOR GIT_EDITOR to nvr-wait"
+  export VISUAL="nvr-wait"
+  export EDITOR="$VISUAL"
+  export GIT_EDITOR="$VISUAL"
 fi
 
-args=("$NEOVIDE_BIN" "${args[@]}")
-echo "Command is ${args[@]}"
+args=("$CRU_NEOVIDE" "${args[@]}")
+echo "Full command is ${args[@]}"
 exec "${args[@]}"
 
diff --git a/store/home/bin/nvr-wait b/store/home/bin/nvr-wait
new file mode 100755
index 0000000..410d42d
--- /dev/null
+++ b/store/home/bin/nvr-wait
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export CRU_NVIM_SERVER=${CRU_NVIM_SERVER:-/tmp/nvimsocket}
+exec nvr --nostart --servername "$CRU_NVIM_SERVER" -cc split --remote-wait "$@"