rtim/my-nvim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add on_attach to the gitsigns to get keymaps I need

Browse Source
This commit is contained in:
Ruslan Timofieiev
2025-08-28 14:30:35 +03:00
parent ca193e334a
commit 0ba639e806
2 changed files with 110 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lua/crentist/lazy/gitsigns.lua
View File

@@ -1,11 +1,74 @@
return { return {
'lewis6991/gitsigns.nvim', 'lewis6991/gitsigns.nvim',
---@module 'gitsigns.config'
---@type Gitsigns.Config
opts = { opts = {
current_line_blame = true, current_line_blame = true,
attach_to_untracked = true, attach_to_untracked = true,
current_line_blame_opts = { current_line_blame_opts = {
delay = 500, delay = 500,
ignore_whitespace = true,
virt_text_pos = 'right_align',
}, },
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)
-- Actions
map('n', '<leader>hs', gitsigns.stage_hunk)
map('n', '<leader>hr', gitsigns.reset_hunk)
map('v', '<leader>hs', function()
gitsigns.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') })
end)
map('v', '<leader>hr', function()
gitsigns.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') })
end)
map('n', '<leader>hS', gitsigns.stage_buffer)
map('n', '<leader>hR', gitsigns.reset_buffer)
map('n', '<leader>hp', gitsigns.preview_hunk)
map('n', '<leader>hi', gitsigns.preview_hunk_inline)
map('n', '<leader>hd', gitsigns.diffthis)
map('n', '<leader>hD', function()
gitsigns.diffthis('~')
end)
map('n', '<leader>hQ', function() gitsigns.setqflist('all') end)
map('n', '<leader>hq', gitsigns.setqflist)
-- Toggles
map('n', '<leader>tb', gitsigns.toggle_current_line_blame)
map('n', '<leader>tw', gitsigns.toggle_word_diff)
-- Text object
map({ 'o', 'x' }, 'ih', gitsigns.select_hunk)
end
} }
} }

93
lua/crentist/lazy/lualine.lua
View File

@@ -17,53 +17,54 @@ return {
lightgray = '#504945', lightgray = '#504945',
inactivegray = '#7c6f64', inactivegray = '#7c6f64',
} }
require('lualine').setup({ require('lualine').setup(
options = { {
theme = { options = {
normal = { theme = {
a = { bg = colors.yellow, fg = colors.black, gui = 'bold' }, normal = {
b = { bg = colors.lightgray, fg = colors.white }, a = { bg = colors.yellow, fg = colors.black, gui = 'bold' },
c = { bg = colors.darkgray, fg = colors.white }, b = { bg = colors.lightgray, fg = colors.white },
}, c = { bg = colors.darkgray, fg = colors.white },
insert = { },
a = { bg = colors.blue, fg = colors.black, gui = 'bold' }, insert = {
b = { bg = colors.lightgray, fg = colors.white }, a = { bg = colors.blue, fg = colors.black, gui = 'bold' },
c = { bg = colors.lightgray, fg = colors.white }, b = { bg = colors.lightgray, fg = colors.white },
}, c = { bg = colors.lightgray, fg = colors.white },
visual = { },
a = { bg = colors.magenta, fg = colors.black, gui = 'bold' }, visual = {
b = { bg = colors.lightgray, fg = colors.white }, a = { bg = colors.magenta, fg = colors.black, gui = 'bold' },
c = { bg = colors.inactivegray, fg = colors.black }, b = { bg = colors.lightgray, fg = colors.white },
}, c = { bg = colors.inactivegray, fg = colors.black },
replace = { },
a = { bg = colors.red, fg = colors.black, gui = 'bold' }, replace = {
b = { bg = colors.lightgray, fg = colors.white }, a = { bg = colors.red, fg = colors.black, gui = 'bold' },
c = { bg = colors.black, fg = colors.white }, b = { bg = colors.lightgray, fg = colors.white },
}, c = { bg = colors.black, fg = colors.white },
command = { },
a = { bg = colors.green, fg = colors.black, gui = 'bold' }, command = {
b = { bg = colors.lightgray, fg = colors.white }, a = { bg = colors.green, fg = colors.black, gui = 'bold' },
c = { bg = colors.inactivegray, fg = colors.black }, b = { bg = colors.lightgray, fg = colors.white },
}, c = { bg = colors.inactivegray, fg = colors.black },
inactive = { },
a = { bg = colors.darkgray, fg = colors.magenta, gui = 'bold' }, inactive = {
b = { bg = colors.darkgray, fg = colors.magenta }, a = { bg = colors.darkgray, fg = colors.magenta, gui = 'bold' },
c = { bg = colors.darkgray, fg = colors.magenta }, b = { bg = colors.darkgray, fg = colors.magenta },
}, c = { bg = colors.darkgray, fg = colors.magenta },
},
}
},
sections = {
lualine_c = {
{
'filename',
path = 1,
},
{
'navic',
},
}
} }
}, })
sections = {
lualine_c = {
{
'filename',
path = 1,
},
{
'navic',
},
}
}
})
end end
} }