mutt: use column with for html rendering

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 71c794b4ff9661186e387c3208b15188fd06b239..c7397c44df1dfc3dc7f714714b5408fddd37bb03 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -6,6 +6,7 @@
 " bundles {{{1
 filetype off
 set runtimepath& " reset rtp
 " bundles {{{1
 filetype off
 set runtimepath& " reset rtp

+autocmd!

 
 set runtimepath+=$XDG_DATA_HOME/vim/vundle
 call vundle#rc('$XDG_DATA_HOME/vim')
 
 set runtimepath+=$XDG_DATA_HOME/vim/vundle
 call vundle#rc('$XDG_DATA_HOME/vim')


@@ -17,16 +18,18 @@ Bundle 'elzr/vim-json'
 Bundle 'ervandew/ag.git'
 Bundle 'http://git.code.sf.net/p/vim-latex/vim-latex'
 Bundle 'kien/ctrlp.vim'
 Bundle 'ervandew/ag.git'
 Bundle 'http://git.code.sf.net/p/vim-latex/vim-latex'
 Bundle 'kien/ctrlp.vim'

+Bundle 'kshenoy/vim-signature'

 Bundle 'majutsushi/tagbar'
 Bundle 'scrooloose/nerdtree'
 Bundle 'scrooloose/syntastic'
 Bundle 'sjl/gundo.vim'
 Bundle 'tomtom/tcomment_vim'
 Bundle 'majutsushi/tagbar'
 Bundle 'scrooloose/nerdtree'
 Bundle 'scrooloose/syntastic'
 Bundle 'sjl/gundo.vim'
 Bundle 'tomtom/tcomment_vim'

+Bundle 'tpope/vim-endwise'

 Bundle 'tpope/vim-fugitive'
 Bundle 'tpope/vim-fugitive'

+Bundle 'tpope/vim-repeat'

 Bundle 'tpope/vim-surround'
 Bundle 'tpope/vim-unimpaired'
 Bundle 'valloric/youcompleteme'
 Bundle 'tpope/vim-surround'
 Bundle 'tpope/vim-unimpaired'
 Bundle 'valloric/youcompleteme'

-"Bundle 'zhaocai/goldenview.vim'

 
 Bundle 'ompugao/ros.vim'
 Bundle 'ompugao/ctrlp-ros'
 
 Bundle 'ompugao/ros.vim'
 Bundle 'ompugao/ctrlp-ros'


@@ -37,7 +40,6 @@ Bundle 'derekwyatt/vim-fswitch'
 "Bundle 'jalcine/cmake.vim' 
 Bundle 'powerman/vim-plugin-viewdoc'
 
 "Bundle 'jalcine/cmake.vim' 
 Bundle 'powerman/vim-plugin-viewdoc'
 

-" rtp + xdg {{{1

 " remove entries first
 set runtimepath -=$HOME/.vim
 set runtimepath -=$HOME/.vim/after
 " remove entries first
 set runtimepath -=$HOME/.vim
 set runtimepath -=$HOME/.vim/after


@@ -52,6 +54,7 @@ filetype plugin indent on
 " bindings {{{1
 " allow both <space> and / to be <leader>
 map <space> <leader>
 " bindings {{{1
 " allow both <space> and / to be <leader>
 map <space> <leader>

+nnoremap <leader><cr> :make<cr>

 
 " moving around, searching and patterns {{{1
 set incsearch           " show match for partly typed search command
 
 " moving around, searching and patterns {{{1
 set incsearch           " show match for partly typed search command


@@ -213,8 +216,8 @@ map Y y$
 vnoremap . :normal .<CR>
 
 " add line without changing position or leaving mode
 vnoremap . :normal .<CR>
 
 " add line without changing position or leaving mode

-map <Leader>o :set paste<CR>m`o<ESC>``:set nopaste<CR>
-map <Leader>O :set paste<CR>m`O<ESC>``:set nopaste<CR>
+noremap <silent> <Leader>o :set paste<CR>m`o<ESC>``:set nopaste<CR>
+noremap <silent> <Leader>O :set paste<CR>m`O<ESC>``:set nopaste<CR>

 
 " Don't use Ex mode, use Q for formatting
 map Q gq
 
 " Don't use Ex mode, use Q for formatting
 map Q gq