From b1f6665d596eebe5ae3ab66c420952036d2859da Mon Sep 17 00:00:00 2001
From: Ryan <ryan@alien.gov>
Date: Thu, 30 Nov 2023 14:33:05 +0800
Subject: [PATCH] keybind(lsp): update keybind for lsp and trouble

Signed-off-by: Ryan <ryan@alien.gov>
---
 lazy-lock.json       |  2 +-
 lua/lazy-plugins.lua | 18 ++++++++++++++++--
 lua/plugins/lsp.lua  |  5 +----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index 020e717..e9fa9b2 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -24,7 +24,7 @@
   "none-ls.nvim": { "branch": "main", "commit": "3a4826687da4310af379515086d71faca4d21288" },
   "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" },
-  "nvim-lspconfig": { "branch": "master", "commit": "39546f730bdff8eccf7cec344cfce694f19ac908" },
+  "nvim-lspconfig": { "branch": "master", "commit": "fcf153fbbf1facd16a71d46b92be8be495123a9f" },
   "nvim-treesitter": { "branch": "master", "commit": "e9acd01a4a1f6e584f76e736987f4c31401aa4b1" },
   "nvim-treesitter-context": { "branch": "master", "commit": "bf4d15ee4e96ff5201f16a4ed14443670662eb90" },
   "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" },
diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua
index d435337..ded28db 100644
--- a/lua/lazy-plugins.lua
+++ b/lua/lazy-plugins.lua
@@ -171,7 +171,19 @@ local plugins = {
 				function() require("trouble").toggle("document_diagnostics") end),
 			vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end),
 			vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end),
-			vim.keymap.set("n", "<leader>gr", function() require("trouble").toggle("lsp_references") end)
+			-- lsp
+			vim.keymap.set("n", "<leader>gr", function()
+				require("trouble").toggle("lsp_references")
+			end),
+			vim.keymap.set('n', '<leader>D', function()
+				require("trouble").toggle("lsp_type_definitions")
+			end),
+			vim.keymap.set('n', 'gd', function ()
+				require("trouble").toggle("lsp_definitions")
+			end),
+			vim.keymap.set('n', '<leader>gi', function()
+				require("trouble").toggle("lsp_implementations")
+			end),
 		},
 		dependencies = { "nvim-tree/nvim-web-devicons" },
 	},
@@ -266,7 +278,9 @@ local plugins = {
 		keys = {
 			vim.keymap.set("n", "<leader>ng", ":Neogit<cr>")
 		},
-		config = true
+		opts = {
+			disable_hint = true,
+		},
 	},
 }
 
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index a66f434..4a9f124 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -15,17 +15,14 @@ vim.api.nvim_create_autocmd('LspAttach', {
 		-- Buffer local mappings.
 		-- See `:help vim.lsp.*` for documentation on any of the below functions
 		local opts = { buffer = ev.buf }
-		vim.keymap.set('n', '<leader>gD', vim.lsp.buf.declaration, opts)
-		vim.keymap.set('n', '<leader>gd', vim.lsp.buf.definition, opts)
+		vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
 		vim.keymap.set('n', '<leader>K', vim.lsp.buf.hover, opts)
-		vim.keymap.set('n', '<leader>gi', vim.lsp.buf.implementation, opts)
 		vim.keymap.set({ 'n', 'i' }, '<C-k>', vim.lsp.buf.signature_help, opts)
 		vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
 		vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
 		vim.keymap.set('n', '<leader>wl', function()
 			print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
 		end, opts)
-		vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts)
 		vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
 		vim.keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, opts)
 		vim.keymap.set('n', '<leader>fm', function()