diff options
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/keymaps.lua | 19 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/lsp.lua | 15 |
2 files changed, 2 insertions, 32 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/keymaps.lua b/nvim/.config/nvim/lua/tobyvin/keymaps.lua index 25fe39a..8f71539 100644 --- a/nvim/.config/nvim/lua/tobyvin/keymaps.lua +++ b/nvim/.config/nvim/lua/tobyvin/keymaps.lua @@ -1,22 +1,3 @@ -local hover = function() - if require("tobyvin.utils.hover").open() then - -- Fix for diagnostics immediately overriding hover window - vim.api.nvim_command("set eventignore=CursorHold") - vim.api.nvim_command('autocmd CursorMoved <buffer> ++once set eventignore=""') - return "<Ignore>" - end - return "K" -end - -local external_docs = function() - if require("tobyvin.utils.documentation").open() then - return "<Ignore>" - end - return "gx" -end - -vim.keymap.set("n", "gx", external_docs, { desc = "external_docs", expr = true }) -vim.keymap.set("n", "K", hover, { expr = true, desc = "hover" }) vim.keymap.set("n", "<C-u>", "<C-u>zz", { desc = "up half page and center" }) vim.keymap.set("n", "<C-d>", "<C-d>zz", { desc = "down half page and center" }) vim.keymap.set("n", "<a-j>", "<CMD>m +1<CR>", { desc = "move line down" }) diff --git a/nvim/.config/nvim/lua/tobyvin/lsp.lua b/nvim/.config/nvim/lua/tobyvin/lsp.lua index d8b8e23..8a78fdd 100644 --- a/nvim/.config/nvim/lua/tobyvin/lsp.lua +++ b/nvim/.config/nvim/lua/tobyvin/lsp.lua @@ -26,22 +26,11 @@ vim.api.nvim_create_autocmd("LspAttach", { }) end - if client.server_capabilities.hoverProvider then - require("tobyvin.utils.hover").register(vim.lsp.buf.hover, { - desc = "lsp hover", - buffer = args.buf, - priority = 1, - }) - end - if vim.tbl_get(client.server_capabilities, "experimental", "externalDocs") then - require("tobyvin.utils.documentation").register(vim.lsp.buf.external_docs, { - desc = "lsp external_docs", - buffer = args.buf, - priority = 1, - }) + vim.keymap.set("n", "gx", vim.lsp.buf.external_docs, { desc = "external_docs", buffer = args.buf }) end + vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "hover", buffer = args.buf }) vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, { desc = "signature help", buffer = args.buf }) vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "definition", buffer = args.buf }) vim.keymap.set("n", "gD", vim.lsp.buf.declaration, { desc = "declaration", buffer = args.buf }) |