diff --git a/.envrc b/.envrc
index 85383fc..265a5fb 100755
--- a/.envrc
+++ b/.envrc
@@ -3,4 +3,7 @@
 source ./scripts/rebuild-nim
 source ./scripts/rebuild-nimble
 
-export PATH="$(pwd)/bin:~/.cache/nim-workspace/bin/:$(pwd)/${NIM_DIR}/bin:$(pwd)/scripts:${PATH}"
+export NIMBLE_DIR="$(pwd)/.nimble"
+export PATH="$(pwd)/bin:$(realpath ~/.cache/nim-workspace/bin/):$NIMBLE_DIR/bin:$(pwd)/${NIM_DIR}/bin:$(pwd)/scripts:${PATH}"
+
+source ./scripts/rebuild-languageserver
diff --git a/scripts/rebuild-languageserver b/scripts/rebuild-languageserver
new file mode 100644
index 0000000..9da8514
--- /dev/null
+++ b/scripts/rebuild-languageserver
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+if [ ! -f "$NIMBLE_DIR/bin/nimlangserver" ] ; then
+    nimble install -y nimlangserver
+fi
diff --git a/scripts/rebuild-nim b/scripts/rebuild-nim
index 64400fd..ce54c1e 100755
--- a/scripts/rebuild-nim
+++ b/scripts/rebuild-nim
@@ -11,8 +11,10 @@ if [ ! -f ~/.cache/nim-workspace/bin/nim$EXE_SUFFIX ]; then
   if uname | grep -qiE "mingw|msys"; then
     curl https://github.com/dom96/choosenim/releases/download/v0.8.4/choosenim-0.8.4_windows_amd64.exe \
       --output /tmp/choosenim.exe
-    /tmp/choosenim.exe stable --nimbleDir:~/.cache/nim-workspace
+    /tmp/choosenim.exe "#version-1-6" --nimbleDir:~/.cache/nim-workspace
   else
     curl https://raw.githubusercontent.com/yyoncho/choosenim/nimble-dir/scripts/choosenim-unix-init.sh -sSf | NIMBLE_BIN=~/.cache/nim-workspace sh -x
+    chmod a+x ~/.cache/nim-workspace/choosenim
+    ~/.cache/nim-workspace/choosenim "#version-1-6" --nimbleDir:~/.cache/nim-workspace
   fi
 fi
diff --git a/scripts/rebuild-nimble b/scripts/rebuild-nimble
index 9f63ac2..e94418b 100755
--- a/scripts/rebuild-nimble
+++ b/scripts/rebuild-nimble
@@ -13,6 +13,8 @@ else
   BUILD_COMMAND="sh compile_nimble.sh"
 fi
 
+git submodule update --init
+
 pushd $NIMBLE_SOURCES
 NIMBLE_COMMIT=$(git rev-parse HEAD)
 popd
@@ -21,7 +23,6 @@ NIMBLE_CACHE_DIR=~/.cache/nim/nim-workspace/
 NIMBLE=$NIMBLE_CACHE_DIR/nimble_$NIMBLE_COMMIT$EXE_SUFFIX
 
 if [ ! -f $NIMBLE ]; then
-    git submodule update --init
     mkdir -p $NIMBLE_CACHE_DIR
     pushd $NIMBLE_SOURCES
     $BUILD_COMMAND