diff --git a/README.md b/README.md index bcc2d73..01757ca 100644 --- a/README.md +++ b/README.md @@ -100,12 +100,12 @@ As usual, to have your system use `vimpager` in place of `less`, you'll need to #### Sidebars #### -| Binding | Mode | Action | -|--------------------------------|------|-------------------------------------| -| F9 and Backslash+\[ | ALL | Toggle **vimfiler** file manager sidebar | -| F10 and Backslash+\] | ALL | Toggle the **tagbar** source code tag sidebar | -| F11 and Backslash+} | ALL | Toggle the **extradite** git history window | -| F12 and Backslash+{ | ALL | Toggle the **gundo** undo history sidebar | +| Binding | Mode | Action | +|----------------------|------|-----------------------------------------------| +| F9 and Backslash+} | ALL | Toggle the **extradite** git history window | +| F10 and Backslash+{ | ALL | Toggle the **tagbar** source code tag sidebar | +| F11 and Backslash+\] | ALL | Toggle the **gundo** undo history sidebar | +| F12 and Backslash+\[ | ALL | Toggle **vimfiler** file manager sidebar | #### Toggles #### diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim index 845020e..681ba73 100644 --- a/vim/config/keyboard.vim +++ b/vim/config/keyboard.vim @@ -113,22 +113,22 @@ " _ | (N) -> unopen all folds " 0 | (N) -> reset all folds using default fold level " -" | (A) -> toggle vimfiler sidebar -" | (A) -> toggle vimfiler sidebar -" | (A) -> toggle vimfiler sidebar -" [ | (N) -> toggle vimfiler sidebar +" | (A) -> toggle extradite git commit history +" | (A) -> toggle extradite git commit history +" | (A) -> toggle extradite git commit history +" } | (N) -> toggle extradite git commit history " | (A) -> toggle the tagbar sidebar " | (A) -> toggle the tagbar sidebar " | (A) -> toggle the tagbar sidebar -" ] | (N) -> toggle the tagbar sidebar -" | (A) -> toggle extradite git commit history -" | (A) -> toggle extradite git commit history -" | (A) -> toggle extradite git commit history -" } | (N) -> toggle extradite git commit history -" | (A) -> toggle the gundo sidebar -" | (A) -> toggle the gundo sidebar -" | (A) -> toggle the gundo sidebar -" { | (N) -> toggle the gundo sidebar +" { | (N) -> toggle the tagbar sidebar +" | (A) -> toggle the gundo sidebar +" | (A) -> toggle the gundo sidebar +" | (A) -> toggle the gundo sidebar +" ] | (N) -> toggle the gundo sidebar +" | (A) -> toggle vimfiler sidebar +" | (A) -> toggle vimfiler sidebar +" | (A) -> toggle vimfiler sidebar +" [ | (N) -> toggle vimfiler sidebar " " | (A) -> toggle line wrapping " | (A) -> toggle line wrapping @@ -533,17 +533,17 @@ "reset all folds to the default fold level nnoremap 0 'zX:echo "all folds have been reset"' - "trigger vimfiler - 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' - 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' - 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' - nnoremap [ ':VimFiler -split -simple -toggle -no-quit -direction=topleft -winwidth=45' + "view commit history and diffs + 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' + 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' "bindings to trigger the tagbar list of tags nnoremap ':TagbarToggle:echo "tagbar toggled"' @@ -555,31 +555,31 @@ nnoremap ':TagbarToggle:echo "tagbar toggled"' xnoremap ':TagbarTogglegv' inoremap ':TagbarToggle' - nnoremap ] ':TagbarToggle:echo "tagbar toggled"' - - "view commit history and diffs - 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' - 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' + nnoremap { ':TagbarToggle:echo "tagbar toggled"' "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' - nnoremap { ':GundoToggle:echo "undo history sidebar toggled"' + 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' + nnoremap ] ':GundoToggle:echo "undo history sidebar toggled"' + + "trigger vimfiler + 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' + 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' + 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' + nnoremap [ ':VimFiler -split -simple -toggle -no-quit -direction=topleft -winwidth=45' "toggle line wrapping (and bottom bar if using the gui) nnoremap ':set wrap!:echo "line wrapping toggled"' @@ -825,9 +825,10 @@ autocmd FileType extradite map l j autocmd FileType extradite map autocmd FileType extradite map h k - autocmd FileType extradite map q - autocmd FileType extradite map q - autocmd FileType extradite map q + autocmd FileType extradite map q + autocmd FileType extradite map q + autocmd FileType extradite map q + autocmd FileType extradite map } q "gundo autocmd FileType gundo map 0l @@ -889,18 +890,22 @@ "MAPPINGS DISABLED FOR GIVEN FILETYPES: {{{ "remove incompatible toggles from specific file types autocmd Filetype extradite,gundo,help,tagbar,qf,vimfiler noremap ` - autocmd Filetype extradite,gundo,help,tagbar,qf noremap - autocmd Filetype extradite,gundo,help,tagbar,qf noremap - autocmd Filetype extradite,gundo,help,tagbar,qf noremap + autocmd Filetype gundo,help,tagbar,qf,vimfiler,diff noremap + autocmd Filetype gundo,help,tagbar,qf,vimfiler,diff noremap + autocmd Filetype gundo,help,tagbar,qf,vimfiler,diff noremap + autocmd Filetype gundo,help,tagbar,qf,vimfiler,diff noremap } autocmd Filetype extradite,gundo,help,qf,vimfiler noremap autocmd Filetype extradite,gundo,help,qf,vimfiler noremap autocmd Filetype extradite,gundo,help,qf,vimfiler noremap - autocmd Filetype gundo,help,tagbar,qf,vimfiler,diff noremap - autocmd Filetype gundo,help,tagbar,qf,vimfiler,diff noremap - autocmd Filetype gundo,help,tagbar,qf,vimfiler,diff noremap - autocmd Filetype extradite,help,tagbar,qf,vimfiler noremap - autocmd Filetype extradite,help,tagbar,qf,vimfiler noremap - autocmd Filetype extradite,help,tagbar,qf,vimfiler noremap + autocmd Filetype extradite,gundo,help,qf,vimfiler noremap { + autocmd Filetype extradite,help,tagbar,qf,vimfiler noremap + autocmd Filetype extradite,help,tagbar,qf,vimfiler noremap + autocmd Filetype extradite,help,tagbar,qf,vimfiler noremap ] + autocmd Filetype extradite,help,tagbar,qf,vimfiler noremap + autocmd Filetype extradite,gundo,help,tagbar,qf noremap + autocmd Filetype extradite,gundo,help,tagbar,qf noremap + autocmd Filetype extradite,gundo,help,tagbar,qf noremap + autocmd Filetype extradite,gundo,help,tagbar,qf noremap [ "disable modifier keys with directions that would interfere with logic autocmd Filetype qf,gundo,vimfiler noremap diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim index b7d9690..5a53c46 100644 --- a/vim/config/plugins.vim +++ b/vim/config/plugins.vim @@ -274,6 +274,8 @@ scriptencoding utf-8 let g:tagbar_singleclick=1 let g:tagbar_width=35 let g:tagbar_autofocus=1 + + autocmd FileType tagbar setlocal nocursorcolumn "}}} "TCOMMAND: {{{