From 43ac6b937cda01d7e0c7b284f3fcb9635d54571c Mon Sep 17 00:00:00 2001
From: PowerUser64 <blake@blakenorth.net>
Date: Mon, 10 Jul 2023 15:59:19 -0700
Subject: [PATCH] nvim: update gitsigns config

---
 .config/nvim/lua/blake/other.lua | 62 ++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/.config/nvim/lua/blake/other.lua b/.config/nvim/lua/blake/other.lua
index 9d219bc..e66b7c0 100644
--- a/.config/nvim/lua/blake/other.lua
+++ b/.config/nvim/lua/blake/other.lua
@@ -79,28 +79,46 @@ M.gitsigns = function()
       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' : '<cmd>lua require\"gitsigns.actions\".next_hunk()<CR>'"},
-         ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns.actions\".prev_hunk()<CR>'"},
-         -- hunk binds
-         ['n <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
-         ['v <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
-         ['n <leader>hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
-         ['n <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
-         ['v <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
-         ['n <leader>hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
-         -- buffer binds
-         ['n <leader>hS'] = '<cmd>lua require"gitsigns".stage_buffer()<CR>',
-         ['n <leader>hR'] = '<cmd>lua require"gitsigns".reset_buffer()<CR>',
-         ['n <leader>hU'] = '<cmd>lua require"gitsigns".reset_buffer_index()<CR>',
-         -- misc.
-         ['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line(true)<CR>',
-         -- Text objects
-         ['o ih'] = '<cmd><C-U>lua require"gitsigns.actions".select_hunk()<CR>',
-         ['x ih'] = '<cmd><C-U>lua require"gitsigns.actions".select_hunk()<CR>'
-      },
+      on_attach = function(bufnr)
+        local gs = package.loaded.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 return ']c' end
+          vim.schedule(function() gs.next_hunk() end)
+          return '<Ignore>'
+        end, {expr=true})
+
+        map('n', '[c', function()
+          if vim.wo.diff then return '[c' end
+          vim.schedule(function() gs.prev_hunk() end)
+          return '<Ignore>'
+        end, {expr=true})
+
+        -- Actions
+        map('n', '<leader>hs', gs.stage_hunk)
+        map('n', '<leader>hr', gs.reset_hunk)
+        map('v', '<leader>hs', function() gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
+        map('v', '<leader>hr', function() gs.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
+        map('n', '<leader>hS', gs.stage_buffer)
+        map('n', '<leader>hu', gs.undo_stage_hunk)
+        map('n', '<leader>hR', gs.reset_buffer)
+        map('n', '<leader>hp', gs.preview_hunk)
+        map('n', '<leader>hb', function() gs.blame_line{full=true} end)
+        map('n', '<leader>tb', gs.toggle_current_line_blame)
+        map('n', '<leader>hd', gs.diffthis)
+        map('n', '<leader>hD', function() gs.diffthis('~') end)
+        map('n', '<leader>td', gs.toggle_deleted)
+
+        -- Text object
+        map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+      end,
       watch_gitdir = {
          interval = 1000,
          follow_files = true