Use better Plugins

- codediff
- neogit
- nvim-surround
- hlchunk
- fff.nvim
- gitsigns

1 files changed, 40 insertions, 13 deletions

diff --git a/lua/bee/init.lua b/lua/bee/init.lua
index 23991ef..2b71bc4 100644
--- a/lua/bee/init.lua
+++ b/lua/bee/init.lua
@@ -57,21 +57,48 @@ nixInfo.lze.load({
         end,
     },
     {
-        "mini.pick",
-        lazy = true,
+        "nvim-surround",
         auto_enable = true,
-        keys = {
-            { "<leader>ff", desc = "File finder" },
-            { "<leader>bb", desc = "List open buffers" },
-            { "<leader>sg", desc = "Live grep" },
-            { "<leader>/", desc = "Grep" },
-        },
+        event = "DeferredUIEnter",
+        before = function(_)
+            vim.g.nvim_surround_no_mappings = true
+        end,
         after = function(_)
-            require("mini.pick").setup({
-                vim.keymap.set("n", "<leader>ff", "<cmd>Pick files<cr>", { desc = "File finder" }),
-                vim.keymap.set("n", "<leader>bb", "<cmd>Pick buffers<cr>", { desc = "List open buffers" }),
-                vim.keymap.set("n", "<leader>sg", "<cmd>Pick grep_live<cr>", { desc = "live grep" }),
-                vim.keymap.set("n", "<leader>/", "<cmd>Pick grep<cr>", { desc = "Grep" }),
+            require("nvim-surround").setup({
+                keymaps = false,
+            })
+            vim.keymap.set("i", "<C-g>s", "<Plug>(nvim-surround-insert)", {
+                desc = "Add a surrounding pair around the cursor (insert mode)",
+            })
+            vim.keymap.set("i", "<C-g>S", "<Plug>(nvim-surround-insert-line)", {
+                desc = "Add a surrounding pair around the cursor, on new lines (insert mode)",
+            })
+            vim.keymap.set("n", "sa", "<Plug>(nvim-surround-normal)", {
+                desc = "Add a surrounding pair around a motion (normal mode)",
+            })
+            vim.keymap.set("n", "saa", "<Plug>(nvim-surround-normal-cur)", {
+                desc = "Add a surrounding pair around the current line (normal mode)",
+            })
+            vim.keymap.set("n", "sA", "<Plug>(nvim-surround-normal-line)", {
+                desc = "Add a surrounding pair around a motion, on new lines (normal mode)",
+            })
+            vim.keymap.set("n", "sAA", "<Plug>(nvim-surround-normal-cur-line)", {
+                desc = "Add a surrounding pair around the current line, on new lines (normal mode)",
+            })
+            vim.keymap.set("x", "S", "<Plug>(nvim-surround-visual)", {
+                desc = "Add a surrounding pair around a visual selection",
+            })
+            vim.keymap.set("x", "gS", "<Plug>(nvim-surround-visual-line)", {
+                desc = "Add a surrounding pair around a visual selection, on new lines",
+            })
+            vim.keymap.set("n", "sd", "<Plug>(nvim-surround-delete)", {
+                desc = "Delete a surrounding pair",
+            })
+            vim.keymap.set("n", "cs", "<Plug>(nvim-surround-change)", {
+                desc = "Change a surrounding pair",
+            })
+            vim.keymap.set("n", "cS", "<Plug>(nvim-surround-change-line)", {
+                desc = "Change a surrounding pair, putting replacements on new lines",
             })
         end,
     },