From 6791c410aa71199c9b0ff5aaf923bc4000b85091 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Fri, 1 Mar 2024 23:17:51 -0500 Subject: [PATCH] Don't check for neovim since we're only using neovim, and generate the rplugin manifest globally on update --- .gitignore | 1 + init.vim | 6 ++++++ update | 22 ++++++++++------------ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 719825e..7bfaad1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vim/bundle.user/* vim/user.vim +vim/rplugin.vim diff --git a/init.vim b/init.vim index 214e3ec..1eae783 100644 --- a/init.vim +++ b/init.vim @@ -14,6 +14,12 @@ let g:darkcloudpath = get(g:, "darkcloudpath", "/etc/darkcloud-nvimconfig") "}}} +"rplugin location: {{{ +lua << EOF + vim.env.NVIM_RPLUGIN_MANIFEST = vim.g.darkcloudpath .. "/vim/rplugin.vim" +EOF +"}}} + "LOAD DARKCLOUD CONFIG AND THEME FILES: {{{ "Add Config Directory: (distro-agnostic system-wide) let &runtimepath = printf('%s,%s/vim,%s/vim/after',&runtimepath,g:darkcloudpath,g:darkcloudpath) diff --git a/update b/update index 3c16eb4..4d7874e 100755 --- a/update +++ b/update @@ -261,19 +261,17 @@ type -P vim >/dev/null && { fi } -### UPDATE REMOTE PLUGINS IN NEOVIM -type -P nvim >/dev/null && { - printf '%s' "$cbg_blue >> Updating remote plugins for neovim:$c_reset" - $timeout_command --preserve-status --foreground 1m nvim -u ./init.vim -c ':UpdateRemotePlugins|qa!' +### UPDATE REMOTE PLUGINS +printf '%s' "$cbg_blue >> Updating remote plugins for neovim:$c_reset" +$timeout_command --preserve-status --foreground 1m nvim -u ./init.vim -c ':UpdateRemotePlugins|qa!' - if (( ! $? )); then - printf '%s\n' "$cfg_green_bold SUCCESS! $c_reset" - else - reset -I - printf '%s\n' "$cfg_red_bold FAIL! $c_reset" - error "nvim -u ./init.vim -c ':UpdateRemotePlugins|qa!'" 'Updating remote plugins for neovim failed' - fi -} +if (( ! $? )); then + printf '%s\n' "$cfg_green_bold SUCCESS! $c_reset" +else + reset -I + printf '%s\n' "$cfg_red_bold FAIL! $c_reset" + error "nvim -u ./init.vim -c ':UpdateRemotePlugins|qa!'" 'Updating remote plugins for neovim failed' +fi ### FINISH printf '\n%s\n\n' "$cbg_black ~~~ Update Complete ~~~ $c_reset"