summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.gitmodules6
-rw-r--r--.vimrc15
m---------bundle/vim-gitgutter0
m---------bundle/vim-signify0
4 files changed, 13 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules
index 05474c0d..c7c86511 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,9 +46,6 @@
 [submodule "bundle/vim-commentary"]
 	path = bundle/vim-commentary
 	url = https://github.com/tpope/vim-commentary.git
-[submodule "bundle/vim-gitgutter"]
-	path = bundle/vim-gitgutter
-	url = https://github.com/airblade/vim-gitgutter.git
 [submodule "bundle/vim-ragtag"]
 	path = bundle/vim-ragtag
 	url = https://github.com/tpope/vim-ragtag.git
@@ -58,3 +55,6 @@
 [submodule "bundle/tagbar"]
 	path = bundle/tagbar
 	url = https://github.com/majutsushi/tagbar.git
+[submodule "bundle/vim-signify"]
+	path = bundle/vim-signify
+	url = https://github.com/mhinz/vim-signify.git
diff --git a/.vimrc b/.vimrc
index 86d2c328..ad031ff7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -38,10 +38,6 @@ set laststatus=2 " Always show statusline
 set noshowmode
 set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P
 
-" Airline config
-let g:airline_left_sep = ''
-let g:airline_right_sep = ''
-
 syntax on
 set background=dark
 if has('gui_running')
@@ -102,12 +98,21 @@ runtime macros/matchit.vim
 autocmd InsertEnter * setlocal nolist
 autocmd InsertLeave * setlocal list
 
+" Airline config
+let g:airline_left_sep = ''
+let g:airline_right_sep = ''
+
 " Syntastic options
 let g:syntastic_check_on_open=1
 let g:syntastic_enable_signs=0
 let g:syntastic_auto_loc_list=2
 
-let g:gitgutter_eager = 0
+" Signify
+let g:signify_vcs_list = ['git']
+let g:signify_sign_overwrite = 1
+let g:signify_sign_change = '~'
+
+let g:airline#extensions#hunks#non_zero_only = 1
 
 " Custom maps
 nnoremap ' `
diff --git a/bundle/vim-gitgutter b/bundle/vim-gitgutter
deleted file mode 160000
-Subproject ff031d022f2123353bc93a3aa97290287c10a28
diff --git a/bundle/vim-signify b/bundle/vim-signify
new file mode 160000
+Subproject ec4d88eb1c5dda97db0fc9e4ddbf33e11faacc3