diff --git a/nvim/.config/nvim/lua/romanzy/plugins/lsp.lua b/nvim/.config/nvim/lua/romanzy/plugins/lsp.lua index cb2cf08..9996849 100644 --- a/nvim/.config/nvim/lua/romanzy/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/romanzy/plugins/lsp.lua @@ -43,14 +43,6 @@ vim.api.nvim_create_autocmd("LspAttach", { if client:supports_method("textDocument/inlayHint") then vim.lsp.inlay_hint.enable(true, { bufnr = ev.buf }) end - - local opts = { buffer = ev.buf } - vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) - vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts) - vim.keymap.set("n", "grd", vim.lsp.buf.references, opts) - vim.keymap.set("n", "g.", vim.diagnostic.open_float, opts) - vim.keymap.set("n", "gl", vim.diagnostic.setloclist, opts) - vim.keymap.set("i", "", vim.lsp.completion.get, opts) end, }) diff --git a/nvim/.config/nvim/lua/romanzy/remap.lua b/nvim/.config/nvim/lua/romanzy/remap.lua index 425e4c5..2fc9c4d 100644 --- a/nvim/.config/nvim/lua/romanzy/remap.lua +++ b/nvim/.config/nvim/lua/romanzy/remap.lua @@ -8,7 +8,23 @@ vim.keymap.set("n", "s", ":set spell!") vim.keymap.set("t", "", "") -- disable normie mouse stuff -vim.opt.mouse = "" for _, key in ipairs({ "", "", "", "" }) do vim.keymap.set({ "n", "i", "v", "x", "s", "o", "c" }, key, "") end + +vim.api.nvim_create_autocmd("LspAttach", { + callback = function(ev) + local client = vim.lsp.get_client_by_id(ev.data.client_id) + if not client then + return + end + + local opts = { buffer = ev.buf } + vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) + vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts) + vim.keymap.set("n", "grd", vim.lsp.buf.references, opts) + vim.keymap.set("n", "g.", vim.diagnostic.open_float, opts) + vim.keymap.set("n", "gl", vim.diagnostic.setloclist, opts) + vim.keymap.set("i", "", vim.lsp.completion.get, opts) + end, +}) diff --git a/nvim/.config/nvim/lua/romanzy/set.lua b/nvim/.config/nvim/lua/romanzy/set.lua index 97bd58a..71c61ac 100644 --- a/nvim/.config/nvim/lua/romanzy/set.lua +++ b/nvim/.config/nvim/lua/romanzy/set.lua @@ -1,5 +1,7 @@ vim.opt.nu = true vim.opt.relativenumber = true +-- disable normie mouse stuff +vim.opt.mouse = "" vim.opt.tabstop = 4 vim.opt.softtabstop = 4 vim.opt.shiftwidth = 4