diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter deleted file mode 160000 index 47ffb2e..0000000 --- a/vim/bundle/vim-gitgutter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 47ffb2e30b27c58fe091862eebe044df65e5a7dc diff --git a/vim/colors/darkcloud.vim b/vim/colors/darkcloud.vim index 89183bd..96a5573 100644 --- a/vim/colors/darkcloud.vim +++ b/vim/colors/darkcloud.vim @@ -360,12 +360,11 @@ call s:X("DiffDelete","#000000","#d75f5f","italic",s:termBlack,"Red") call s:X("DiffChange","#000000","#87d7ff","italic",s:termBlack,"Blue") call s:X("DiffText","#000000","#c6c6c6","italic",s:termBlack,"White") -"git +"version control +call s:X("SignifySignAdd","#ffd787","","bold","","Yellow") +call s:X("SignifySignDelete","#d75f5f","","bold","","Red") +call s:X("SignifySignChange","#87d7ff","","bold","","Blue") hi! link gitconfigAssignment Label -call s:X("GitGutterAdd","#ffd787","","bold","","Yellow") -call s:X("GitGutterDelete","#d75f5f","","bold","","Red") -call s:X("GitGutterChange","#87d7ff","","bold","","Blue") -hi! link GitGutterChangeDelete GitGutterChange "html call s:X("htmlTitle","#ffffff","","underline,bold","White","") diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim index d31233c..514df1c 100644 --- a/vim/config/keyboard.vim +++ b/vim/config/keyboard.vim @@ -62,6 +62,7 @@ " | (A) -> toggle all folds " | (A) -> toggle spell check " | (A) -> toggle syntax checking +" | (A) -> toggle version control differences " | (A) -> toggle the tagbar sidebar " | (A) -> toggle the location list to check syntax errors " | (A) -> toggle the gundo undo history sidebar @@ -121,8 +122,8 @@ " | (N) -> move a line up a half page " | (N) -> move a line down a half page " -" >> | (N) -> next difference (vimdiff/gitgutter) -" << | (N) -> previous difference (vimdiff/gitgutter) +" >> | (N) -> next difference (vimdiff/signify) +" << | (N) -> previous difference (vimdiff/signify) " " (selection) " | (N) -> select all text @@ -279,6 +280,9 @@ xnoremap ':SyntasticToggleModev' inoremap ':SyntasticToggleMode' + "toggle signify + let g:signify_mapping_toggle = '' + "bindings to trigger the tagbar list of tags nnoremap ':TagbarToggle:echo "Code tagbar toggled"' xnoremap ':TagbarTogglev' @@ -383,7 +387,11 @@ nmap MoveLineHalfPageUp nmap MoveLineHalfPageDown - "move to next/previous difference (vimdiff/gitgutter) + "map signify to ]c and [c + let g:signify_mapping_next_hunk = ']c' + let g:signify_mapping_prev_hunk = '[c' + + "move to next/previous difference (vimdiff/signify) nmap >> ]c nmap << [c "} diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim index 66729bb..923e37c 100644 --- a/vim/config/plugins.vim +++ b/vim/config/plugins.vim @@ -16,7 +16,7 @@ let g:breeze_shade_color = "String" "}}} -"EMMET: ZENCODING FEATURES {{{ +"EMMET: {{{ let g:user_emmet_install_global=0 let g:use_emmet_complete_tag=1 let g:user_emmet_mode='a' @@ -28,12 +28,11 @@ endif "}}} -"GITGUTTER: {{{ - let g:gitgutter_sign_added='++' - let g:gitgutter_sign_removed='--' - let g:gitgutter_sign_modified='~~' - let g:gitgutter_sign_modified_removed='~-' - let g:gitgutter_escape_grep=1 +"SIGNIFY: {{{ + let g:signify_sign_add = '+' + let g:signify_sign_change = '!' + let g:signify_sign_delete = '-' + let g:signify_sign_delete_first_line = '~' "}}} "GUNDO: {{{