From 5898fe738159d226d150e9ed8eb01b4ab89e2801 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Mon, 20 Mar 2023 11:58:45 -0700
Subject: [PATCH] Fix the Vim configuration in setup.sh

---
 setup.sh | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/setup.sh b/setup.sh
index 49b7709..1ea3cb6 100755
--- a/setup.sh
+++ b/setup.sh
@@ -109,31 +109,40 @@ if [[ $did_link_at_least_one_dotfile -ne 1 ]]; then
     print "  Nothing to link"
 fi
 
-local install_vim_modules=1
+local configure_vim=1
 while getopts "v" arg $@; do
     case $arg in
-        "v") install_vim_modules=1 ;;
-        "+v") install_vim_modules=0 ;;
+        "v") configure_vim=1 ;;
+        "+v") configure_vim=0 ;;
         *)
             echo "Usage: setup.sh [+v|-v]"
-            echo "  +v|-v    Install Vim modules"
+            echo "  +v|-v    Configure (Neo)vim. Default yes; +v skips."
             ;;
     esac
 done
 
-print -P "%BFetching Vim modules%b"
-if (( $install_vim_modules )); then
-    curl -fLo --create-dirs \
-        "${XDG_DATA_HOME:-$HOME/.local/share}/nvim/site/autoload/plug.vim" \
-        "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim"
+if (( $configure_vim )); then
+    print -P "%BConfiguring Vim%b"
 
     VIM=nvim
     if ! whence -cp nvim >& -; then
         VIM=vim
     fi
+
+    if [[ $VIM = "nvim" ]]; then
+        print -P "  Downloading vim-plug from Github"
+        curl --create-dirs -fL \
+            -o "${XDG_DATA_HOME:-$HOME/.local/share}/nvim/site/autoload/plug.vim" \
+            "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" \
+            1>/dev/null
+
+        if whence -cp python3 >& -; then
+            print -P "  Installing pynvim"
+            python3 -m pip install --user --upgrade pynvim 1>/dev/null
+        fi
+    fi
+
     $VIM +PlugInstall +qall
-else
-    print "  Nothing to do"
 fi
 
 exit 0