From afefa7e134ee86b422fe71bc41d208ecec2d9190 Mon Sep 17 00:00:00 2001 From: Ava Gaiety Wroten Date: Fri, 9 Apr 2021 23:20:57 -0500 Subject: [PATCH] gitsigns --- nvim/init.vim | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/nvim/init.vim b/nvim/init.vim index 2630653..fdadf77 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -71,7 +71,6 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'lifepillar/vim-mucomplete' Plug 'wellle/context.vim' - Plug 'airblade/vim-gitgutter' Plug 'Yggdroot/indentLine' Plug 'lambdalisue/fern.vim' @@ -81,6 +80,9 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'nvim-telescope/telescope.nvim' Plug 'BurntSushi/ripgrep' + Plug 'nvim-lua/plenary.nvim' + Plug 'lewis6991/gitsigns.nvim' + if executable('ctags') Plug 'ludovicchabant/vim-gutentags' endif @@ -125,3 +127,24 @@ nnoremap fb Telescope buffers nnoremap fgb Telescope git_branches nnoremap fgc Telescope git_commits nnoremap fgt Telescope tags + +" gitsigns +lua << EOF + require('gitsigns').setup { + keymaps = { + noremap = true, + buffer = true, + + ['n hn'] = { expr = true, "&diff ? ']c' : 'lua require\"gitsigns\".next_hunk()'"}, + ['n hp'] = { expr = true, "&diff ? '[c' : 'lua require\"gitsigns\".prev_hunk()'"}, + + ['n hs'] = 'lua require"gitsigns".stage_hunk()', + ['n hu'] = 'lua require"gitsigns".undo_stage_hunk()', + ['n hr'] = 'lua require"gitsigns".reset_hunk()', + ['n hR'] = 'lua require"gitsigns".reset_buffer()', + ['n hd'] = 'lua require"gitsigns".preview_hunk()', + ['n hb'] = 'lua require"gitsigns".blame_line()', + } + } +EOF +set statusline+=%{get(b:,'gitsigns_status','')}