From 10c005be2dea1b3a7acde92d51eb742f1f62adac Mon Sep 17 00:00:00 2001 From: mace Date: Tue, 29 Jul 2025 13:40:41 +0200 Subject: [PATCH] added gitsigns config --- init.lua | 11 +---------- lua/custom/gitsigns.lua | 44 +++++++++++++++++++++++++++++++++++++++++ lua/custom/vimrc | 2 +- 3 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 lua/custom/gitsigns.lua diff --git a/init.lua b/init.lua index 59cb57d..3dcbe48 100644 --- a/init.lua +++ b/init.lua @@ -126,15 +126,6 @@ require('lazy').setup({ }, }, - { - -- Theme inspired by Atom - 'navarasu/onedark.nvim', - priority = 1000, - config = function() - vim.cmd.colorscheme 'onedark' - end, - }, - { -- Set lualine as statusline 'nvim-lualine/lualine.nvim', @@ -142,7 +133,6 @@ require('lazy').setup({ opts = { options = { icons_enabled = false, - theme = 'onedark', component_separators = '|', section_separators = '', }, @@ -402,3 +392,4 @@ require('custom.bufferline') require('custom.kulala') require('custom.rainbow') require('custom.none-ls') +require('custom.gitsigns') diff --git a/lua/custom/gitsigns.lua b/lua/custom/gitsigns.lua new file mode 100644 index 0000000..bede2db --- /dev/null +++ b/lua/custom/gitsigns.lua @@ -0,0 +1,44 @@ +require('gitsigns').setup { + on_attach = function(bufnr) + local gitsigns = require('gitsigns') + + local function map(mode, l, r, opts) + opts = opts or {} + opts.buffer = bufnr + vim.keymap.set(mode, l, r, opts) + end + + -- Navigation + map('n', ']c', function() + if vim.wo.diff then + vim.cmd.normal({ ']c', bang = true }) + else + gitsigns.nav_hunk('next') + end + end) + + map('n', '[c', function() + if vim.wo.diff then + vim.cmd.normal({ '[c', bang = true }) + else + gitsigns.nav_hunk('prev') + end + end) + + map('n', 'gb', function() + gitsigns.blame({ full = true }) + end) + + map('n', 'hd', gitsigns.diffthis) + + map('n', 'hD', function() + gitsigns.diffthis('~') + end) + + map('n', 'hQ', function() gitsigns.setqflist('all') end) + map('n', 'hq', gitsigns.setqflist) + + -- Text object + map({ 'o', 'x' }, 'ih', gitsigns.select_hunk) + end +} diff --git a/lua/custom/vimrc b/lua/custom/vimrc index b11316d..2e86e6c 100644 --- a/lua/custom/vimrc +++ b/lua/custom/vimrc @@ -38,7 +38,7 @@ vnoremap :m '>+1gv=gv vnoremap :m '<-2gv=gv nnoremap a ggVG " nnoremap b :Telescope buffers -nnoremap ,b :Buffers +nnoremap ,b :buffers " nnoremap t :Explorer " use leader e instead nnoremap y "+yy