From 67fc5ddb4a4b11812107144b7ba921f8f1ea23bd Mon Sep 17 00:00:00 2001 From: Andrew Stowell Date: Tue, 13 May 2025 07:54:57 -0400 Subject: [PATCH] vim setup completed. --- setup/2-config.sh | 44 ++++++++++++++++++- .../config/vim-colorful256.vim | 0 .../vim/vimrc => setup/config/vim-vimrc | 2 - 3 files changed, 42 insertions(+), 4 deletions(-) mode change 100644 => 100755 setup/2-config.sh rename one-time-stuff/vim/colorful256.vim => setup/config/vim-colorful256.vim (100%) rename one-time-stuff/vim/vimrc => setup/config/vim-vimrc (98%) diff --git a/setup/2-config.sh b/setup/2-config.sh old mode 100644 new mode 100755 index a14573e..d1c5ca5 --- a/setup/2-config.sh +++ b/setup/2-config.sh @@ -243,13 +243,53 @@ echo '' # ---------------------------------------------------------- -# TODO vim config -# TODO if bashrc was edited, show "source to take effect now"... +read -p 'Set VIM colors, config, and plugins? [y/N]: ' response +case "${response}" in + [Yy]* ) + make_bashrc_backup + sudo apt install vim vim-editorconfig jq curl -y + ( cat << 'BASHRC' +# ABS default to using vim +export EDITOR=vim +export VISUAL=vim +# ABS less to render tabs as 4 characters +export LESS=Rx4 +BASHRC +) >> "${HOME}/.bashrc" + if [[ -f "${HOME}/.vimrc" ]] && [[ ! -f "${HOME}/vimrc.backup.${curdate}" ]]; then + mv "${HOME}/.vimrc" "${HOME}/vimrc.backup.${curdate}" + fi + [ ! -d "${HOME}/.vim/colors" ] && mkdir -p "${HOME}/.vim/colors" + [ ! -d "${HOME}/.vim/autoload" ] && mkdir -p "${HOME}/.vim/autoload" + # determine vim-plug latest version release tag + version=$(curl --silent 'https://api.github.com/repos/junegunn/vim-plug/releases/latest' | jq -r '.tag_name') + if [[ -z "$version" ]]; then + # fallback to main branch if needed + version="master" + fi + curl --output "${HOME}/.vim/autoload/plug.vim" --silent "https://raw.githubusercontent.com/junegunn/vim-plug/${version}/plug.vim" + cp "${script_dir}/config/vim-vimrc" "${HOME}/.vimrc" + cp "${script_dir}/config/vim-colorful256.vim" "${HOME}/.vim/colors/colorful256.vim" + vim +'PlugInstall --sync' +quitall + ;; + * ) + echo 'Skipping' + ;; +esac +echo '' + +# ---------------------------------------------------------- + +if [ "${called_backup}" = true ]; then + echo -e "\e[33mremember some changes will not take effect until you run:" + echo -e "\e[36msource ~/.bashrc\e[m" + echo '' +fi diff --git a/one-time-stuff/vim/colorful256.vim b/setup/config/vim-colorful256.vim similarity index 100% rename from one-time-stuff/vim/colorful256.vim rename to setup/config/vim-colorful256.vim diff --git a/one-time-stuff/vim/vimrc b/setup/config/vim-vimrc similarity index 98% rename from one-time-stuff/vim/vimrc rename to setup/config/vim-vimrc index 03749f9..6b796be 100644 --- a/one-time-stuff/vim/vimrc +++ b/setup/config/vim-vimrc @@ -1,7 +1,5 @@ silent! source $VIMRUNTIME/defaults.vim -packadd! editorconfig - set tabstop=4 set shiftwidth=4 set softtabstop=4