change gitsigns word diff to off and add toggle keybind

This commit is contained in:
2024-12-10 12:47:55 -05:00
parent 108f3f95c0
commit 7d0ea4a1f9
2 changed files with 68 additions and 67 deletions
+2 -1
View File
@@ -174,6 +174,7 @@ end, opts('Diff this ~'))
-- ───────────────────────────────────────────────────────────( git )─ -- ───────────────────────────────────────────────────────────( git )─
keymap.set('n', '<leader>Lg', '<cmd>LazyGit<cr>', opts('Open LazyGit')) keymap.set('n', '<leader>Lg', '<cmd>LazyGit<cr>', opts('Open LazyGit'))
vim.keymap.set('n', '<leader>hw', '<cmd>Gitsigns toggle_word_diff', opts('Toggle word diff'))
keymap.set('n', ']h', function() keymap.set('n', ']h', function()
require('gitsigns').nav_hunk('next') require('gitsigns').nav_hunk('next')
end, opts('Next hunk')) end, opts('Next hunk'))
@@ -243,4 +244,4 @@ keymap.set('i', '<C-s>', function()
else else
vim.opt_local.spell = true vim.opt_local.spell = true
end end
end, opts('Toggle spell check')) end, opts('Toggle spell check'))
+66 -66
View File
@@ -1,69 +1,69 @@
return { return {
"lewis6991/gitsigns.nvim", 'lewis6991/gitsigns.nvim',
dependencies = { dependencies = {
"nvim-lua/plenary.nvim", 'nvim-lua/plenary.nvim',
{ {
"purarue/gitsigns-yadm.nvim", 'purarue/gitsigns-yadm.nvim',
opts = { opts = {
shell_timeout_ms = 2000, shell_timeout_ms = 2000,
},
}, },
}, },
}, event = { 'BufReadPre', 'BufNewFile' },
event = { "BufReadPre", "BufNewFile" }, opts = {
opts = { _on_attach_pre = function(_, callback)
_on_attach_pre = function(_, callback) if vim.fn.executable('yadm') == 1 then
if vim.fn.executable("yadm") == 1 then require('gitsigns-yadm').yadm_signs(callback)
require("gitsigns-yadm").yadm_signs(callback) else
else callback()
callback() end
end end,
end, signs = {
signs = { add = { text = '+' },
add = { text = "+" }, change = { text = '' },
change = { text = "" }, delete = { text = '_' },
delete = { text = "_" }, topdelete = { text = '' },
topdelete = { text = "" }, changedelete = { text = '~' },
changedelete = { text = "~" }, untracked = { text = '' },
untracked = { text = "" }, },
}, signs_staged = {
signs_staged = { add = { text = '+' },
add = { text = "+" }, change = { text = '' },
change = { text = "" }, delete = { text = '_' },
delete = { text = "_" }, topdelete = { text = '' },
topdelete = { text = "" }, changedelete = { text = '~' },
changedelete = { text = "~" }, untracked = { text = '' },
untracked = { text = "" }, },
}, signs_staged_enable = true,
signs_staged_enable = true, signcolumn = true,
signcolumn = true, numhl = true,
numhl = true, linehl = false,
linehl = false, word_diff = false,
word_diff = true, show_deleted = false, -- turning this off for now as it seems to be slowing down neovim on MBP
show_deleted = false, -- turning this off for now as it seems to be slowing down neovim on MBP watch_gitdir = {
watch_gitdir = { interval = 1000,
interval = 1000, follow_files = true,
follow_files = true, },
}, attach_to_untracked = false,
attach_to_untracked = false, current_line_blame = true,
current_line_blame = true, current_line_blame_opts = {
current_line_blame_opts = { use_focus = true,
use_focus = true, virt_text = true,
virt_text = true, virt_text_pos = 'right_align',
virt_text_pos = "right_align", delay = 200,
delay = 200, ignore_whitespace = false,
ignore_whitespace = false, },
}, current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
current_line_blame_formatter = "<author>, <author_time:%Y-%m-%d> - <summary>", sign_priority = 6,
sign_priority = 6, update_debounce = 100,
update_debounce = 100, status_formatter = nil, -- Use default
status_formatter = nil, -- Use default max_file_length = 40000,
max_file_length = 40000, preview_config = {
preview_config = { border = 'single',
border = "single", style = 'minimal',
style = "minimal", relative = 'cursor',
relative = "cursor", row = 0,
row = 0, col = 1,
col = 1, },
}, },
},
} }