From e1ede4f11eb4fbd9191789c465a65c0a40de3082 Mon Sep 17 00:00:00 2001 From: Louis Vallat Date: Wed, 10 Nov 2021 09:00:15 +0100 Subject: [PATCH] Added gitsigns to plugins and its according configuration Signed-off-by: Louis Vallat --- .config/nvim/init.vim | 5 ++ .config/nvim/lua/lovallat/gitsigns.lua | 64 ++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 .config/nvim/lua/lovallat/gitsigns.lua diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 0d322a5..4ffcbfa 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,4 +1,5 @@ set number relativenumber +set mouse+=a augroup numbertoggle autocmd! @@ -24,6 +25,8 @@ Plug 'sonph/onehalf', { 'rtp': 'vim' } Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'norcalli/nvim-colorizer.lua' Plug 'vim-airline/vim-airline' +Plug 'nvim-lua/plenary.nvim' +Plug 'lewis6991/gitsigns.nvim' call plug#end() @@ -31,3 +34,5 @@ colorscheme onehalfdark source $HOME/.config/nvim/plug-config/coc.vim source $HOME/.config/nvim/plug-config/airline.vim +lua require('lovallat/gitsigns') + diff --git a/.config/nvim/lua/lovallat/gitsigns.lua b/.config/nvim/lua/lovallat/gitsigns.lua new file mode 100644 index 0000000..51f3ae7 --- /dev/null +++ b/.config/nvim/lua/lovallat/gitsigns.lua @@ -0,0 +1,64 @@ +require('gitsigns').setup { + signs = { + add = {hl = 'GitSignsAdd' , text = '│', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'}, + change = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, + delete = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, + topdelete = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, + changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, + }, + signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` + numhl = false, -- Toggle with `:Gitsigns toggle_numhl` + linehl = false, -- Toggle with `:Gitsigns toggle_linehl` + word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + keymaps = { + -- Default keymap options + noremap = true, + + ['n ]c'] = { expr = true, "&diff ? ']c' : 'lua require\"gitsigns.actions\".next_hunk()'"}, + ['n [c'] = { expr = true, "&diff ? '[c' : 'lua require\"gitsigns.actions\".prev_hunk()'"}, + + ['n hs'] = 'lua require"gitsigns".stage_hunk()', + ['v hs'] = 'lua require"gitsigns".stage_hunk({vim.fn.line("."), vim.fn.line("v")})', + ['n hu'] = 'lua require"gitsigns".undo_stage_hunk()', + ['n hr'] = 'lua require"gitsigns".reset_hunk()', + ['v hr'] = 'lua require"gitsigns".reset_hunk({vim.fn.line("."), vim.fn.line("v")})', + ['n hR'] = 'lua require"gitsigns".reset_buffer()', + ['n hp'] = 'lua require"gitsigns".preview_hunk()', + ['n hb'] = 'lua require"gitsigns".blame_line(true)', + ['n hS'] = 'lua require"gitsigns".stage_buffer()', + ['n hU'] = 'lua require"gitsigns".reset_buffer_index()', + + -- Text objects + ['o ih'] = ':lua require"gitsigns.actions".select_hunk()', + ['x ih'] = ':lua require"gitsigns.actions".select_hunk()' + }, + watch_gitdir = { + interval = 1000, + follow_files = true + }, + attach_to_untracked = true, + current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` + current_line_blame_opts = { + virt_text = true, + virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' + delay = 1000, + }, + current_line_blame_formatter_opts = { + relative_time = false + }, + sign_priority = 6, + update_debounce = 100, + status_formatter = nil, -- Use default + max_file_length = 40000, + preview_config = { + -- Options passed to nvim_open_win + border = 'single', + style = 'minimal', + relative = 'cursor', + row = 0, + col = 1 + }, + yadm = { + enable = false + }, +}