From 7d0ea4a1f9dc0111547f0468062171f026a8f5ee Mon Sep 17 00:00:00 2001 From: Charles Danesi Date: Tue, 10 Dec 2024 12:47:55 -0500 Subject: [PATCH] change gitsigns word diff to off and add toggle keybind --- .config/nvim/lua/core/keymap.lua | 3 +- .config/nvim/lua/plugins/gitsigns.lua | 132 +++++++++++++------------- 2 files changed, 68 insertions(+), 67 deletions(-) diff --git a/.config/nvim/lua/core/keymap.lua b/.config/nvim/lua/core/keymap.lua index 57051fe..ee8d907 100644 --- a/.config/nvim/lua/core/keymap.lua +++ b/.config/nvim/lua/core/keymap.lua @@ -174,6 +174,7 @@ end, opts('Diff this ~')) -- ───────────────────────────────────────────────────────────( git )─ keymap.set('n', 'Lg', 'LazyGit', opts('Open LazyGit')) +vim.keymap.set('n', 'hw', 'Gitsigns toggle_word_diff', opts('Toggle word diff')) keymap.set('n', ']h', function() require('gitsigns').nav_hunk('next') end, opts('Next hunk')) @@ -243,4 +244,4 @@ keymap.set('i', '', function() else vim.opt_local.spell = true end -end, opts('Toggle spell check')) +end, opts('Toggle spell check')) \ No newline at end of file diff --git a/.config/nvim/lua/plugins/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua index b36d74f..3d6b77c 100644 --- a/.config/nvim/lua/plugins/gitsigns.lua +++ b/.config/nvim/lua/plugins/gitsigns.lua @@ -1,69 +1,69 @@ return { - "lewis6991/gitsigns.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - { - "purarue/gitsigns-yadm.nvim", - opts = { - shell_timeout_ms = 2000, + 'lewis6991/gitsigns.nvim', + dependencies = { + 'nvim-lua/plenary.nvim', + { + 'purarue/gitsigns-yadm.nvim', + opts = { + shell_timeout_ms = 2000, + }, }, - }, - }, - event = { "BufReadPre", "BufNewFile" }, - opts = { - _on_attach_pre = function(_, callback) - if vim.fn.executable("yadm") == 1 then - require("gitsigns-yadm").yadm_signs(callback) - else - callback() - end - end, - signs = { - add = { text = "+" }, - change = { text = "┃" }, - delete = { text = "_" }, - topdelete = { text = "‾" }, - changedelete = { text = "~" }, - untracked = { text = "┆" }, - }, - signs_staged = { - add = { text = "+" }, - change = { text = "┃" }, - delete = { text = "_" }, - topdelete = { text = "‾" }, - changedelete = { text = "~" }, - untracked = { text = "┆" }, - }, - signs_staged_enable = true, - signcolumn = true, - numhl = true, - linehl = false, - word_diff = true, - show_deleted = false, -- turning this off for now as it seems to be slowing down neovim on MBP - watch_gitdir = { - interval = 1000, - follow_files = true, - }, - attach_to_untracked = false, - current_line_blame = true, - current_line_blame_opts = { - use_focus = true, - virt_text = true, - virt_text_pos = "right_align", - delay = 200, - ignore_whitespace = false, - }, - current_line_blame_formatter = ", - ", - sign_priority = 6, - update_debounce = 100, - status_formatter = nil, -- Use default - max_file_length = 40000, - preview_config = { - border = "single", - style = "minimal", - relative = "cursor", - row = 0, - col = 1, - }, - }, + }, + event = { 'BufReadPre', 'BufNewFile' }, + opts = { + _on_attach_pre = function(_, callback) + if vim.fn.executable('yadm') == 1 then + require('gitsigns-yadm').yadm_signs(callback) + else + callback() + end + end, + signs = { + add = { text = '+' }, + change = { text = '┃' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + untracked = { text = '┆' }, + }, + signs_staged = { + add = { text = '+' }, + change = { text = '┃' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + untracked = { text = '┆' }, + }, + signs_staged_enable = true, + signcolumn = true, + numhl = true, + linehl = false, + word_diff = false, + show_deleted = false, -- turning this off for now as it seems to be slowing down neovim on MBP + watch_gitdir = { + interval = 1000, + follow_files = true, + }, + attach_to_untracked = false, + current_line_blame = true, + current_line_blame_opts = { + use_focus = true, + virt_text = true, + virt_text_pos = 'right_align', + delay = 200, + ignore_whitespace = false, + }, + current_line_blame_formatter = ', - ', + sign_priority = 6, + update_debounce = 100, + status_formatter = nil, -- Use default + max_file_length = 40000, + preview_config = { + border = 'single', + style = 'minimal', + relative = 'cursor', + row = 0, + col = 1, + }, + }, }