From 6c065da12d58b63b8215bff8fa6577aa7cbea833 Mon Sep 17 00:00:00 2001
From: Daniil Tsivinsky <daniil@tsivinsky.com>
Date: Wed, 20 Oct 2021 18:13:26 +0300
Subject: [PATCH] Add separate file for git settings

---
 config/nvim/git.vim     | 9 +++++++++
 config/nvim/init.vim    | 9 +++------
 config/nvim/plugins.vim | 1 -
 config/nvim/remaps.vim  | 8 +-------
 4 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 config/nvim/git.vim

diff --git a/config/nvim/git.vim b/config/nvim/git.vim
new file mode 100644
index 0000000..7aeb58b
--- /dev/null
+++ b/config/nvim/git.vim
@@ -0,0 +1,9 @@
+" Remap to toggle gitsigns as linehl
+nnoremap <leader>sg :Gitsigns toggle_linehl<CR>
+
+" Open Gitabra
+nnoremap <leader>gg :G<CR>
+
+nnoremap <leader>gs :Gitsigns stage_hunk<CR>
+nnoremap <leader>gu :Gitsigns undo_stage_hunk<CR>
+nnoremap <leader>gc :!git commit<CR>
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
index 9603b1d..d56fb8b 100644
--- a/config/nvim/init.vim
+++ b/config/nvim/init.vim
@@ -6,6 +6,7 @@ source $HOME/.config/nvim/terminal.vim
 source $HOME/.config/nvim/file-tree.vim
 source $HOME/.config/nvim/coc.vim
 source $HOME/.config/nvim/tabs.vim
+source $HOME/.config/nvim/git.vim
 
 " Filetypes for markdown extension
 let g:mkdp_filetypes = ['md', 'mdx', 'markdown']
@@ -24,18 +25,14 @@ let g:closetag_regions = {
 let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
 
 lua << EOF
+  require("gitabra").setup {}
   require("gitsigns").setup {
+    signcolumn = false,
     current_line_blame = true,
     current_line_blame_opts = {
       virt_text = true,
       virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
       delay = 500,
-    },
-    signcolumn = false,
-    linehl = false,
-    current_line_blame_formatter_opts = {
-      relative_time = false
     }
   }
-  require("gitabra").setup {}
 EOF
diff --git a/config/nvim/plugins.vim b/config/nvim/plugins.vim
index 72d48be..2f6c257 100644
--- a/config/nvim/plugins.vim
+++ b/config/nvim/plugins.vim
@@ -22,6 +22,5 @@ Plug 'yuezk/vim-js'
 Plug 'lukas-reineke/indent-blankline.nvim'
 Plug 'lewis6991/gitsigns.nvim'
 Plug 'nvim-lua/plenary.nvim'
-Plug 'Odie/gitabra'
 
 call plug#end()
diff --git a/config/nvim/remaps.vim b/config/nvim/remaps.vim
index 310c809..330b445 100644
--- a/config/nvim/remaps.vim
+++ b/config/nvim/remaps.vim
@@ -25,7 +25,7 @@ tnoremap <A-k> <C-\><C-n><C-w>k
 tnoremap <A-l> <C-\><C-n><C-w>l
 
 " Remove search highlighting
-noremap <leader>nh :nohl<CR>
+noremap <leader>h :nohl<CR>
 
 " Use Ctrl+A to select the whole file
 nnoremap <C-a> ggVG
@@ -37,9 +37,6 @@ endfunction
 " Open terminal
 nnoremap <leader>t :call OpenTerminal()<CR>
 
-" Open Gitabra
-nnoremap <leader>g :Gitabra<CR>
-
 " Open splits
 nnoremap <leader>v :vs<CR>
 nnoremap <leader>vv :sp<CR>
@@ -47,6 +44,3 @@ nnoremap <leader>vv :sp<CR>
 " Use Ctrl+Shift+jk to resize panes
 nnoremap <C-j> :resize -2<CR>
 nnoremap <C-k> :resize +2<CR>
-
-" Remap to toggle gitsigns as linehl
-nnoremap <leader>sg :Gitsigns toggle_linehl<CR>