Moving from Vundle to vim-plug

minimal.vimrc.vim

@@ -12,11 +12,11 @@
 
 " Vundle Installation {{{
   " Bootstrap Vundle if it's not installed
-  if empty(system("grep lazy_load ~/.vim/bundle/Vundle.vim/autoload/vundle.vim"))
+  if empty(glob("~/.vim/autoload/plug.vim"))
-      silent !mkdir -p ~/.vim/bundle
+      echo "No vim-plug, getting it ..."
-      silent !rm -rf ~/.vim/bundle/Vundle.vim
+      execute '!curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-      silent !git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+      echo "Getting vim-plug ... done"
-  endif 
+  endif
 " }}}
 
 " Base settings {{{
@@ -40,44 +40,41 @@
 
 " Vundle setup - Preamble {{{
 
-  set runtimepath+=~/.vim/bundle/Vundle.vim
+  call plug#begin()
-  call vundle#begin()
-
-  Plugin 'VundleVim/Vundle.vim'
 
 " }}}
 
 " Vundle setup - Packages {{{
 
-  Plugin 'scrooloose/nerdtree'
+  Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
-  Plugin 'tpope/vim-fugitive'
+  Plug 'tpope/vim-fugitive'
-  Plugin 'mhinz/vim-signify'
+  Plug 'mhinz/vim-signify'
-  Plugin 'tmhedberg/matchit'
+  Plug 'tmhedberg/matchit'
-  Plugin 'spf13/vim-colors'
+  Plug 'spf13/vim-colors'
-  Plugin 'ajmwagar/vim-deus.git'
+  Plug 'ajmwagar/vim-deus.git'
-  Plugin 'tpope/vim-surround'
+  Plug 'tpope/vim-surround'
-  Plugin 'tpope/vim-repeat'
+  Plug 'tpope/vim-repeat'
-  Plugin 'drmikehenry/vim-fontsize'
+  Plug 'drmikehenry/vim-fontsize'
-  Plugin 'jiangmiao/auto-pairs'
+  Plug 'jiangmiao/auto-pairs'
-  Plugin 'terryma/vim-multiple-cursors'
+  Plug 'terryma/vim-multiple-cursors'
-  Plugin 'vim-airline/vim-airline'
+  Plug 'vim-airline/vim-airline'
-  Plugin 'vim-airline/vim-airline-themes'
+  Plug 'vim-airline/vim-airline-themes'
-  Plugin 'roxma/vim-hug-neovim-rpc'
+  "Plug 'roxma/vim-hug-neovim-rpc'
-  Plugin 'roxma/nvim-yarp'
+  "Plug 'roxma/nvim-yarp'
-  Plugin 'Shougo/denite.nvim'
+  "Plug 'Shougo/denite.nvim'
-  Plugin 'pR0Ps/molokai-dark'
+  Plug 'ctrlpvim/ctrlp.vim'
-  Plugin 'flrnprz/plastic.vim'
+  Plug 'pR0Ps/molokai-dark'
-  Plugin 'nathanaelkane/vim-indent-guides'
+  Plug 'flrnprz/plastic.vim'
-  Plugin 'luochen1990/rainbow'
+  Plug 'nathanaelkane/vim-indent-guides'
-  Plugin 'vhda/verilog_systemverilog.vim'
+  Plug 'luochen1990/rainbow'
-  Plugin 'nanotech/jellybeans.vim'
+  Plug 'vhda/verilog_systemverilog.vim'
+  Plug 'nanotech/jellybeans.vim'
 
 " }}}
 
 " Vundle - Closing {{{
 
-  call vundle#end()            " required
+  call plug#end()
-  filetype plugin indent on    " required
 
 " }}}
 
@@ -91,7 +88,7 @@
     elseif has("win32")
       set guifont=Iosevka\ Term\ Regular\ 13
     else
-      set guifont=Iosevka\ Term\ Regular\ 10.5
+      set guifont=Iosevka\ Term\ Regular\ 13.5
     end
 
     set columns=120 lines=54
@@ -113,6 +110,9 @@
     set guioptions=iaA
   else
     set background=dark
+    if has('vcon')
+        set termguicolors
+    endif
   endif
 
   " check to make sure vim has been compiled with colorcolumn support
@@ -121,8 +121,8 @@
     set colorcolumn=120
   endif
 
-  "colorscheme molokai-dark
+  colorscheme molokai-dark
-  colorscheme deus
+  "colorscheme deus
   set norelativenumber
   set number
 
@@ -219,8 +219,10 @@
   nnoremap <S-F8>     <C-w>s
   nnoremap <F8>       <C-w>v
 
-  nnoremap <F9>       :Denite buffer<CR>
+  "nnoremap <F9>       :Denite buffer<CR>
-  nnoremap <leader>b  :Denite buffer<CR>
+  "nnoremap <leader>b  :Denite buffer<CR>
+  nnoremap <F9>       :CtrlPMixed<CR>
+  nnoremap <leader>b  :CtrlPBuffer<CR>
 
   nnoremap <S-F10>    :set wrap!<CR>
   nnoremap <S-F1>     :set spell!<CR>