From 29fb3756cda152fa577235be35f4ead67ad74b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sun, 27 May 2018 23:07:20 +0100
Subject: [PATCH] Refresh plugins list

---
 .vimrc.common.epilogue           |  8 ++++++++
 .vimrc.common.plugins            | 15 ++++++++-------
 .vimrc.linux.plugins             |  1 -
 common/configure_fresh_system.sh |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.vimrc.common.epilogue b/.vimrc.common.epilogue
index a2d5e812..87c1fb53 100644
--- a/.vimrc.common.epilogue
+++ b/.vimrc.common.epilogue
@@ -31,6 +31,14 @@ if executable('rg')
   set grepprg=rg\ --vimgrep
 endif
 
+if executable('rls')
+    au User lsp_setup call lsp#register_server({
+        \ 'name': 'rls',
+        \ 'cmd': {server_info->['rustup', 'run', 'nightly', 'rls']},
+        \ 'whitelist': ['rust'],
+        \ })
+endif 
+
 " fzf
 command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --color "always" '.shellescape(<q-args>).'| tr -d "\017"', 1, <bang>0)
 nmap <C-n> :Find 
diff --git a/.vimrc.common.plugins b/.vimrc.common.plugins
index 3dbf41e0..30f2bb36 100644
--- a/.vimrc.common.plugins
+++ b/.vimrc.common.plugins
@@ -1,20 +1,21 @@
 Plug 'https://github.com/cyplo/vim-colors-solarized.git'
 Plug 'mileszs/ack.vim'
-Plug 'scrooloose/nerdtree.git'
-Plug 'scrooloose/syntastic.git'
-Plug 'wting/rust.vim'
-Plug 'sjl/splice.vim.git'
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'timonv/vim-cargo'
 Plug 'kien/ctrlp.vim'
 Plug 'junegunn/fzf.vim'
 Plug 'will133/vim-dirdiff'
-Plug 'tpope/vim-dispatch.git'
-Plug 'tpope/vim-fugitive.git'
+Plug 'tpope/vim-dispatch'
+Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-sensible'
 Plug 'tpope/vim-cucumber'
-Plug 'airblade/vim-gitgutter.git'
+Plug 'airblade/vim-gitgutter'
 Plug 'godlygeek/tabular'
 Plug 'plasticboy/vim-markdown'
 Plug 'mhinz/vim-startify'
+Plug 'rust-lang/rust.vim'
+Plug 'prabirshrestha/async.vim'
+Plug 'prabirshrestha/vim-lsp'
+Plug 'prabirshrestha/asyncomplete.vim'
+Plug 'prabirshrestha/asyncomplete-lsp.vim'
diff --git a/.vimrc.linux.plugins b/.vimrc.linux.plugins
index bd430325..e69de29b 100644
--- a/.vimrc.linux.plugins
+++ b/.vimrc.linux.plugins
@@ -1 +0,0 @@
-Plug 'Valloric/YouCompleteMe'
diff --git a/common/configure_fresh_system.sh b/common/configure_fresh_system.sh
index 420703c9..20a63b99 100755
--- a/common/configure_fresh_system.sh
+++ b/common/configure_fresh_system.sh
@@ -159,7 +159,7 @@ if [[ -z $NOVIM ]]; then
         ~/.fzf/install --64 --all
     fi
     echo "Installing Vim plugins"
-    echo "\n" | vim +PluginInstall! +qa
+    echo "\n" | vim +PlugInstall! +qa
 
     if [[ -z $NOYCM ]]; then
         echo "configuring YouCompleteMe"