From 73b0d0cbc54ce44accc4efed936a122b0f4503d7 Mon Sep 17 00:00:00 2001
From: Pratik Tripathy <mail@pratik.live>
Date: Wed, 10 Apr 2024 16:17:17 +0530
Subject: [PATCH] NVIM: Keymap updates

---
 common/.config/nvim/lua/plugins/code-generic.lua | 7 ++++---
 common/.config/nvim/lua/plugins/ui.lua           | 9 ++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/.config/nvim/lua/plugins/code-generic.lua b/common/.config/nvim/lua/plugins/code-generic.lua
index 084fda1..754c1a1 100644
--- a/common/.config/nvim/lua/plugins/code-generic.lua
+++ b/common/.config/nvim/lua/plugins/code-generic.lua
@@ -203,7 +203,7 @@ return {
             severity = vim.diagnostic.severity.WARN,
         },
         keys = {
-            { "<leader>dx", "<cmd>TroubleToggle document_diagnostics<cr>", desc = "Document Diagnostics (Trouble)" },
+            { "<leader>dd", "<cmd>TroubleToggle document_diagnostics<cr>", desc = "Document Diagnostics (Trouble)" },
             { "<leader>dw", "<cmd>TroubleToggle workspace_diagnostics<cr>", desc = "Workspace Diagnostics (Trouble)" },
             { "<leader>dl", "<cmd>TroubleToggle loclist<cr>", desc = "Location List (Trouble)" },
             { "<leader>dq", "<cmd>TroubleToggle quickfix<cr>", desc = "Quickfix List (Trouble)" },
@@ -285,11 +285,12 @@ return {
                 outline = { auto_preview = false },
             })
 
-            vim.keymap.set("n", "K", "<cmd>Lspsaga hover_doc<cr>", { desc = "Hover Documentation" })
             vim.keymap.set("n", "<leader>cR", "<cmd>Lspsaga finder<cr>", { desc = "Code: Goto References" })
-            vim.keymap.set("n", "<leader>co", "<cmd>Lspsaga outline<cr>", { desc = "Code: Toggle Symbol Outline" })
             vim.keymap.set("n", "<leader>cd", "<cmd>Lspsaga peek_definition<cr>", { desc = "Code: Peek definition: Function" })
             vim.keymap.set("n", "<leader>cD", "<cmd>Lspsaga peek_type_definition<cr>", { desc = "Code: Peek definition: Class" })
+
+            vim.keymap.set("n", "K", "<cmd>Lspsaga hover_doc<cr>", { desc = "Hover Documentation" })
+            vim.keymap.set("n", "<leader>o", "<cmd>Lspsaga outline<cr>", { desc = "Code: Toggle Symbol Outline" })
         end,
     },
 
diff --git a/common/.config/nvim/lua/plugins/ui.lua b/common/.config/nvim/lua/plugins/ui.lua
index 74c0571..5f14323 100644
--- a/common/.config/nvim/lua/plugins/ui.lua
+++ b/common/.config/nvim/lua/plugins/ui.lua
@@ -29,7 +29,8 @@ return {
         event = "VeryLazy",
         keys = {
             { "<leader>bp", "<Cmd>BufferLineTogglePin<CR>", desc = "Toggle buffer-pin" },
-            { "<leader>xo", "<Cmd>BufferLineCloseOthers<CR>", desc = "Delete other buffers" },
+            { "<leader>bj", "<Cmd>BufferLinePick<CR>", desc = "Choose and jump to a buffer" },
+            { "<leader>xo", "<Cmd>BufferLineCloseOthers<CR>", desc = "Close other buffers" },
             { "[b", "<cmd>BufferLineCyclePrev<cr>", desc = "Prev buffer" },
             { "]b", "<cmd>BufferLineCycleNext<cr>", desc = "Next buffer" },
         },
@@ -54,12 +55,14 @@ return {
             },
         },
         config = function(_, opts)
-            require("bufferline").setup(opts)
+            local buf_line = require("bufferline")
+            buf_line.setup(opts)
+
             -- Fix bufferline when restoring a session
             vim.api.nvim_create_autocmd("BufAdd", {
                 callback = function()
                     vim.schedule(function()
-                        pcall(nvim_bufferline)
+                        pcall(buf_line)
                     end)
                 end,
             })