neovim/init.lua

@@ -56,12 +56,16 @@ vim.keymap.set('n', '<leader>wq', '<cmd>TroubleToggle workspace_diagnostics<cr>'
 -- vim-plug
 local data_dir = vim.fn.stdpath('data')
 vim.cmd([[
-let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
+" Install vim-plug if not found
-if empty(glob(data_dir . '/autoload/plug.vim'))
+if empty(glob('~/.vim/autoload/plug.vim'))
-    silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+  silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
+      \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 endif
 
-autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+" Run PlugInstall if there are missing plugins
+autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
+    \| PlugInstall --sync | source $MYVIMRC
+\| endif
 ]])
 
 local Plug = vim.fn['plug#']