zsh: disable flowcontrol

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 17e2a1e946cc9581ffb873cd2fd45390fae8a9f0..ab8b569b4ae03457aa5d286d93ac50c1a87be243 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -14,15 +14,18 @@ call vundle#rc('$XDG_DATA_HOME/vim')
 
 Plugin 'gmarik/vundle'
 
 
 Plugin 'gmarik/vundle'
 

+Plugin 'airblade/vim-gitgutter'

 Plugin 'bling/vim-airline'
 Plugin 'elzr/vim-json'
 Plugin 'bling/vim-airline'
 Plugin 'elzr/vim-json'

-Plugin 'rking/ag.vim'

 Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
 Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'

+Plugin 'junegunn/vim-easy-align'

 Plugin 'kien/ctrlp.vim'
 Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'kien/ctrlp.vim'
 Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'

+Plugin 'rking/ag.vim'

 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'
 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'

+Plugin 'sirver/ultisnips'

 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'tpope/vim-endwise'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'tpope/vim-endwise'


@@ -41,11 +44,8 @@ Plugin 'derekwyatt/vim-fswitch'
 " Plugin 'jalcine/cmake.vim'
 " Plugin 'powerman/vim-plugin-viewdoc'
 
 " Plugin 'jalcine/cmake.vim'
 " Plugin 'powerman/vim-plugin-viewdoc'
 

-Plugin 'airblade/vim-gitgutter'

 Plugin 'raimondi/delimitmate'
 Plugin 'raimondi/delimitmate'

-Plugin 'sirver/ultisnips'

 Plugin 'lokaltog/vim-easymotion'
 Plugin 'lokaltog/vim-easymotion'

-Plugin 'junegunn/vim-easy-align'

 Plugin 'chrisbra/checkattach'
 
 " remove entries first
 Plugin 'chrisbra/checkattach'
 
 " remove entries first


@@ -330,7 +330,7 @@ cnoremap <C-H>   <Left>
 cnoremap <C-L>   <Right>
 
 " close all folds open fold in cursor
 cnoremap <C-L>   <Right>
 
 " close all folds open fold in cursor

-nnoremap zx zMzxzz15<C-e>
+nnoremap zx zMzxzt

 
 " edit vimrc in new tab
 nmap <leader>ev :tabedit $MYVIMRC<CR>:lcd %:p:h<CR>
 
 " edit vimrc in new tab
 nmap <leader>ev :tabedit $MYVIMRC<CR>:lcd %:p:h<CR>


@@ -410,6 +410,7 @@ nnoremap <silent> <leader>gs :Gstatus<CR>
 nnoremap <silent> <leader>gd :Gdiff<CR>
 nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gd :Gdiff<CR>
 nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>

+nnoremap <silent> <leader>gb :Gblame<cr>

 
 " NERDTree {{{2
 " open/close NERDTree with \e
 
 " NERDTree {{{2
 " open/close NERDTree with \e


@@ -460,7 +461,7 @@ nnoremap <leader>jd :YcmCompleter GoTo<CR>
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode

-vnoremap <CR> <Plug>(EasyAlign)
+vmap <Enter> <Plug>(EasyAlign)

 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0