diff --git a/.gitmodules b/.gitmodules index 1b7e416..925addd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,6 @@ [submodule "vim/bundle/syntastic"] path = vim/bundle/syntastic url = https://github.com/scrooloose/syntastic.git +[submodule "vim/bundle/ReplaceWithRegister"] + path = vim/bundle/ReplaceWithRegister + url = https://github.com/vim-scripts/ReplaceWithRegister.git diff --git a/vim/bundle/ReplaceWithRegister b/vim/bundle/ReplaceWithRegister new file mode 160000 index 0000000..c77ef9d --- /dev/null +++ b/vim/bundle/ReplaceWithRegister @@ -0,0 +1 @@ +Subproject commit c77ef9d4e6e9572002274fe985e87c4d8b335d52 diff --git a/vim/colors/darkcloud.vim b/vim/colors/darkcloud.vim index 424f97a..b32c17a 100644 --- a/vim/colors/darkcloud.vim +++ b/vim/colors/darkcloud.vim @@ -266,12 +266,12 @@ else let s:termBlack = "Grey" endif -"COLOR SETTINGS: +"SYNTAX COLORS: "format: ('name','fg ','bg ','style ',s:lowcolor-fg,'lowcolor-bg') "example:('Line','000000','f0f0f0','italic,bold',s:termBlack ,'White') call s:X("Visual","","262626","standout","",s:termBlack) -call s:X("Cursor","","262626","standout,bold,underline","",s:termBlack) +call s:X("Cursor","","000000","standout,bold,underline","",s:termBlack) call s:X("Pmenu","87d7ff","303030","","Grey","Blue") call s:X("PmenuSel","87d7ff","4e4e4e","bold","White","Black") @@ -314,8 +314,8 @@ call s:X("PreProc","ffd787","","","Yellow","") call s:X("Operator","d75f5f","","","Red","") call s:X("NonText","87d7ff","","","Blue","") call s:X("SpecialKey","000000","","",s:termBlack,"") -call s:X("Search","000000","87d7ff","bold",s:termBlack,"Blue") -call s:X("IncSearch","","","standout","","") +call s:X("Search","87d7ff","262626","standout","Blue",s:termBlack) +call s:X("IncSearch","87d7ff","262626","standout,bold","Blue",s:termBlack) call s:X("Directory","87d7ff","","","Blue","") call s:X("Question","87d7ff","","","Blue","") call s:X("ExtraWhitespace","262626","","standout",s:termBlack,"") @@ -409,7 +409,18 @@ call s:X("rubyGlobalVariable","","","bold","","") "lua hi! link luaOperator Conditional -"syntastic error checking +"vim-indent-guides +call s:X("IndentGuidesOdd","","7c7c7c","","","Grey") +call s:X("IndentGuidesEven","","1c1c1c","","",s:termBlack) +if !exists("g:indent_guides_auto_colors") + let g:indent_guides_auto_colors=0 +endif + +"PLUGIN COLOURS: +"taglist +hi! link TagListFileName Directory + +"syntastic call s:X("SyntasticError","d75f5f","","standout,bold","Red","") call s:X("SyntasticWarning","ffd787","","standout,bold","Yellow","") hi! link SyntasticErrorLine SyntasticError @@ -419,16 +430,7 @@ hi! link SyntasticWarningSign Statement hi! link qfSeparator Delimiter hi! link qfLineNr SyntasticError -"vim-indent-guides -call s:X("IndentGuidesOdd","","7c7c7c","","","Grey") -call s:X("IndentGuidesEven","","1c1c1c","","",s:termBlack) -if !exists("g:indent_guides_auto_colors") - let g:indent_guides_auto_colors = 0 -endif - -"plugins, etc. -hi! link TagListFileName Directory - +"COLOR DEFINITIONS: "delete functions {{{ delf s:X delf s:rgb @@ -441,7 +443,7 @@ hi! link TagListFileName Directory delf s:grey_number "}}} -"lightline statusbar colours {{{ +"colour presets (used with lightline) {{{ let s:base3 = '#eaeaea' let s:base23 = '#d0d0d0' let s:base2 = '#c6c6c6' diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim index 82f701b..33bd5a5 100644 --- a/vim/config/keyboard.vim +++ b/vim/config/keyboard.vim @@ -13,10 +13,10 @@ " Reference: (view plugin documentation for the full list of commands each offers) " q | (N) -> toggle display of the quickfix list " l | (N) -> toggle display of the location list +" ds" | (N) -> delete surrounding "" " cs'" | (N) -> change surrounding '' to "" (any delimiters work) " cs" | (N) -> change surrounding "" to the tag: " cst" | (N) -> change any surrounding tag to "" -" ds" | (N) -> delete surrounding "" " " Mappings: " (mouse) @@ -25,22 +25,24 @@ " | (A) -> unbind this from vim so xorg can paste " " (tabs) -" | (A) -> open a new tab " | (A) -> go to the next open tab " | (A) -> go to the previous open tab +" | (A) -> open a new tab +" ` | (N) -> create a new tab with vimfiler " " (toggles) +" `` | (N) -> toggle the vimfiler sidebar on the left +" ~~ | (N) -> toggle the vimfiler sidebar on the right " | (N) -> toggle folds " | (A) -> toggle line numbers -" | (A) -> toggle row/column highlighting +" | (A) -> toggle row/column cursor highlighting " | (A) -> toggle line wrapping " | (A) -> toggle all folds " | (A) -> toggle spell check " | (A) -> toggle syntax checking " | (A) -> toggle the gundo undo history sidebar " | (A) -> toggle the tagbar sidebar -" | (A) -> toggle the error list -" `` | (N) -> toggle the filer explorer sidebar +" | (A) -> toggle the location/error list " " (gvim toggles) " | (A) -> toggle the menu @@ -63,6 +65,7 @@ " | (N) -> remove whitespace " | (N) -> convert tabs into spaces " \ | (N) -> remove search highlighting +" | (N) -> an alt mapping to remove search highlighting " | (V) -> indent all the lines currently selected " | (N) -> indent the current line " | (V) -> unindent all the lines currently selected @@ -75,32 +78,43 @@ " | (N) -> move to the end of the line " | (N) -> move to the beginning of the non-whitespace " +" | (N) -> move a few lines up +" | (N) -> move a few lines down +" | (N) -> move a few lines right +" | (N) -> move a few lines left +" " (selection) -" | (V) -> select all -" | (N) -> select all -" a | (V) -> select all -" a | (N) -> select all -" | (V) -> toggle selection of all text above the cursor -" | (N) -> select all text above the cursor -" | (V) -> toggle selection of all text below the cursor -" | (N) -> select all text below the cursor -" | (V) -> toggle selection of all text to the right of the cursor -" | (N) -> select all text to the right of the cursor -" | (V) -> toggle selection of all non-whitespace to the left -" | (N) -> select all non-whitespace to the left +" | (N) -> select all text +" a | (N) -> select all text +" | (V) -> select all text +" a | (V) -> select all text +" +" | (V) -> select all text above +" | (V) -> select all text below +" | (V) -> select all text to the right +" | (V) -> select all text to the left up to the indent +" +" | (V) -> select a few lines up +" | (V) -> select a few lines down +" | (V) -> select a few lines right +" | (V) -> select a few lines left " " (vimdiff) " > | (N) -> update differences +" < | (N) -> an alt mapping to update differences " >> | (N) -> next difference " << | (N) -> previous difference " >< | (N) -> replace diff in current pane with other pane " <> | (N) -> replace diff in other pane with current pane " -" (paste) -" y | (N) -> copies the character -" p | (V) -> paste and replace the currently selected text -" P | (V) -> paste and replace the currently selected text +" (paste functions) " p | (N) -> view the paste buffers and register contents +" p | (N) -> paste in the direction entered +" y | (N) -> copies the character at the cursor +" P | (V) -> save selection to the buffer and paste over +" p | (V) -> preserve the buffer pasting over selected text +" +" (delete/cut functions) " d | (V) -> delete the currently selected text " x | (V) -> delete the currently selected text " x | (N) -> delete the char(s) under and the cursor @@ -130,79 +144,80 @@ "} "TABS:{ - "move to the next and previous tabs - nnoremap ':tabnew' nnoremap ':tabnext' nnoremap ':tabprev' + nnoremap ':tabnew' + nnoremap ` ':VimFiler -tab -project' "} "TOGGLES:{ + "bindings to trigger vimfiler + nnoremap `` ':VimFilerExplorer -direction=topleft -winwidth=45' + nnoremap ~~ ':VimFilerExplorer -direction=botright -winwidth=45' + "toggle folded code at foldpoints nnoremap za "unmap F1 from help then map it to toggle the display of line numbers - nnoremap ':set number!' - vnoremap ':set number!v' + nnoremap ':set number!:echo "Line numbers toggled"' + xnoremap ':set number!v' inoremap ':set number!' "toggle the cursor line and column - nnoremap ':set cursorline! cursorcolumn!' - vnoremap ':set cursorline! cursorcolumn!v' + nnoremap ':set cursorline! cursorcolumn!:echo "Cursor crosshair toggled"' + xnoremap ':set cursorline! cursorcolumn!v' inoremap ':set cursorline! cursorcolumn!' "toggle line wrapping (and bottom bar if using the gui) - nnoremap ':set wrap! go'.'-+'[&wrap]."=b\r" - vnoremap ':set wrap! go'.'-+'[&wrap]."=b\rv" - inoremap ':set wrap! go'.'-+'[&wrap]."=b\r" + nnoremap ':echo "Line wrapping toggled":set wrap!' + xnoremap ':set wrap!v' + inoremap ':set wrap!' "toggle all folds - nnoremap zi - vnoremap ziv + nnoremap zi:echo "Code Folding Toggled" + xnoremap ziv inoremap zi "toggle spellcheck - nnoremap ':set spell!' - vnoremap ':set spell!v' + nnoremap ':set spell!:echo "Spell checking toggled"' + xnoremap ':set spell!v' inoremap ':set spell!' "toggle syntax checking nnoremap ':SyntasticToggleMode' - vnoremap ':SyntasticToggleModev' + xnoremap ':SyntasticToggleModev' inoremap ':SyntasticToggleMode' "bindings to trigger the gundo undo history - nnoremap ':GundoToggle' - vnoremap ':GundoTogglev' + nnoremap ':GundoToggle:echo "Undo history sidebar toggled"' + xnoremap ':GundoTogglev' inoremap ':GundoToggle' "bindings to trigger the tagbar list of tags - nnoremap ':TagbarToggle' - vnoremap ':TagbarTogglev' + nnoremap ':TagbarToggle:echo "Code tagbar toggled"' + xnoremap ':TagbarTogglev' inoremap ':TagbarToggle' "bindings to trigger the tagbar list of errors - nmap