X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=vim%2Fvimrc;h=3206b2013604f5fe104bccc4d296680f908c6f04;hb=cb42f617cab1ea52fa43a12f21b93750b9b892b6;hp=11dc04114584043e39a60179ed5b6d0dcdb4e428;hpb=1e5ec194036a4b7d3f32ac7f9d41a15e52cb12fe;p=smckown%2Fdotfiles.git

diff --git a/vim/vimrc b/vim/vimrc
index 11dc041..3206b20 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -75,6 +75,8 @@ set cinoptions=t0,U1,k2s,j1,J1
 
 " File type specific settings.
 if has("autocmd")
+  autocmd BufNewFile,BufRead /run/shm/* set nobackup nowritebackup noundofile
+    \ noswapfile viminfo="" noshelltemp history=0 nomodeline secure
   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
@@ -216,7 +218,7 @@ 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>gl :Git log<CR>
 nnoremap <silent> <leader>gp :Git push<CR>
 nnoremap <silent> <leader>gr :Gread<CR>
 nnoremap <silent> <leader>gw :Gwrite<CR>
@@ -353,8 +355,11 @@ nnoremap cop :DelimitMateSwitch<CR>
 " Rainbow Parenthesis -- off by default but set toggle
 nnoremap co( :RainbowParenthesesToggle<CR>
 
+" Toggle git gutter
+nnoremap cog :GitGutterToggle<CR>
+
 " mkbuild tools
-nnoremap <silent> <leader>e :call mkbuild#DmenuOpen('e')<CR>
+nnoremap <leader>e :<C-u>Unite -start-insert -buffer-name=files mkbfiles<CR>
 nnoremap <leader>x :<C-u>Unite -buffer-name=xrefs xrefs<cr>
 
 " Turn on doxygen syntax highlighting for C, C++, C# and IDL files.
@@ -418,6 +423,10 @@ nnoremap <leader>uf :<C-u>Unite -no-split -start-insert -buffer-name=files file_
 nnoremap <leader>uy :<C-u>Unite -no-split -buffer-name=yank history/yank<cr>
 nnoremap <leader>ub :<C-u>Unite -no-split -start-insert -buffer-name=buffer buffer<cr>
 nnoremap <leader>uo :<C-u>Unite -no-split -start-insert -buffer-name=outline outline<cr>
+nnoremap <leader>ul :<C-u>Unite -no-split -start-insert -buffer-name=lines line<cr>
+nnoremap <leader>uc :<C-u>Unite -no-split -buffer-name=quicklist qf<cr>
+nnoremap <leader>: :<C-u>Unite -start-insert -direction=dynamicbottom -buffer-name=command history/command<cr>
+nnoremap <leader>/ :<C-u>Unite -start-insert -direction=dynamicbottom -buffer-name=search history/search<cr>
 
 " Custom mappings for the unite buffer
 autocmd FileType unite call s:unite_settings()