Update setup script to allow partial setups

Also remove pip install of python neovim because this is done with
os package managers now
This commit is contained in:
ViViDboarder 2021-06-09 10:22:27 -07:00
parent 2a1b012ee9
commit ba11b4e68e
1 changed files with 8 additions and 19 deletions

View File

@ -5,36 +5,25 @@
# http://github.com/ViViDboarder/Vim-Settings # http://github.com/ViViDboarder/Vim-Settings
############################ ############################
if [ -d ~/.vim ] || [ -f ~/.vimrc ] || [ -d ~/.nvim ] || [ -f ~/.nvimrc ] || [ -d ~/.config/nvim ]; then set -ex
echo "Vim files already exist. Please backup or remove .(n)vim and .(n)vimrc and .config/nvim"
exit 1
fi
# Get current directory for future use in links # Get current directory for future use in links
VIM_SYNC_DIR=$(dirname $0) VIM_SYNC_DIR=$(dirname "$0")
cd $VIM_SYNC_DIR cd "$VIM_SYNC_DIR"
VIM_SYNC_DIR=$(pwd) VIM_SYNC_DIR=$(pwd)
# Vim # Vim
ln -s $VIM_SYNC_DIR/vim/init.vim ~/.vimrc [ -d "$HOME/.vim" ] || ln -s "$VIM_SYNC_DIR/vim" "$HOME/.vim"
ln -s $VIM_SYNC_DIR/vim ~/.vim [ -f "$HOME/.vimrc" ] || ln -s "$VIM_SYNC_DIR/vim/init.vim" "$HOME/.vimrc"
# Neovim legacy # Neovim
ln -s $VIM_SYNC_DIR/vim/init.vim ~/.nvimrc mkdir -p "${XDG_CONFIG_HOME:=$HOME/.config}"
ln -s $VIM_SYNC_DIR/vim ~/.nvim [ -f "$XDG_CONFIG_HOME/nvim" ] || ln -s "$VIM_SYNC_DIR/vim" "$XDG_CONFIG_HOME/nvim"
# Neovim new
mkdir -p ${XDG_CONFIG_HOME:=$HOME/.config}
ln -s $VIM_SYNC_DIR/vim $XDG_CONFIG_HOME/nvim
# Install all bundles # Install all bundles
echo "Install all bundles" echo "Install all bundles"
if hash nvim 2>/dev/null; then if hash nvim 2>/dev/null; then
if hash pip 2>/dev/null; then
echo 'Installing neovim python module in $HOME'
pip install --user neovim
fi
echo "If using Neovim, install the python modules in your environment" echo "If using Neovim, install the python modules in your environment"
nvim +PlugInstall +qall nvim +PlugInstall +qall
fi fi