vim: space be your leader

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 80d67d169ed9c6f803475c73741db889f29c4994..033b90d0bfaabea9490e63195646298a853a6e1f 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -33,7 +33,9 @@ Bundle 'ompugao/ctrlp-ros'
 
 Bundle 'firef0x/pkgbuild.vim'
 Bundle 'derekwyatt/vim-fswitch'
 
 Bundle 'firef0x/pkgbuild.vim'
 Bundle 'derekwyatt/vim-fswitch'

-Bundle 'jalcine/cmake.vim'
+" seems to have problems right now... may be add later?
+"Bundle 'jalcine/cmake.vim' 
+Bundle 'powerman/vim-plugin-viewdoc'

 
 " rtp + xdg {{{1
 " remove entries first
 
 " rtp + xdg {{{1
 " remove entries first


@@ -41,12 +43,16 @@ set runtimepath -=$HOME/.vim
 set runtimepath -=$HOME/.vim/after
 set runtimepath -=$XDG_CONFIG_HOME/vim
 set runtimepath -=$XDG_CONFIG_HOME/vim/after
 set runtimepath -=$HOME/.vim/after
 set runtimepath -=$XDG_CONFIG_HOME/vim
 set runtimepath -=$XDG_CONFIG_HOME/vim/after

-" then add prepend and append them
+" then prepend and append them

 set runtimepath ^=$XDG_CONFIG_HOME/vim
 set runtimepath +=$XDG_CONFIG_HOME/vim/after
 
 filetype plugin indent on
 
 set runtimepath ^=$XDG_CONFIG_HOME/vim
 set runtimepath +=$XDG_CONFIG_HOME/vim/after
 
 filetype plugin indent on
 

+" bindings {{{1
+" allow both <space> and / to be <leader>
+map <space> <leader>
+

 " moving around, searching and patterns {{{1
 set incsearch           " show match for partly typed search command
 set ignorecase          " ignore case when using a search pattern
 " moving around, searching and patterns {{{1
 set incsearch           " show match for partly typed search command
 set ignorecase          " ignore case when using a search pattern


@@ -228,9 +234,9 @@ set foldmethod=marker           " folding type
 set foldlevelstart=0            " value for 'foldlevel' when starting to edit a file
 
 " space will toggle current fold in normal mode
 set foldlevelstart=0            " value for 'foldlevel' when starting to edit a file
 
 " space will toggle current fold in normal mode

-nnoremap <silent> <Space> @=(foldlevel('.')?'za':"\<Space>")<CR>
+nnoremap <leader><Space> za

 " create folds around visual selection
 " create folds around visual selection

-vnoremap <Space> zf
+vnoremap <leader><Space> zf

 
 " save and restore folds
 set viewoptions=folds,cursor    " don't save local options
 
 " save and restore folds
 set viewoptions=folds,cursor    " don't save local options


@@ -325,6 +331,10 @@ let g:vim_json_syntax_conceal = 0
 let g:tex_flavor='latex'
 let g:Tex_DefaultTargetFormat='pdf'
 
 let g:tex_flavor='latex'
 let g:Tex_DefaultTargetFormat='pdf'
 

+" vim-viewdoc {{{2
+let g:no_viewdoc_maps = 1
+nnoremap K :call ViewDoc('doc', '<cword>')<cr>
+

 " functions {{{1
 " auto source vimrc when saved
 autocmd bufwritepost vimrc source $MYVIMRC
 " functions {{{1
 " auto source vimrc when saved
 autocmd bufwritepost vimrc source $MYVIMRC