feat(nvim): lazygit + remaps

.config/nvim/lua/custom/plugins/fugitive.lua

@@ -1,5 +1,5 @@
 -- Global (non-buffer) fugitive mappings
-vim.keymap.set('n', '<leader>gs', vim.cmd.Git, { desc = '[fugitive] status' })
+-- vim.keymap.set('n', '<leader>gs', vim.cmd.Git, { desc = '[fugitive] status' })
 vim.keymap.set("n", "<leader>gb", ":Git blame<CR>", { silent = true, desc = "[fugitive] blame" })
 vim.keymap.set("n", "<leader>gB", ":GBrowse<CR>", { silent = true, desc = "[G]it [B]rowse current file/line" })
 vim.api.nvim_create_user_command(

.config/nvim/lua/custom/plugins/lazygit.lua

@@ -0,0 +1,10 @@
+return {
+  "kdheepak/lazygit.nvim",
+  -- optional for floating window border decoration
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+  },
+  config = function()
+    vim.keymap.set('n', '<leader>gs', '<Cmd>LazyGit<CR>', { desc = 'Lazy[G]it', silent = true })
+  end,
+}

.config/nvim/lua/custom/plugins/lsp.lua

@@ -176,16 +176,16 @@ cmp.setup {
       behavior = cmp.ConfirmBehavior.Replace,
       select = true,
     },
-    ['<Tab>'] = nil,
-    -- ['<Tab>'] = cmp.mapping(function(fallback)
-    --   if cmp.visible() then
-    --     cmp.select_next_item()
-    --   elseif luasnip.expand_or_locally_jumpable() then
-    --     luasnip.expand_or_jump()
-    --   else
-    --     fallback()
-    --   end
-    -- end, { 'i', 's' }),
+    -- ['<Tab>'] = nil,
+    ['<Tab>'] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_next_item()
+      elseif luasnip.expand_or_locally_jumpable() then
+        luasnip.expand_or_jump()
+      else
+        fallback()
+      end
+    end, { 'i', 's' }),
     ['<S-Tab>'] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_prev_item()

.config/nvim/lua/custom/plugins/remap.lua

@@ -44,7 +44,7 @@ vim.keymap.set("n", "<leader>O", "O<Esc>j", { desc = "Insert newline above" })
 vim.keymap.set("n", "<M-Left>", "b", { desc = "Move back word" })
 vim.keymap.set("n", "<M-Right>", "w", { desc = "Move forward word" })
 vim.keymap.set("n", "<C-m>", "<Plug>(VM-Add-Cursor-At-Pos)", { desc = "Add cursor at position" })
-vim.keymap.set("x", "<leader>d", "yP", { desc = "Duplicate selection" })
+vim.keymap.set("x", "<leader>db", "<Cmd>DBUIToggle<CR>", { desc = "[D]ad[B]od UI" })
 
 -- redo
 vim.keymap.set("n", "U", "<C-r>", { desc = "Redo" })
@@ -61,10 +61,6 @@ vim.keymap.set("n", "Q", "<nop>", { desc = "No Q" })
 -- window splits
 vim.keymap.set("n", "√", "<C-w>v", { desc = "Split window vertically" })
 vim.keymap.set("n", "ß", "<C-w>s", { desc = "Split window horizontally" })
-vim.keymap.set("n", "<leader>nh", "<cmd>belowright new<CR>", { desc = "Empty buffer below" })
-vim.keymap.set("n", "<leader>nH", "<cmd>aboveleft new<CR>", { desc = "Empty buffer above" })
-vim.keymap.set("n", "<leader>nV", "<cmd>vnew<CR>", { desc = "Empty buffer left" })
-vim.keymap.set("n", "<leader>nv", "<cmd>belowright vnew<CR>", { desc = "Empty buffer right" })
 
 -- search and replace current word
 vim.keymap.set("n", "<leader>r", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
@@ -81,7 +77,7 @@ end, { desc = "Serve working directory" })
 
 vim.api.nvim_create_user_command('Pwd', function()
   local path = vim.fn.expand('%:p:h')
-  path = path:gsub('%n', '')
+  path = tostring(path):gsub('%n', '')
   vim.cmd("echo '" .. path .. "'")
 end, { nargs = 0 })
 vim.api.nvim_create_user_command('Pwf', function()
@@ -101,7 +97,7 @@ vim.keymap.set("i", "<F6>", "<Esc>:Copilot panel<CR>i", { desc = "Open Copilot p
 vim.keymap.set("n", "<leader>db", "<esc>dawdb", { desc = "Delete JS property (back)" })
 vim.keymap.set("n", "<leader>dw", "<esc>dawdw", { desc = "Delete JS property (fowards)" })
 
-vim.keymap.set({ "n", "v" }, "<F2>", vim.lsp.buf.rename)
+vim.keymap.set({ "n", "v", "i" }, "<F2>", vim.lsp.buf.rename)
 
 local hl_search = vim.o.hlsearch
 
@@ -154,6 +150,7 @@ end
 
 -- copy json key to system clipboard
 local ts_keys = require('custom.lib.ts_keys')
+
 -- trim whitespace
 local function trim(s)
   return s:gsub("^%s+", ""):gsub("%s+$", "")

.config/wezterm/wezterm.lua

@@ -73,14 +73,14 @@ config.keys = {
   --- tmux
   ----------------------------------------------------------------------------------
   -- move between tmux panes: Cmd+Shift+(HJKL) or Cmd+Shift+(Left Down Up Right) Arrow
-  { key = "h", mods = "CTRL", action = act { SendString = "\x02\x1b[D" } },
-  { key = "j", mods = "CTRL", action = act { SendString = "\x02\x1b[B" } },
-  { key = "k", mods = "CTRL", action = act { SendString = "\x02\x1b[A" } },
-  { key = "l", mods = "CTRL", action = act { SendString = "\x02\x1b[C" } },
-  { key = "LeftArrow", mods = "CTRL", action = act { SendString = "\x02\x1b[D" } },
-  { key = "DownArrow", mods = "CTRL", action = act { SendString = "\x02\x1b[B" } },
-  { key = "UpArrow", mods = "CTRL", action = act { SendString = "\x02\x1b[A" } },
-  { key = "RightArrow", mods = "CTRL", action = act { SendString = "\x02\x1b[C" } },
+  { key = "h", mods = "CTRL|SHIFT", action = act { SendString = "\x02\x1b[D" } },
+  { key = "j", mods = "CTRL|SHIFT", action = act { SendString = "\x02\x1b[B" } },
+  { key = "k", mods = "CTRL|SHIFT", action = act { SendString = "\x02\x1b[A" } },
+  { key = "l", mods = "CTRL|SHIFT", action = act { SendString = "\x02\x1b[C" } },
+  { key = "LeftArrow", mods = "CTRL|SHIFT", action = act { SendString = "\x02\x1b[D" } },
+  { key = "DownArrow", mods = "CTRL|SHIFT", action = act { SendString = "\x02\x1b[B" } },
+  { key = "UpArrow", mods = "CTRL|SHIFT", action = act { SendString = "\x02\x1b[A" } },
+  { key = "RightArrow", mods = "CTRL|SHIFT", action = act { SendString = "\x02\x1b[C" } },
   -- Select window 0-9
   { key = "1", mods = "CMD", action = act { SendString = "\x021" } },
   { key = "2", mods = "CMD", action = act { SendString = "\x022" } },