aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateja <mail@matejamaric.com>2020-10-01 14:58:27 +0200
committerMateja <mail@matejamaric.com>2020-10-01 14:58:27 +0200
commit31072759b0121a80e4fe504a0be7e5643e5eaff8 (patch)
treeabd93201ec81cb1577070f3bbae5fb4addb8d64e
parent7efbeca94babcdb428c628511a51610fd8105bb2 (diff)
downloaddotfiles-31072759b0121a80e4fe504a0be7e5643e5eaff8.tar.gz
dotfiles-31072759b0121a80e4fe504a0be7e5643e5eaff8.zip
Git integration
-rw-r--r--.config/nvim/init.vim2
-rw-r--r--.config/nvim/plug-config/signify.vim22
-rw-r--r--.config/nvim/vim-plug/plugins.vim5
3 files changed, 28 insertions, 1 deletions
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 2de6964..d98eb87 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,4 +1,3 @@
-" Made using chrisatmachine.com neovim tutorials
source $HOME/.config/nvim/vim-plug/plugins.vim
source $HOME/.config/nvim/general/settings.vim
source $HOME/.config/nvim/keys/mappings.vim
@@ -6,4 +5,5 @@ source $HOME/.config/nvim/keys/which-key.vim
source $HOME/.config/nvim/themes/onedark.vim
source $HOME/.config/nvim/themes/airline.vim
source $HOME/.config/nvim/plug-config/coc.vim
+source $HOME/.config/nvim/plug-config/signify.vim
lua require'plug-colorizer'
diff --git a/.config/nvim/plug-config/signify.vim b/.config/nvim/plug-config/signify.vim
new file mode 100644
index 0000000..bd655f9
--- /dev/null
+++ b/.config/nvim/plug-config/signify.vim
@@ -0,0 +1,22 @@
+" Change these if you want
+let g:signify_sign_add = '+'
+let g:signify_sign_delete = '_'
+let g:signify_sign_delete_first_line = '‾'
+let g:signify_sign_change = '~'
+
+" I find the numbers disctracting
+let g:signify_sign_show_count = 0
+let g:signify_sign_show_text = 1
+
+
+" Jump though hunks
+nmap <leader>gj <plug>(signify-next-hunk)
+nmap <leader>gk <plug>(signify-prev-hunk)
+nmap <leader>gJ 9999<leader>gJ
+nmap <leader>gK 9999<leader>gk
+
+
+" If you like colors instead
+" highlight SignifySignAdd ctermbg=green guibg=#00ff00
+" highlight SignifySignDelete ctermfg=black ctermbg=red guifg=#ffffff guibg=#ff0000
+" highlight SignifySignChange ctermfg=black ctermbg=yellow guifg=#000000 guibg=#ffff00
diff --git a/.config/nvim/vim-plug/plugins.vim b/.config/nvim/vim-plug/plugins.vim
index 392672e..d80f07c 100644
--- a/.config/nvim/vim-plug/plugins.vim
+++ b/.config/nvim/vim-plug/plugins.vim
@@ -32,5 +32,10 @@ call plug#begin('~/.config/nvim/autoload/plugged')
Plug 'honza/vim-snippets'
" Vim-Which-Key > SpaceVim plugin
Plug 'liuchengxu/vim-which-key'
+ " Git integration
+ Plug 'mhinz/vim-signify'
+ Plug 'tpope/vim-fugitive'
+ Plug 'tpope/vim-rhubarb'
+ Plug 'junegunn/gv.vim'
call plug#end()