diff --git a/README.md b/README.md index 86625d5..9d19d1a 100644 --- a/README.md +++ b/README.md @@ -100,13 +100,13 @@ As usual, to have your system use `vimpager` in place of `less`, you'll need to #### Sidebars #### -| Binding | Mode | Action | -|-----------------|------|-----------------------------------------------| -| Ctrl-or-Alt+F1 | ALL | Toggle **vimfiler** file manager sidebar | -| Ctrl-or-Alt+F2 | ALL | Toggle the **gundo** undo history sidebar | -| Ctrl-or-Alt+F3 | ALL | Toggle the **tagbar** source code tag sidebar | -| Ctrl-or-Alt+F4 | ALL | Toggle the **extradite** git history window | -| Ctrl-or-Alt+F12 | ALL | Toggle the **goyo** distraction-free mode | +| Binding | Mode | Action | +|--------------------------------|------|-----------------------------------------------| +| Ctrl or Alt+F1 or Backslash+\[ | ALL | Toggle **vimfiler** file manager sidebar | +| Ctrl or Alt+F2 or Backslash+\] | ALL | Toggle the **gundo** undo history sidebar | +| Ctrl or Alt+F3 or Backslash+{ | ALL | Toggle the **tagbar** source code tag sidebar | +| Ctrl or Alt+F4 or Backslash+} | ALL | Toggle the **extradite** git history window | +| Ctrl or Alt+F12 | ALL | Toggle the **goyo** distraction-free mode | #### Toggles #### diff --git a/vim/config/after.vim b/vim/config/after.vim index 161c64e..a557b33 100644 --- a/vim/config/after.vim +++ b/vim/config/after.vim @@ -51,8 +51,8 @@ endif autocmd BufEnter,FileType extradite setlocal number "enable line numbers in extradite autocmd BufEnter,FileType help* setlocal nocursorline "remove the horizontal cursor line - "load help in an 80 char vertical split if the window is wider than 140 characters, otherwise load horizontally at 33% of the height - autocmd BufEnter,FileType help* if (winwidth(0) >= 140)|wincmd L|vertical resize 80|endif + "load in an 80 char vertical split if the window is wider than 140 characters + autocmd BufEnter,FileType help* if (winwidth(0) >= 110)|wincmd L|vertical resize 80|endif "settings for buffers in diff mode autocmd VimEnter,FilterWritePre * if &diff|setlocal nofoldenable|endif diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim index 6f40d49..686de92 100644 --- a/vim/config/keyboard.vim +++ b/vim/config/keyboard.vim @@ -114,13 +114,17 @@ " 0 | (N) -> reset all folds using default fold level " " | (A) -> toggle vimfiler sidebar -" | (A) -> toggle the gundo sidebar -" | (A) -> toggle the tagbar sidebar -" | (A) -> toggle extradite git commit history " | (A) -> toggle vimfiler sidebar -" | (A) -> toggle the gundo sidebar -" | (A) -> toggle the tagbar sidebar +" [ | (A) -> toggle vimfiler sidebar +" | (A) -> toggle the tagbar sidebar +" | (A) -> toggle the tagbar sidebar +" ] | (A) -> toggle the tagbar sidebar +" | (A) -> toggle the gundo sidebar +" | (A) -> toggle the gundo sidebar +" { | (A) -> toggle the gundo sidebar +" | (A) -> toggle extradite git commit history " | (A) -> toggle extradite git commit history +" } | (A) -> toggle extradite git commit history " " | (A) -> toggle line wrapping " | (A) -> toggle spell check @@ -495,22 +499,31 @@ nnoremap ':VimFiler -split -simple -toggle -no-quit -direction=topleft -winwidth=45' xnoremap ':VimFiler -split -simple -toggle -no-quit -direction=topleft -winwidth=45' inoremap ':VimFiler -split -simple -toggle -no-quit -direction=topleft -winwidth=45' - - "bindings to trigger the gundo undo history - nnoremap ':GundoToggle:echo "undo history sidebar toggled"' - xnoremap ':GundoToggle' - inoremap ':GundoToggle' - nnoremap ':GundoToggle:echo "undo history sidebar toggled"' - xnoremap ':GundoToggle' - inoremap ':GundoToggle' + nnoremap [ ':VimFiler -split -simple -toggle -no-quit -direction=topleft -winwidth=45' + xnoremap [ ':VimFiler -split -simple -toggle -no-quit -direction=topleft -winwidth=45' + inoremap [ ':VimFiler -split -simple -toggle -no-quit -direction=topleft -winwidth=45' "bindings to trigger the tagbar list of tags - nnoremap ':TagbarToggle:echo "tagbar toggled"' - xnoremap ':TagbarTogglegv' - inoremap ':TagbarToggle' + nnoremap ':TagbarToggle:echo "tagbar toggled"' + xnoremap ':TagbarTogglegv' + inoremap ':TagbarToggle' nnoremap ':TagbarToggle:echo "tagbar toggled"' xnoremap ':TagbarTogglegv' inoremap ':TagbarToggle' + nnoremap ] ':TagbarToggle:echo "tagbar toggled"' + xnoremap ] ':TagbarTogglegv' + inoremap ] ':TagbarToggle' + + "bindings to trigger the gundo undo history + nnoremap ':GundoToggle:echo "undo history sidebar toggled"' + xnoremap ':GundoToggle' + inoremap ':GundoToggle' + nnoremap ':GundoToggle:echo "undo history sidebar toggled"' + xnoremap ':GundoToggle' + inoremap ':GundoToggle' + nnoremap { ':GundoToggle:echo "undo history sidebar toggled"' + xnoremap { ':GundoToggle' + inoremap { ':GundoToggle' "view commit history and diffs nnoremap ':SyntasticToggleOff:Extradite!:resize 10:wincmd x:wincmd b:wincmd H:wincmd b' @@ -519,6 +532,9 @@ nnoremap ':SyntasticToggleOff:Extradite!:resize 10:wincmd x:wincmd b:wincmd H:wincmd b' xnoremap ':SyntasticToggleOff:Extradite!:resize 10:wincmd x:wincmd b:wincmd H:wincmd b' inoremap ':SyntasticToggleOff:Extradite!:resize 10:wincmd x:wincmd b:wincmd H:wincmd b' + nnoremap } ':SyntasticToggleOff:Extradite!:resize 10:wincmd x:wincmd b:wincmd H:wincmd b' + xnoremap } ':SyntasticToggleOff:Extradite!:resize 10:wincmd x:wincmd b:wincmd H:wincmd b' + inoremap } ':SyntasticToggleOff:Extradite!:resize 10:wincmd x:wincmd b:wincmd H:wincmd b' "toggle line wrapping (and bottom bar if using the gui) nnoremap ':set wrap!:echo "line wrapping toggled"' @@ -781,7 +797,7 @@ autocmd FileType qf map h j autocmd FileType qf map l k autocmd FileType qf map q ':call ToggleQuickfixList()' - autocmd FileType qf map ':call ToggleQuickfixList()' + autocmd FileType qf map ':call ToggleQuickfixList()' autocmd FileType qf map ':call ToggleQuickfixList()' "vimdiff @@ -808,9 +824,9 @@ "MAPPINGS DISABLED FOR GIVEN FILETYPES: {{{ "remove incompatible toggles from specific file types autocmd Filetype qf,gundo,vimfiler,tagbar,extradite,help noremap ` - autocmd Filetype qf,vimfiler,extradite,help noremap + autocmd Filetype qf,vimfiler,extradite,help noremap autocmd Filetype qf,vimfiler,extradite,help noremap - autocmd Filetype gundo,vimfiler,extradite,help noremap + autocmd Filetype gundo,vimfiler,extradite,help noremap autocmd Filetype gundo,vimfiler,extradite,help noremap autocmd Filetype qf,gundo,vimfiler,tagbar,help,diff noremap autocmd Filetype qf,gundo,vimfiler,tagbar,help,diff noremap diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim index 414a9f4..e412ce0 100644 --- a/vim/config/plugins.vim +++ b/vim/config/plugins.vim @@ -82,7 +82,7 @@ scriptencoding utf-8 "}}} "GUNDO: {{{ - let g:gundo_right=1 + let g:gundo_right=0 let g:gundo_width=35 let g:gundo_preview_height=10 @@ -96,7 +96,7 @@ scriptencoding utf-8 map g/ (incsearch-stay) "n and N behavioru is consistant - let g:incsearch#consistent_n_direction = 1 + let g:incsearch#consistent_n_direction=1 "}}} "JSON: {{{ @@ -413,7 +413,7 @@ scriptencoding utf-8 \ 'subseparator': {'left': '|', 'right': '|'}, \ 'component': { \ 'tagbar': '%{tagbar#currenttag("[%s]", "", "f")}', - \ }, + \ } \ } endif