vim: add some options from dwyatt

diff --git a/vim/vimrc b/vim/vimrc
index e1255968964c13e9ca45920c26c3290261e3c259..1dce66c11caaf6ab5e1f68ee1dfe9f426236a9ea 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -70,6 +70,7 @@ Plugin 'octol/vim-cpp-enhanced-highlight'
 Plugin 'vim-scripts/mediawiki.vim'
 Plugin 'vim-scripts/replacewithregister'
 Plugin 'tpope/vim-abolish'
 Plugin 'vim-scripts/mediawiki.vim'
 Plugin 'vim-scripts/replacewithregister'
 Plugin 'tpope/vim-abolish'

+Plugin 'derekwyatt/vim-protodef'

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


@@ -87,6 +88,9 @@ syntax on
 colorscheme badwolf
 
 " options {{{1
 colorscheme badwolf
 
 " options {{{1

+" put $ and the end of text to be replaced with 'cw' and the likes
+set cpoptions+=$
+

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


@@ -180,11 +184,15 @@ set pastetoggle=<F11>           " key sequence to toggle paste mode
 set foldmethod=marker           " folding type
 set foldlevelstart=0            " value for 'foldlevel' when starting to edit a file
 
 set foldmethod=marker           " folding type
 set foldlevelstart=0            " value for 'foldlevel' when starting to edit a file
 

+" open folds when jumping to line
+set foldopen+=jump
+

 " save and restore folds
 set viewoptions=cursor          " only save cursor position
 
 " diff mode {{{2
 " save and restore folds
 set viewoptions=cursor          " only save cursor position
 
 " diff mode {{{2

-set diffopt=filler,vertical
+" vertical splits and ignore white space in diffs
+set diffopt=filler,vertical,iwhite

 
 " reading and writing files {{{2
 set modeline                    " read modelines
 
 " reading and writing files {{{2
 set modeline                    " read modelines


@@ -230,7 +238,7 @@ set wildignore+=*.pyc                            " Python byte code
 set wildignore+=*.orig                           " Merge resolution files
 
 " various {{{2
 set wildignore+=*.orig                           " Merge resolution files
 
 " various {{{2

-set virtualedit=block           " let cursor move past last char in <C-V> mode
+set virtualedit=all             " let cursor move past last char in <C-V> mode

 set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .cache
 
 set viewdir=$XDG_CACHE_HOME/vim/view//
 set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .cache
 
 set viewdir=$XDG_CACHE_HOME/vim/view//


@@ -332,10 +340,10 @@ vnoremap H ^
 vnoremap L g_
 
 " Heresy, emacs insert bindings
 vnoremap L g_
 
 " Heresy, emacs insert bindings

-inoremap <c-a> <esc>I
-inoremap <c-e> <esc>A
-cnoremap <c-a> <home>
-cnoremap <c-e> <end>
+inoremap <C-A> <Esc>I
+inoremap <C-E> <Esc>A
+cnoremap <C-A> <Home>
+cnoremap <C-E> <End>

 
 " proper movement when lines are wrapped
 noremap <expr> j (v:count == 0 ? 'gj' : 'j')
 
 " proper movement when lines are wrapped
 noremap <expr> j (v:count == 0 ? 'gj' : 'j')


@@ -404,11 +412,18 @@ autocmd BufWinLeave *.* mkview
 autocmd BufWinEnter *.* silent loadview
 
 " save with sudo
 autocmd BufWinEnter *.* silent loadview
 
 " save with sudo

-cnoremap w!! w !sudo tee % > /dev/null
+cabbrev w!! w !sudo tee % > /dev/null

 
 " uppercase previous word
 inoremap <C-C> <Esc>gUiwgi
 
 
 " uppercase previous word
 inoremap <C-C> <Esc>gUiwgi
 

+" http://git.io/v3ZeU
+nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
+
+" commands {{{1
+command! Cd lcd %:h
+command! Cr execute('lcd ' . FindGitDirOrHome())
+

 " plugins options {{{1
 " airline {{{2
 let g:airline#extensions#whitespace#enabled = 1
 " plugins options {{{1
 " airline {{{2
 let g:airline#extensions#whitespace#enabled = 1


@@ -593,6 +608,7 @@ nnoremap <leader>jd :YcmCompleter GoTo<CR>
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 vmap <Enter> <Plug>(EasyAlign)
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 vmap <Enter> <Plug>(EasyAlign)

+nmap ga <Plug>(EasyAlign)

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


@@ -682,3 +698,23 @@ endfunction
 nnoremap <silent> coS :call SwitchSpell()<CR>
 " fix spelling with first choice
 nnoremap <Leader>f 1z=
 nnoremap <silent> coS :call SwitchSpell()<CR>
 " fix spelling with first choice
 nnoremap <Leader>f 1z=

+
+" gitdir or home {{{2
+" from derek wyatt:
+" http://git.io/v3GAV
+function! FindGitDirOrHome()
+  let filedir = expand('%:p:h')
+  if isdirectory(filedir)
+    let cmd = 'bash -c "(cd ' . filedir . '; git rev-parse --show-toplevel 2>/dev/null)"'
+    let gitdir = system(cmd)
+    if strlen(gitdir) == 0
+      return '~'
+    else
+      return gitdir[:-2]
+    endif
+  else
+    return '~'
+  endif
+endfunction
+
+" vim:set et sw=2 ts=2 tw=78: