From b3dcd331e73e09894d6a3466ec5f5f04ca0b42f6 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Thu, 7 Apr 2022 18:46:58 +0200
Subject: [PATCH] Huge tweaks in vimrc.

---
 vim/vimrc | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/vim/vimrc b/vim/vimrc
index 0f07785..50406bf 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -5,11 +5,11 @@ call plug#begin('$XDG_DATA_HOME/vim-plugins')
 Plug 'kamykn/skyknight'
 Plug 'junegunn/fzf'
 Plug 'junegunn/fzf.vim'
-Plug 'mhinz/vim-signify'
 Plug 'dense-analysis/ale'
 Plug 'Yggdroot/indentLine'
 Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' }
 Plug 'itchyny/lightline.vim'
+Plug 'airblade/vim-gitgutter'
 Plug 'hashivim/vim-terraform'
 Plug 'bitc/vim-bad-whitespace'
 call plug#end()
@@ -17,7 +17,6 @@ call plug#end()
 set title
 set number
 set gdefault
-set hlsearch
 set wildmenu
 set nobackup
 set incsearch
@@ -27,6 +26,7 @@ set splitbelow
 set splitright
 set ignorecase
 set autoindent
+set nohlsearch
 set noshowmode
 set shiftround
 set nojoinspaces
@@ -39,6 +39,7 @@ set shortmess-=S
 set backspace=eol,start,indent
 set matchpairs+=(:),{:},[:],<:>,':',":"
 set laststatus=2
+set updatetime=100
 set shiftwidth=2
 set showtabline=0
 set softtabstop=2
@@ -51,7 +52,7 @@ nmap <C-a> :Files ~<CR>
 
 map <leader>b  <Esc>:set cc=79<CR>
 map <leader>nb <Esc>:set cc=0<CR>
-map <leader>n  <Esc>:set nonumber!<CR>:IndentLinesToggle<CR>
+map <leader>n  <Esc>:set nonumber!<CR>:IndentLinesToggle<CR>:GitGutterSignsToggle<CR>
 map <leader>p  <Esc>:set paste!<CR>
 
 set bg=dark
@@ -62,12 +63,14 @@ let &t_SI = "\<Esc>[6 q"
 let &t_SR = "\<Esc>[4 q"
 let &t_EI = "\<Esc>[2 q"
 
-set t_ZH=
-set t_ZR=
+hi BadWhitespace guibg=red
 hi Comment cterm=italic gui=italic
-hi BadWhitespace ctermbg=lightblue guibg=lightblue
-hi! Normal ctermbg=NONE guibg=NONE
-hi! NonText ctermbg=NONE guibg=NONE
+hi GitGutterChange guifg=#bbbb00 guibg=#232526
+hi LineNr guifg=#465457 guibg=#232526
+hi NonText guibg=NONE
+hi Normal guibg=NONE
+hi SignColumn guifg=#465457 guibg=#232526
+hi Visual term=reverse guibg=#005577
 
 let $FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/config/fd'
 command! -bang -nargs=? -complete=dir Files
@@ -78,6 +81,7 @@ command! -bang -nargs=? -complete=dir Colors
 let g:vim_json_conceal=0
 let g:markdown_syntax_conceal=0
 let g:Hexokinase_highlighters = [ 'backgroundfull' ]
+let g:gitgutter_sign_modified = '~'
 
 let g:lightline = {
   \ 'colorscheme': 'powerline',