diff --git a/nvim/.config/nvim/lua/romanzy/remap.lua b/nvim/.config/nvim/lua/romanzy/remap.lua
index 2d3f39c..8ee47ba 100644
--- a/nvim/.config/nvim/lua/romanzy/remap.lua
+++ b/nvim/.config/nvim/lua/romanzy/remap.lua
@@ -5,7 +5,6 @@ vim.keymap.set("n", "<leader>dl", vim.cmd.Ex)
 
 vim.keymap.set("n", "<leader>s", ":set spell!<CR>")
 
-
 vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")
 
 -- disable normie mouse stuff
@@ -13,30 +12,26 @@ for _, key in ipairs({ "<Up>", "<Down>", "<Left>", "<Right>" }) do
     vim.keymap.set({ "n", "i", "v", "x", "s", "o", "c" }, key, "<Nop>")
 end
 
+vim.keymap.set("n", "g.", vim.diagnostic.open_float)
+vim.keymap.set("n", "gl", vim.diagnostic.setloclist)
+
+-- diagnostics only on error.
+vim.keymap.set("n", "g]", function()
+    vim.diagnostic.goto_next({
+        severity = vim.diagnostic.severity.ERROR,
+    })
+end)
+vim.keymap.set("n", "g[", function()
+    vim.diagnostic.goto_prev({
+        severity = vim.diagnostic.severity.ERROR,
+    })
+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", "<C-Space>", vim.lsp.completion.get, opts)
-        -- diagnostics only on error.
-        vim.keymap.set("n", "g]", function()
-            vim.diagnostic.goto_next({
-                severity = vim.diagnostic.severity.ERROR,
-            })
-        end, opts)
-        vim.keymap.set("n", "g[", function()
-            vim.diagnostic.goto_prev({
-                severity = vim.diagnostic.severity.ERROR,
-            })
-        end, opts)
+        vim.keymap.set("n", "gd", vim.lsp.buf.definition, { buffer = ev.buf })
+        vim.keymap.set("n", "gD", vim.lsp.buf.declaration, { buffer = ev.buf })
+        vim.keymap.set("n", "grd", vim.lsp.buf.references, { buffer = ev.buf })
+        vim.keymap.set("i", "<C-Space>", vim.lsp.completion.get, { buffer = ev.buf })
     end,
 })