From a4c74ca3210cda28194c07e57d5b68615bb0db42 Mon Sep 17 00:00:00 2001
From: Khue Doan <mail@khuedoan.com>
Date: Tue, 11 Jun 2024 10:06:22 +0700
Subject: [PATCH] refactor(nvim): replace gitsigns with mini.diff

mini.diff has a special overlay mode, it doesn't have in line git blame
but toggling Fugitive's git blame is fine too.
---
 .config/nvim/lazy-lock.json  | 2 +-
 .config/nvim/lua/keymaps.lua | 7 +------
 .config/nvim/lua/plugins.lua | 6 ++----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 90473cb..6c1807b 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -6,7 +6,6 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" },
   "fzf-lua": { "branch": "main", "commit": "53698d7ff093592228d14a509933ce403b3b8f9f" },
-  "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
   "grug-far.nvim": { "branch": "main", "commit": "a8464babd619985d873d224cca36b9b6c8d0374d" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" },
@@ -16,6 +15,7 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
   "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
   "mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" },
+  "mini.diff": { "branch": "main", "commit": "441975a43bbec22442a91fe2ab1c7c06984e4d8a" },
   "mini.surround": { "branch": "main", "commit": "c52aa751daf62d4a9e6ee24c4a91882ef6842f99" },
   "nvim-autopairs": { "branch": "master", "commit": "b0b79e42a28f09719a7da9534c3731fa37319d9b" },
   "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua
index 1947466..2a74c80 100644
--- a/.config/nvim/lua/keymaps.lua
+++ b/.config/nvim/lua/keymaps.lua
@@ -44,14 +44,9 @@ local keymaps = {
         },
         g = {
             name = "git",
-            h = {
-                name = "Hunk",
-                s = { require("gitsigns").stage_hunk, "Stage hunk" },
-                u = { require("gitsigns").undo_stage_hunk, "Unstage hunk" },
-                r = { require("gitsigns").reset_hunk, "Reset hunk" },
-            },
             s = { "<Cmd>Git<CR>", "Git status" },
             b = { "<Cmd>Git blame<CR>", "Git blame" },
+            o = { require("mini.diff").toggle_overlay, "Overlay diff" },
             H = {
                 name = "GitHub",
                 b = { "<Cmd>silent !gh browse %<CR>", "GitHub browse current file" },
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 81eccb8..f18bf88 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -211,12 +211,10 @@ return require("lazy").setup({
     },
 
     {
-        "https://github.com/lewis6991/gitsigns.nvim",
+        "https://github.com/echasnovski/mini.diff",
         event = "VeryLazy",
         config = function()
-            require("gitsigns").setup({
-                current_line_blame = true,
-            })
+            require("mini.diff").setup({})
         end,
     },
     -- }}}
-- 
2.51.2