Clean vimrc.

vim/vimrc

@@ -5,32 +5,35 @@ filetype off
 set rtp+=~/.vim/bundle/Vundle.vim/
 call vundle#begin()
 
-Plugin 'gmarik/vundle'
+Plugin 'VundleVim/Vundle.vim'
 
+Plugin 'bling/vim-airline'
+Plugin 'godlygeek/tabular'
+Plugin 'lepture/vim-jinja'
+Plugin 'majutsushi/tagbar'
+Plugin 'nblock/vim-dokuwiki'
+Plugin 'reedes/vim-pencil'
+Plugin 'saltstack/salt-vim'
 Plugin 'sickill/vim-monokai'
+Plugin 'tpope/vim-commentary'
+Plugin 'tpope/vim-fugitive'
+Plugin 'tpope/vim-speeddating'
+Plugin 'tpope/vim-surround'
+
+"Plugin 'Lokaltog/vim-easymotion'
+"Plugin 'PeterRincker/vim-argumentative'
+"Plugin 'Valloric/YouCompleteMe'
+"Plugin 'flazz/vim-colorschemes'
+"Plugin 'jmcantrell/vim-virtualenv'
+"Plugin 'kien/ctrlp.vim'
+"Plugin 'klen/python-mode'
 "Plugin 'mbbill/undotree'
 "Plugin 'scrooloose/nerdtree'
-Plugin 'tpope/vim-surround'
-Plugin 'tpope/vim-commentary'
-Plugin 'Valloric/YouCompleteMe'
-Plugin 'godlygeek/tabular'
-Plugin 'bling/vim-airline'
-Plugin 'tpope/vim-speeddating'
-" Plugin 'tpope/vim-fugitive'
-Plugin 'klen/python-mode'
-Plugin 'nblock/vim-dokuwiki'
-Plugin 'saltstack/salt-vim'
-Plugin 'lepture/vim-jinja'
-"Plugin 'terryma/vim-expand-region'
-"Plugin 'wincent/Command-T'
 "Plugin 'sjl/gundo.vim'
-Plugin 'kien/ctrlp.vim'
+"Plugin 'terryma/vim-expand-region'
-"Plugin 'PeterRincker/vim-argumentative'
-"Plugin 'wellle/targets.vim'
-"Plugin 'Lokaltog/vim-easymotion'
 "Plugin 'terryma/vim-multiple-cursors'
-"Plugin 'flazz/vim-colorschemes'
+"Plugin 'wellle/targets.vim'
-Plugin 'reedes/vim-pencil'
+"Plugin 'wincent/Command-T'
 
 call vundle#end()
 filetype plugin indent on
@@ -42,7 +45,6 @@ set autoindent
 set autoread
 set backspace=indent,eol,start
 set backupcopy=no
-set colorcolumn=79
 set colorcolumn=80
 set confirm
 set cursorline
@@ -60,8 +62,11 @@ set hlsearch
 set ignorecase
 set incsearch
 set laststatus=2
+set lazyredraw
 set linebreak
+set magic
 set matchpairs="(:),{:},[:],<:>"
+set matchtime=5
 set modeline
 set modelines=5
 set mouse=a
@@ -84,10 +89,9 @@ set shiftwidth=4
 set shortmess=rti
 set showcmd
 set showmatch
-set matchtime=5
 set showmode
 set smartcase
-set lazyredraw
+set smartindent
 set smarttab
 set softtabstop=4
 set swapfile
@@ -112,109 +116,37 @@ set wildmenu
 set wildmode=list:longest
 set wrap
 set wrapscan
-set magic
-
 let mapleader = "\<Space>"
 map <leader>w: w!<cr>
 
 nnoremap <Leader>w :w<CR>
-
-vmap <Leader>y "+y
-vmap <Leader>d "+d
-nmap <Leader>p "+p
-nmap <Leader>P "+P
-vmap <Leader>p "+p
-vmap <Leader>P "+P
-
 nmap <Leader><Leader> za
-
 map , :
 
-vmap v <Plug>(expand_region_expand)
-vmap <C-v> <Plug>(expand_region_shrink)
-
 vnoremap <silent> y y`]
 vnoremap <silent> p p`]
 nnoremap <silent> p p`]
 
-
-" enable 'very-magic' in regex
-"nnoremap / /\v
-"vnoremap / /\v
-
 nnoremap <leader>, :nohlsearch<CR>
 
 noremap gV `[v`]
 
-" make Y behave like other capitals, otherwise Y would work like yy
 map Y y$
-
 map j gj
 map k gk
 
-"function! TrimWhiteSpace()
-"     %s/\s\+$//e
-"endfunction
-
-" automatically reload .vimrc when it's saved
-autocmd BufWritePost .vimrc source ~/.vimrc
-
-"autocmd FileWritePre    * :call TrimWhiteSpace()
-"autocmd FileAppendPre   * :call TrimWhiteSpace()
-"autocmd FilterWritePre  * :call TrimWhiteSpace()
-"autocmd BufWritePre     * :call TrimWhiteSpace()
-
-" Start NERDTree when starting vim
-"autocmd vimenter * NERDTree
-"autocmd VimEnter * wincmd p
-let NERDTreeQuitOnOpen = 1
-" close NERDTree when it's the only window left
-"autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
-
-"call togglebg#map("<F5>")
-
 nnoremap <C-h> <C-w>h
 nnoremap <C-j> <C-w>j
 nnoremap <C-k> <C-w>k
 nnoremap <C-l> <C-w>l
 
-nnoremap <F3> :NERDTreeToggle<CR>
-nnoremap <F4> :TagbarToggle<CR>
-
 " Autosave views when closing and restoring when opening again.
 autocmd BufWinLeave *.* mkview
 autocmd BufWinEnter *.* silent loadview
 
-":inoremap <expr> <CR> pumvisible() ? '<C-e><CR>' : '<CR>'
-
-":au WinEnter * :setlocal number relativenumber
-":au WinLeave * :setlocal nonumber norelativenumber
-
-""nnoremap <up>    <nop>
-""nnoremap <down>  <nop>
-""nnoremap <left>  <nop>
-""nnoremap <right> <nop>
-""inoremap <up>    <nop>
-""inoremap <down>  <nop>
-""inoremap <left>  <nop>
-""inoremap <right> <nop>
-
 nmap <C-n> :bnext<CR>
 nmap <C-p> :bprev<CR>
 
-" default emacs movements for command line
-cnoremap <C-a>  <Home>
-cnoremap <C-b>  <Left>
-cnoremap <C-f>  <Right>
-cnoremap <C-d>  <Delete>
-cnoremap <M-b>  <S-Left>
-cnoremap <M-f>  <S-Right>
-cnoremap <M-d>  <S-right><Delete>
-cnoremap <Esc>b <S-Left>
-cnoremap <Esc>f <S-Right>
-cnoremap <Esc>d <S-right><Delete>
-cnoremap <C-g>  <C-c>
-
 inoremap jj <ESC>
 
 nnoremap <leader>v <C-w>v<C-w>l
@@ -224,23 +156,6 @@ nmap ; :CtrlPBuffer<CR>
 " no more ex mode
 nnoremap Q <nop>
 
-nnoremap <leader>r :%s///<Left><Left>
-
-
-autocmd BufWritePre *.rst silent :%s/\s\+$//e
-" setup for pymode
-let g:pymode_trim_whitespaces = 1
-let g:pymode_lint_on_write = 0
-let g:pymode_lint_unmodified = 0
-let g:pymode_lint_on_fly = 0
-let g:pymode_rope = 0
-let g:pymode_rope_completion = 0
-"let g:pymode_rope_completion_on_dot = 1
-let g:pymode_rope_goto_definition_cmd = "new"
-let g:pymode_syntax_all = 1
-let g:pymode_options = 1
-
-
 " setup for the solarized color theme
 set background=dark
 let g:solarized_termcolors=16
@@ -250,21 +165,33 @@ let g:solarized_visibility="normal"
 syntax enable
 colorscheme monokai
 
-" setup for vim-airline
+nnoremap <F10> :TagbarToggle<CR>
+let g:tagbar_map_jump = "i"
+let g:tagbar_left = 0
+let g:tagbar_vertical = 0
+let g:tagbar_width = 50
+let g:tagbar_autoclose = 1
+let g:tagbar_autofocus = 1
+let g:tagbar_sort = 0 " 1: sort by name, 0: sort by position
+let g:tagbar_compact = 1
+let g:tagbar_indent = 2
+let g:tagbar_show_linenumbers = 0
+let g:tagbar_foldlevel = 99 " unfold all
+
+let g:airline_right_sep = ''
+let g:airline_left_sep = ''
+let g:airline#extensions#disable_rtp_load = 1
+let g:airline_extensions = ['whitespace']
 let g:airline_theme='powerlineish'
-let g:airline_left_sep=''
+let g:airline_section_x = airline#section#create(['%{tagbar#currenttag("%s", "", "f")}','' , ' %{PencilMode()}', ' [', 'filetype', ']'])
-let g:airline_right_sep=''
-let g:airline_section_x = '%{PencilMode()}'
 let g:pencil#mode_indicators = {'hard': 'H', 'auto': 'A', 'soft': 'S', 'off': '',}
-"let g:airline_section_z=''
+let g:airline#extensions#whitespace#enabled = 1
+let g:airline#extensions#whitespace#symbol = ''
+let g:airline#extensions#whitespace#checks = ['trailing']
 
-" enable tabline at the top showing all buffers
+function! DeleteTrailingWS()
-"let g:airline#extensions#tabline#enabled = 1
+     exe "normal mz"
-
+     %s/\s\+$//e
-let g:ycm_complete_in_comments = 0
+     exe "normal `z"
-let g:ycm_complete_in_strings = 1
+endfunction
-let g:ycm_collect_identifiers_from_comments_and_strings = 0
+autocmd BufWrite * :call DeleteTrailingWS()
-let g:ycm_seed_identifiers_with_syntax = 1
-let g:ycm_add_preview_to_completeopt = 1
-let g:ycm_autoclose_preview_window_after_completion = 1
-let g:ycm_autoclose_preview_window_after_insertion = 1