From f73c5747bf494ca72c1aeb7aa08ad1516c8ea3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20La=C3=ADn?= <sergiolain11@gmail.com>
Date: Wed, 20 Sep 2023 14:07:55 +0200
Subject: [PATCH] Changed keymaps and nvim plugins

---
 .config/nvim/lua/config/keymaps.lua           | 18 ++++----
 .config/nvim/lua/plugins/bbq.lua              |  4 +-
 .config/nvim/lua/plugins/gitsigns.lua         | 46 +++++++++++++++++++
 ...{smart-splits.lua => smart-splits.lua.bak} |  0
 .config/nvim/lua/plugins/zen-mode.lua         |  2 +
 5 files changed, 57 insertions(+), 13 deletions(-)
 create mode 100644 .config/nvim/lua/plugins/gitsigns.lua
 rename .config/nvim/lua/plugins/{smart-splits.lua => smart-splits.lua.bak} (100%)

diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
index 19ec746d..99ea5983 100644
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -88,8 +88,6 @@ map(
     ":FloatermNew --name=termcwd --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer><CR>",
     { desc = "New Terminal (cwd)" }
 )
-map("n", "<A-Left>", "FloatermPrev<CR>", { desc = "Previous Terminal" })
-map("n", "<A-Right>", "FloatermNext<CR>", { desc = "Next Terminal" })
 map("n", "<c-Return>", ":FloatermToggle<CR>", { desc = "Toggle Terminal" })
 map("t", "<C-Return>", "<C-\\><C-n><C-\\><C-n>:FloatermToggle<CR>", { desc = "Toggle Terminal", nowait = true })
 
@@ -231,12 +229,12 @@ end
 
 local keyopts = { noremap = true, silent = true }
 
-vim.keymap.set({ "n", "v", "o", "i" }, "<A-o>", goto_parent_node, keyopts)
-vim.keymap.set({ "n", "v", "o", "i" }, "<A-i>", goto_child_node, keyopts)
-vim.keymap.set({ "n", "v", "o", "i" }, "<A-n>", goto_next_node, keyopts)
-vim.keymap.set({ "n", "v", "o", "i" }, "<A-p>", goto_prev_node, keyopts)
+vim.keymap.set({ "n", "v", "o", "i" }, "<C-M-o>", goto_parent_node, keyopts)
+vim.keymap.set({ "n", "v", "o", "i" }, "<C-M-i>", goto_child_node, keyopts)
+vim.keymap.set({ "n", "v", "o", "i" }, "<C-M-n>", goto_next_node, keyopts)
+vim.keymap.set({ "n", "v", "o", "i" }, "<C-M-p>", goto_prev_node, keyopts)
 
-vim.keymap.set({ "n", "v", "o", "i" }, "<A-h>", goto_parent_node, keyopts)
-vim.keymap.set({ "n", "v", "o", "i" }, "<A-l>", goto_child_node, keyopts)
-vim.keymap.set({ "n", "v", "o", "i" }, "<A-j>", goto_next_node, keyopts)
-vim.keymap.set({ "n", "v", "o", "i" }, "<A-k>", goto_prev_node, keyopts)
+vim.keymap.set({ "n", "v", "o", "i" }, "<C-M-h>", goto_parent_node, keyopts)
+vim.keymap.set({ "n", "v", "o", "i" }, "<C-M-l>", goto_child_node, keyopts)
+vim.keymap.set({ "n", "v", "o", "i" }, "<C-M-j>", goto_next_node, keyopts)
+vim.keymap.set({ "n", "v", "o", "i" }, "<C-M-k>", goto_prev_node, keyopts)
diff --git a/.config/nvim/lua/plugins/bbq.lua b/.config/nvim/lua/plugins/bbq.lua
index 7264c9c8..f889e616 100644
--- a/.config/nvim/lua/plugins/bbq.lua
+++ b/.config/nvim/lua/plugins/bbq.lua
@@ -8,8 +8,6 @@ return {
             "nvim-tree/nvim-web-devicons", -- optional dependency
         },
         event = "BufRead",
-        opts = {
-            -- configurations go here
-        },
+        opts = {},
     },
 }
diff --git a/.config/nvim/lua/plugins/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua
new file mode 100644
index 00000000..406aa23d
--- /dev/null
+++ b/.config/nvim/lua/plugins/gitsigns.lua
@@ -0,0 +1,46 @@
+return {
+    {
+        "lewis6991/gitsigns.nvim",
+        event = { "BufReadPre", "BufNewFile" },
+        opts = {
+            signs = {
+                add = { text = "▎" },
+                change = { text = "▎" },
+                delete = { text = "" },
+                topdelete = { text = "" },
+                changedelete = { text = "▎" },
+                untracked = { text = "▎" },
+            },
+            yadm = { enable = true },
+            current_line_blame = true,
+            current_line_blame_opts = {
+                virt_text = true,
+                virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
+                delay = 5,
+                ignore_whitespace = false,
+            },
+
+            on_attach = function(buffer)
+                local gs = package.loaded.gitsigns
+
+                local function map(mode, l, r, desc)
+                    vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
+                end
+
+      -- stylua: ignore start
+      map("n", "]h", gs.next_hunk, "Next Hunk")
+      map("n", "[h", gs.prev_hunk, "Prev Hunk")
+      map({ "n", "v" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
+      map({ "n", "v" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
+      map("n", "<leader>ghS", gs.stage_buffer, "Stage Buffer")
+      map("n", "<leader>ghu", gs.undo_stage_hunk, "Undo Stage Hunk")
+      map("n", "<leader>ghR", gs.reset_buffer, "Reset Buffer")
+      map("n", "<leader>ghp", gs.preview_hunk, "Preview Hunk")
+      map("n", "<leader>ghb", function() gs.blame_line({ full = true }) end, "Blame Line")
+      map("n", "<leader>ghd", gs.diffthis, "Diff This")
+      map("n", "<leader>ghD", function() gs.diffthis("~") end, "Diff This ~")
+      map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "GitSigns Select Hunk")
+            end,
+        },
+    },
+}
diff --git a/.config/nvim/lua/plugins/smart-splits.lua b/.config/nvim/lua/plugins/smart-splits.lua.bak
similarity index 100%
rename from .config/nvim/lua/plugins/smart-splits.lua
rename to .config/nvim/lua/plugins/smart-splits.lua.bak
diff --git a/.config/nvim/lua/plugins/zen-mode.lua b/.config/nvim/lua/plugins/zen-mode.lua
index 6c65ca6a..e42ad1a2 100644
--- a/.config/nvim/lua/plugins/zen-mode.lua
+++ b/.config/nvim/lua/plugins/zen-mode.lua
@@ -6,6 +6,8 @@ return {
         opts = {
             plugins = {
                 scrollview = { enabled = false },
+                gitsigns = { enabled = false },
+                barbacue = { enabled = false },
             },
         },
     },