From: Jannik ZANDER <jannikz@gmail.com>
Date: Wed, 4 May 2016 21:15:07 +0000 (+0200)
Subject: Replace Vundle with vim-plug
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=fd26b8883619207009d2247c5a56263df77592da;p=dotfiles.git

Replace Vundle with vim-plug
---

diff --git a/.bashrc b/.bashrc
index d999253..07db9b9 100644
--- a/.bashrc
+++ b/.bashrc
@@ -29,3 +29,5 @@ done;
 # Local/private settings
 [ -f "${HOME}/.bashrc_local" ] && source "${HOME}/.bashrc_local"
 
+
+[ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 5790a94..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule ".vim/bundle/Vundle.vim"]
-	path = .vim/bundle/Vundle.vim
-	url = http://github.com/VundleVim/Vundle.Vim
diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim
deleted file mode 160000
index 4984767..0000000
--- a/.vim/bundle/Vundle.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45
diff --git a/.vimrc b/.vimrc
index 704e944..df83413 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,26 +1,28 @@
 set nocompatible
 
 "------------------------------------------------------------------------------
-" For Vundle
+" For plug 
 "------------------------------------------------------------------------------
 "
-filetype off
-set rtp+=$HOME/.vim/bundle/Vundle.vim
-call vundle#begin('$HOME/.vim/bundle/')
+if empty(glob('$HOME/.vim/autoload/plug.vim'))
+  silent !curl -fLo $HOME/.vim/autoload/plug.vim --create-dirs
+    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+  autocmd VimEnter * PlugInstall | source $MYVIMRC
+endif
 
-Plugin 'VundleVim/Vundle.vim'
-Plugin 'thanthese/Tortoise-Typing'
-Plugin 'altercation/vim-colors-solarized.git'
-Plugin 'plasticboy/vim-markdown'
-Plugin 'mileszs/ack.vim'
-Plugin 'brandonbloom/csearch.vim'
-Plugin 'chazy/cscope_maps'
-Plugin 'vim-scripts/taglist.vim'
-Plugin 'airblade/vim-gitgutter'
+call plug#begin('$HOME/.vim/plugged')
 
-call vundle#end()            " required
-filetype plugin indent on    " required
-syntax enable
+Plug 'thanthese/Tortoise-Typing'
+Plug 'altercation/vim-colors-solarized'
+Plug 'plasticboy/vim-markdown'
+Plug 'mileszs/ack.vim'
+Plug 'brandonbloom/csearch.vim'
+Plug 'chazy/cscope_maps'
+Plug 'vim-scripts/taglist.vim'
+Plug 'airblade/vim-gitgutter'
+Plug 'junegunn/fzf.vim'
+
+call plug#end()
 
 "------------------------------------------------------------------------------
 " Regular setting
@@ -61,9 +63,14 @@ set ttimeoutlen=4000
 set tags+=tags;
 
 " For color
-let g:solarized_menu=0
-colorscheme solarized
+syntax enable
 set background=dark
+let g:solarized_menu=0
+try
+  colorscheme solarized
+catch
+  colorscheme default
+endtry
 
 if has("gui_running")
   if has("gui_gtk2")
@@ -84,6 +91,10 @@ let Tlist_GainFocus_On_ToggleOpen = 1
 let Tlist_Close_On_Select = 1
 nnoremap <C-l> :TlistToggle<CR>
 
+" %s is replaced with fzf command
+"let g:fzf_launcher = 'xterm -e bash -ic %s'
+let g:fzf_launcher = "In_a_new_term_function %s"
+
 " Easy escape
 inoremap jj           <ESC>
 inoremap j<Space>     j