diff --git a/laptop/config/keymaps.lua b/laptop/config/keymaps.lua
index f656603..d363b1a 100644
--- a/laptop/config/keymaps.lua
+++ b/laptop/config/keymaps.lua
@@ -8,11 +8,6 @@ local opt = vim.opt
 g.mapleader = ','
 g.maplocalleader = ';'
 
--- Set K to hover and ,a to show code actions
-api.nvim_create_user_command("LspHover", "lua vim.lsp.buf.hover()", { nargs = '+' })
-opt.keywordprg = ":LspHover"
-map('n', '<leader>a', vim.lsp.buf.code_action, { remap = false })
-
 -- Use ctrl-[hjkl] to select the active split!
 map('n', '<c-k>', ":wincmd k<cr>", { silent = true })
 map('n', '<c-j>', ":wincmd j<cr>", { silent = true })
diff --git a/laptop/plugin/lsp_config.lua b/laptop/plugin/lsp_config.lua
index 26d96f5..299514e 100644
--- a/laptop/plugin/lsp_config.lua
+++ b/laptop/plugin/lsp_config.lua
@@ -1,4 +1,5 @@
 local lspconfig = require('lspconfig')
+local map = vim.keymap.set
 
 require 'lspconfig'.pyright.setup({
     settings = {
@@ -17,3 +18,12 @@ lspconfig.lua_ls.setup({
         },
     }
 })
+
+-- Set ;k to hover and ;a to show code actions
+vim.api.nvim_create_autocmd("LspAttach", {
+    callback = function(args)
+        local bufnr = args.buf
+        map('n', '<localleader>k', vim.lsp.buf.hover, { remap = false })
+        map('n', '<localleader>a', vim.lsp.buf.code_action, { remap = false })
+    end,
+})
diff --git a/server/plugin/lsp_config.lua b/server/plugin/lsp_config.lua
index b88019a..08eb6dd 100644
--- a/server/plugin/lsp_config.lua
+++ b/server/plugin/lsp_config.lua
@@ -11,3 +11,12 @@ local lspconfig = require('lspconfig')
 --     },
 --   },
 -- }
+
+-- Set ;k to hover and ;a to show code actions
+vim.api.nvim_create_autocmd("LspAttach", {
+    callback = function(args)
+        local bufnr = args.buf
+        map('n', '<localleader>k', vim.lsp.buf.hover, { remap = false })
+        map('n', '<localleader>a', vim.lsp.buf.code_action, { remap = false })
+    end,
+})
diff --git a/vps/plugin/lsp_config.lua b/vps/plugin/lsp_config.lua
index b88019a..08eb6dd 100644
--- a/vps/plugin/lsp_config.lua
+++ b/vps/plugin/lsp_config.lua
@@ -11,3 +11,12 @@ local lspconfig = require('lspconfig')
 --     },
 --   },
 -- }
+
+-- Set ;k to hover and ;a to show code actions
+vim.api.nvim_create_autocmd("LspAttach", {
+    callback = function(args)
+        local bufnr = args.buf
+        map('n', '<localleader>k', vim.lsp.buf.hover, { remap = false })
+        map('n', '<localleader>a', vim.lsp.buf.code_action, { remap = false })
+    end,
+})