X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=plugins.vim;h=af14b039ab7cc390c363aec063a11dba3a052af3;hp=38b683dac43e86619b9cbc926e37ba222730f9b1;hb=6206953a96045d27445165a7c098a1b70fd78eed;hpb=5c75ea7c24597f8b975d28757b338197440e19fd

diff --git a/plugins.vim b/plugins.vim
index 38b683d..af14b03 100644
--- a/plugins.vim
+++ b/plugins.vim
@@ -1,3 +1,8 @@
+function! Cond(cond, ...)
+  let opts = get(a:000, 0, {})
+  return a:cond ? opts : extend(opts, { 'on': [], 'for': [] })
+endfunction
+
 Plug 'mhinz/vim-startify'
 
 Plug 'vim-airline/vim-airline'
@@ -8,13 +13,21 @@ Plug 'tpope/vim-fugitive'
 Plug 'airblade/vim-rooter'
 
 Plug 'Shougo/vimproc.vim', {'do': 'make'}
-Plug 'Shougo/denite.nvim'
+if has('nvim')
+  Plug 'Shougo/denite.nvim', { 'do': ':UpdateRemotePlugins' }
+else
+  Plug 'Shougo/denite.nvim'
+  Plug 'roxma/nvim-yarp'
+  Plug 'roxma/vim-hug-neovim-rpc'
+endif
 
 Plug 'scrooloose/nerdcommenter'
 
 Plug 'scrooloose/nerdtree', {'on': 'NERDTreeToggle'}
 Plug 'Xuyuanp/nerdtree-git-plugin', {'on': 'NERDTreeToggle'}
 
+Plug 'ryanoasis/vim-devicons', Cond(g:enable_plugin_devicons)
+
 Plug 'neomake/neomake'
 Plug 'majutsushi/tagbar', {'on': 'TagbarToggle'}
 
@@ -28,14 +41,14 @@ Plug 'cakebaker/scss-syntax.vim', {'for': 'scss'}
 Plug 'hail2u/vim-css3-syntax', {'for': ['scss', 'css']}
 Plug 'ap/vim-css-color', {'for': ['scss', 'css']}
 
-Plug 'tpope/vim-ragtag', {'for': ['html', 'xml']}
+Plug 'tpope/vim-ragtag'
 
 Plug 'lervag/vimtex', {'for': 'tex'}
 
 if has('nvim')
   Plug 'Shougo/deoplete.nvim', {'do': ':UpdateRemotePlugins' }
 else
-  Plug 'Shougo/deoplete.nvim', {'do': ':UpdateRemotePlugins' }
+  Plug 'Shougo/deoplete.nvim'
   Plug 'roxma/nvim-yarp'
   Plug 'roxma/vim-hug-neovim-rpc'
 endif
@@ -45,13 +58,17 @@ Plug 'Shougo/neosnippet-snippets'
 
 Plug 'tpope/vim-speeddating'
 Plug 'jceb/vim-orgmode', {'for': ['org']}
+Plug 'vimwiki/vimwiki'
+Plug 'mattn/calendar-vim'
 
 Plug 'Konfekt/vim-DetectSpellLang', {'do': 'spell'}
-Plug 'ciaranm/detectindent'
+Plug 'roryokane/detectindent'
 
 Plug 'derekwyatt/vim-fswitch', {'for': ['c', 'cpp', 'objc']}
 Plug 'ludovicchabant/vim-gutentags', {'for': ['c', 'cpp', 'objc']}
-Plug 'vim-scripts/Conque-GDB', {'for': ['c', 'cpp', 'objc']}
+"Plug 'vim-scripts/Conque-GDB', {'for': ['c', 'cpp', 'objc']}
+
+Plug 'artur-shaik/vim-javacomplete2', {'for': 'java'}
 
 Plug 'godlygeek/tabular'
 Plug 'junegunn/vim-easy-align'