X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/310bf3f8e17359054d10d23774d781a851b576dd..6bdcde0655ded222e6ed9c50759754e4cc5ddc28:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 5930b40..a32bbe6 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -49,6 +49,10 @@ 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
@@ -61,15 +65,24 @@ nmap <silent> <Leader>n :silent nohl<CR>
 nmap <Leader># :%s:<C-R>/::gn<CR>
 " center cursor after search
 nnoremap n nzz
+
 " disable arrows
-inoremap <Up> <NOP>
-inoremap <Down> <NOP>
-inoremap <Left> <NOP>
+noremap  <Up>    <NOP>
+noremap  <Down>  <NOP>
+noremap  <Left>  <NOP>
+noremap  <Right> <NOP>
+inoremap <Up>    <NOP>
+inoremap <Down>  <NOP>
+inoremap <Left>  <NOP>
 inoremap <Right> <NOP>
-noremap <Up> <NOP>
-noremap <Down> <NOP>
-noremap <Left> <NOP>
-noremap <Right> <NOP>
+cnoremap <Up>    <NOP>
+cnoremap <Down>  <NOP>
+cnoremap <Left>  <NOP>
+cnoremap <Right> <NOP>
+cnoremap <C-K>   <Up>
+cnoremap <C-J>   <Down>
+cnoremap <C-H>   <Left>
+cnoremap <C-L>   <Right>
 
 set nostartofline       " don't  move the cursor to the first non-blank char of a line
 set path=.,include/,../include/,/usr/include/c++/*,/opt/ros/hydro/include
@@ -230,9 +243,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
-nnoremap <silent> <Space> @=(foldlevel('.')?'za':"\<Space>")<CR>
+nnoremap <leader><Space> za
 " 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