fix: Ensure we can install treesitter parsers from cli

.dockerignore

@@ -1 +1 @@
-plugged
+plugged/

Dockerfile

@@ -11,7 +11,5 @@ COPY . .
 
 # Adds SSH keys to make sure we can clone submodules
 RUN --mount=type=ssh ./install.sh all
-RUN sed -i "s#/opt/homebrew/bin/nu#/bin/bash#" ./plugin/after/styling.lua
-
 
 CMD nu

install.sh

@@ -7,13 +7,10 @@ all() {
   install_apk_deps
   mkdir -p ${HOME}/.config
 	ln -sfn $(pwd) ${HOME}/.config/nvim
-  nvim -c PlugInstall -c "write ${TMPDIR}/PlugInstall.out" -c quitall
-  cat ${TMPDIR}/PlugInstall.out
-  nvim -c PlugStatus -c "write ${TMPDIR}/PlugStatus.out" -c quitall
-	cat ${TMPDIR}/PlugStatus.out
+  fix_shell_path
 
-  # sleep 20s, no way I know to wait until everything is installed
-  nvim -c "TSUpdate" -c "60sleep" -c quitall
+  install_nvim_deps
+  setup_treesitter
 
   lang_server ruby
   lang_server typescript
@@ -31,8 +28,19 @@ install_apk_deps() {
   fi
 }
 
+install_nvim_deps() {
+  nvim -c PlugInstall -c "write ${TMPDIR}/PlugInstall.out" -c quitall
+  cat ${TMPDIR}/PlugInstall.out
+  nvim -c PlugStatus -c "write ${TMPDIR}/PlugStatus.out" -c quitall
+	cat ${TMPDIR}/PlugStatus.out
+}
+
+setup_treesitter() {
+  nvim +TSUpdateSync +quitall
+}
+
 setup_shell() {
-  if command -v brew > /dev/null; then
+  if command -v nu > /dev/null; then
     NUSHELL_PATH=$(which nu)
     if [ "${NUSHELL_PATH}" != "/usr/bin/nu" ]; then
       echo "Setting up NuShell to /usr/bin/nu"
@@ -41,6 +49,23 @@ setup_shell() {
   fi
 }
 
+fix_shell_path() {
+  SHELL_PATH=""
+  if command -v nu > /dev/null; then
+    SHELL_PATH=$(which nu)
+  fi
+
+  if [ -z "${SHELL_PATH}" ]; then
+    SHELL_PATH="/bin/bash"
+    echo "Nu not found in path. Using /bin/bash as default"
+  fi
+  if [ "${SHELL_PATH}" == "/opt/homebrew/bin/nu" ]; then
+    echo "nothing to do..."
+  else
+    sed -i "s#/opt/homebrew/bin/nu#${SHELL_PATH}#" ./plugin/after/styling.lua
+  fi
+}
+
 lang_server() {
   java() {
     which brew && brew install jdtls

lua/flovilmart/init.lua

@@ -10,7 +10,7 @@ vim.call('plug#begin', '~/.config/nvim/plugged')
   Plug ('vim-airline/vim-airline-themes')
 
   --" TreeSitter: Code parsing
-  Plug ('nvim-treesitter/nvim-treesitter', { ['do'] = vim.fn['TSUpdate'] })
+  Plug ('nvim-treesitter/nvim-treesitter')
   Plug ('nvim-treesitter/playground')
 
   --" Git

plugin/after/treesitter.lua

@@ -7,8 +7,8 @@ require'nvim-treesitter.configs'.setup {
   -- A list of parser names, or "all" (the five listed parsers should always be installed)
   ensure_installed = { "ruby", "typescript", "javascript", "go", "lua", "vim", "query", "vimdoc", "c", "rust" },
 
-  sync_install = false,
-  auto_install = true,
+  sync_install = true,
+  auto_install = false,
 
   highlight = {
     enable = true,