From fb15796c0b31f53914bb1049fd5553b268eeb9fb Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Fri, 31 Oct 2014 01:22:22 -0400 Subject: [PATCH] Fix alt+dir for sidebars, add ctrl-w split shortcuts and gitv colorscheme --- vim/colors/darkcloud.vim | 6 ++++++ vim/config/keyboard.vim | 29 +++++++++++++++++++++++++++++ vim/config/settings.vim | 27 +++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/vim/colors/darkcloud.vim b/vim/colors/darkcloud.vim index 0d7de98..8dc3b91 100644 --- a/vim/colors/darkcloud.vim +++ b/vim/colors/darkcloud.vim @@ -491,6 +491,12 @@ hi SpellLocal guisp=NONE gui=NONE guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NON hi! link gitconfigAssignment Label hi! link ExtraditeLogName Type + "gitv + hi! link gitvSubject String + hi! link gitvLocalUncommit Special + hi! link gitvLocalCommited Identifier + hi! link gitvSeperatorMarks Delimiter + "notes call s:X("notesRule","","","bold","","") call s:X("WarningMsg","#ffd787","#2c2c2c","standout,bold","Yellow",s:termBlack) diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim index 6289188..e1c79ea 100644 --- a/vim/config/keyboard.vim +++ b/vim/config/keyboard.vim @@ -68,6 +68,16 @@ " | (N) -> create a new tab with vimfiler " | (N) -> create a new tab with a double pane vimfiler " +" (split) +" { | (N) -> rotate counter-clockwise +" } | (N) -> rotate clockwise +" ] | (N) -> split vertically +" 0 | (N) -> create a vertical split 25% of the window +" ) | (N) -> create a vertical split 75% of the window +" [ | (N) -> split horizontally +" 9 | (N) -> create a horizontal split 25% of the window +" ( | (N) -> create a horizontal split 75% of the window +" " (display) " | (N) -> reset window and clear search " // | (N) -> reset window and clear search @@ -396,6 +406,17 @@ nnoremap ':VimFiler -tab -project -double' "} + "SPLIT:{ + nmap { ':wincmd R' + nmap } ':wincmd r' + nmap ] ':vs' + nmap 0 ':VSplit25' + nmap ) ':VSplit75' + nmap [ ':sp:wincmd j' + nmap 9 ':Split25' + nmap ( ':Split75' + "} + "DISPLAY:{ "clear search and reset buffer nnoremap ':noh:redraw!' @@ -766,6 +787,14 @@ autocmd Filetype qf,gundo,vimfiler,extradite noremap autocmd Filetype qf,gundo,vimfiler,extradite noremap autocmd Filetype qf,gundo,vimfiler,extradite noremap + autocmd Filetype qf,gundo,vimfiler,extradite noremap + autocmd Filetype qf,gundo,vimfiler,extradite noremap + autocmd Filetype qf,gundo,vimfiler,extradite noremap + autocmd Filetype qf,gundo,vimfiler,extradite noremap + autocmd Filetype qf,gundo,vimfiler,extradite noremap + autocmd Filetype qf,gundo,vimfiler,extradite noremap + autocmd Filetype qf,gundo,vimfiler,extradite noremap + autocmd Filetype qf,gundo,vimfiler,extradite noremap autocmd Filetype qf,gundo,vimfiler noremap autocmd Filetype qf,gundo,vimfiler noremap autocmd Filetype qf,gundo,vimfiler noremap diff --git a/vim/config/settings.vim b/vim/config/settings.vim index ccc8ef0..0494de6 100644 --- a/vim/config/settings.vim +++ b/vim/config/settings.vim @@ -57,6 +57,7 @@ "USER INTERFACE: {{{ set laststatus=2 showcmd statusline=%F%m%r%h%w[%L][%{&ff}]%y[%p%%][%04l,%04v] "statusline init and config set lazyredraw "don't redraw the screen while macros are executing + set noequalalways "don't force splits to be equal in size when closing or opening one set number "enable line numbers set nowrap "disable line wrapping set cursorline cursorcolumn "enable row/column highlighting @@ -105,5 +106,31 @@ autocmd BufFilePost * filetype detect augroup END endif + + function s:vResize25() + vs|wincmd =|q + endfunction + command! -buffer VResize25 call s:vResize25() + function s:vs25() + vs|call s:vResize25() + endfunction + command! -buffer VSplit25 call s:vs25() + function s:vs75() + vs|wincmd h|call s:vResize25()|wincmd l + endfunction + command! -buffer VSplit75 call s:vs75() + + function s:hResize25() + sp|wincmd =|q + endfunction + command! -buffer HResize25 call s:hResize25() + function s:sp25() + sp|call s:hResize25()|wincmd j + endfunction + command! -buffer Split25 call s:sp25() + function s:sp75() + sp|wincmd j|call s:hResize25() + endfunction + command! -buffer Split75 call s:sp75() "}}} "}}}