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

diff --git a/vim/vimrc b/vim/vimrc
index 5930b40..c7397c4 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -6,6 +6,7 @@
 " bundles {{{1
 filetype off
 set runtimepath& " reset rtp
+autocmd!
 
 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 'kshenoy/vim-signature'
 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-repeat'
 Bundle 'tpope/vim-surround'
 Bundle 'tpope/vim-unimpaired'
 Bundle 'valloric/youcompleteme'
-"Bundle 'zhaocai/goldenview.vim'
 
 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'
 
-" rtp + xdg {{{1
 " remove entries first
 set runtimepath -=$HOME/.vim
 set runtimepath -=$HOME/.vim/after
@@ -49,11 +51,16 @@ set runtimepath +=$XDG_CONFIG_HOME/vim/after
 
 filetype plugin indent on
 
+" 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
 set ignorecase          " ignore case when using a search pattern
 set smartcase           " override 'ignorecase' when pattern has upper case characters
-set hlsearch                    " highlight all matches for the last used search pattern
+set hlsearch            " highlight all matches for the last used search pattern
 
 " use leader-n to unhighlight search
 nmap <silent> <Leader>n :silent nohl<CR>
@@ -61,15 +68,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
@@ -84,6 +100,8 @@ set lazyredraw                  " don't redraw while executing macros
 
 set list                        " show chars defined in 'listchars'
 set listchars=tab:»·,trail:·    " list of strings used for list mode
+set listchars+=extends:⋯,precedes:⋯
+set sidescrolloff=1             " don't scroll over the listchars
 
 set number                      " show the line number for each line
 set relativenumber              " show the relative line number for each line
@@ -198,8 +216,8 @@ map Y y$
 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
@@ -230,9 +248,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
@@ -257,7 +275,7 @@ set directory=$XDG_CACHE_HOME/vim,.,/var/tmp
 
 " command line editing {{{1
 set history=500                 " how many command lines are remembered
-set wildmode=longest:full       " specifies how command line completion works
+set wildmode=longest:full,full  " specifies how command line completion works
 set wildmenu                    " command-line completion shows a list of matches
 
 " various {{{1