vim/vimrc: change cinoptions

[smckown/dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 68d687ef6d73e46999cac6e705f640799e3e4b52..57fd1d810c2063b5b388cf23398214fb5c94154b 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -70,15 +70,22 @@ set list
 " Set default indent policy.  smarttab, roundshift enabled by sensible
 set softtabstop=2 shiftwidth=2 expandtab
 
+" cinoptions for code formatting
+set cinoptions=t0,us,U1,k2s
+
 " File type specific settings.
 if has("autocmd")
   autocmd filetype make setlocal sts=0 sw=8 noexpandtab tw=80 fo-=t fo+=j
   autocmd filetype sh,ld setlocal sts=4 sw=4 tw=80 fo-=t fo+=j
   autocmd filetype python setlocal sts=4 sw=4 tw=79 fo-=t fo+=j
   autocmd filetype html,xml setlocal listchars-=tab:>. tw=80 fo-=t fo+=j
-  autocmd filetype text,markdown,mkd,md setlocal tw=80 fo-=t fo+=j
-  autocmd filetype c,cpp,java setlocal tw=80 fo-=t fo+=j
-  autocmd filetype nesc setlocal syntax=c.doxygen tw=80 fo-=t fo+=j
+  autocmd filetype markdown,mkd,md setlocal tw=80 fo-=t fo+=j
+  autocmd filetype c,cpp,java setlocal tw=80 fo+=jt
+  autocmd filetype nesc setlocal syntax=c.doxygen tw=80 fo+=jt
+  autocmd filetype text setlocal tw=80 fo+=jt
+  autocmd filetype tex setlocal tw=80 fo+=jt
+
+  autocmd BufReadPre README*,TODO*,INSTALL* setlocal tw=80 fo+=t
 
   " Whitelist for auto-stripping trailing whitespace on buffer write
   autocmd BufWritePre *.c,*.h,*.nesc,*.py,*.java,*.sh,make :call <SID>StripTrailingWhitespace()
@@ -90,9 +97,7 @@ endif
 " Setup swap/backup/undo
 " Note that as of vim 7.4, backupdir // will not expand backup files to a full
 " path as is the case with directory and undodir.
-let s:dir = expand(has('win32') ? '~/Application Data/Vim' : has('mac') ?
-  \ '~/Library/Vim' : '~/.local/share/vim')
-execute 'set directory^=' . s:dir . '/swap//'
+let s:dir = expand(has('win32') ? '$HOME/vimfiles' : '$HOME/.vim')
 if !isdirectory(s:dir . '/')
   call mkdir(s:dir)
 endif
@@ -105,6 +110,7 @@ endif
 if !isdirectory(s:dir . '/undo/')
   call mkdir(s:dir . '/undo')
 endif
+execute 'set directory^=' . s:dir . '/swap//'
 if isdirectory(s:dir . '/backup/')
   execute 'set backupdir=' . s:dir . '/backup//'
   set backup
@@ -174,12 +180,6 @@ set tags=tags;/
 " %% on an ex command line expands to the dir path of the current buffer
 cnoremap <expr> %% getcmdtype() == ':' ? expand('%:h').'/' : '%%'
 
-" Create some edit maps for opening new files
-map <leader>ew :e %%<CR>
-map <leader>es :sp %%<CR>
-map <leader>ev :vsp %%<CR>
-map <leader>et :tabe %%<CR>
-
 " Make <C-]> and g] work like g<C-]>, which uses :tjump
 nnoremap g] g<C-]>
 nnoremap <C-]> g<C-]>
@@ -211,6 +211,19 @@ if has("autocmd")
     \ endif
 endif
 
+" Fugitive shortcuts
+nnoremap <silent> <leader>gs :Gstatus<CR>
+nnoremap <silent> <leader>gd :Gdiff<CR>
+nnoremap <silent> <leader>gc :Gcommit<CR>
+nnoremap <silent> <leader>gb :Gblame<CR>
+nnoremap <silent> <leader>gl :Glog<CR>
+nnoremap <silent> <leader>gp :Git push<CR>
+nnoremap <silent> <leader>gr :Gread<CR>
+nnoremap <silent> <leader>gw :Gwrite<CR>
+"nnoremap <silent> <leader>ge :Gedit<CR>
+nnoremap <silent> <leader>gi :Git add -p %<CR>
+nnoremap <leader>gg :Ggrep<SPACE>
+
 " EasyGrep
 " To ignore tags file, use system grep.
 let g:EasyGrepCommand=1
@@ -255,10 +268,10 @@ nmap <Leader>w <Plug>(easymotion-bd-w)
 nmap <Leader>b <Plug>(easymotion-bd-w)
 nmap <Leader>W <Plug>(easymotion-bd-W)
 nmap <Leader>B <Plug>(easymotion-bd-W)
-nmap <Leader>e <Plug>(easymotion-bd-e)
-nmap <Leader>E <Plug>(easymotion-bd-E)
-nmap <Leader>ge <Plug>(easymotion-bd-e)
-nmap <Leader>gE <Plug>(easymotion-bd-E)
+"nmap <Leader>e <Plug>(easymotion-bd-e)
+"nmap <Leader>E <Plug>(easymotion-bd-E)
+"nmap <Leader>ge <Plug>(easymotion-bd-e)
+"nmap <Leader>gE <Plug>(easymotion-bd-E)
 nmap <Leader>j <Plug>(easymotion-bd-jk)
 nmap <Leader>k <Plug>(easymotion-bd-jk)
 nmap <Leader>n <Plug>(easymotion-bd-n)
@@ -334,10 +347,15 @@ let g:delimitMate_matchpairs = "{:},[:],(:)"
 let g:delimitMate_autoclose = 1
 let g:delimitMate_expand_cr = 1
 let g:delimitMate_expand_space = 1
-nnoremap coa :DelimitMateSwitch<CR>
+" cop means to toggle auto pairing
+nnoremap cop :DelimitMateSwitch<CR>
 
 " Rainbow Parenthesis -- off by default but set toggle
-nnoremap cop :RainbowParenthesesToggle<CR>
+nnoremap co( :RainbowParenthesesToggle<CR>
+
+" mkbuild tools
+nnoremap <silent> <leader>e :call mkbuild#DmenuOpen('e')<CR>
+nnoremap <silent> <leader>x :call mkbuild#SelectXrefs()<CR>
 
 " Turn on doxygen syntax highlighting for C, C++, C# and IDL files.
 let g:load_doxygen_syntax=1
@@ -371,8 +389,24 @@ function! ToggleFormatOptionT()
   endif
 endfunction
 
+" Implement 'coa' -- Toggle formatoption 'a' -- auto-wrap paragraphs
+nnoremap coa :call ToggleFormatOptionA()<CR>
+function! ToggleFormatOptionA()
+  let tmp = substitute(&formatoptions, 'a', '', '')
+  if &formatoptions == tmp
+    set fo+=a
+    :echo "Enable auto-wrap paragraphs"
+  else
+    set fo-=a
+    :echo "Disable auto-wrap paragraphs"
+  endif
+endfunction
+
 " Insert date and time in insert mode.  Have to use the native <Leader>, not
 " its re-mapped version <space>
-imap <leader>d <C-R>=strftime("%Y%m%d")<CR>
-imap <leader>D <C-R>=strftime("%Y-%m-%d")<CR>
-imap <leader>t <C-R>=strftime("%H:%M:%S")<CR>
+"nmap <leader>dd "=strftime('%Y%m%d')<CR>p
+"imap <leader>dd <C-R>=strftime('%Y%m%d')<CR>
+"nmap <leader>dD "=strftime('%Y-%m-%d')<CR>p
+"imap <leader>dD <C-R>=strftime('%Y-%m-%d')<CR>
+"nmap <leader>dt "=strftime('%H:%M:%S')<CR>p
+"imap <leader>dt <C-R>=strftime('%H:%M:%S')<CR>