diff --git a/neovim/lua/plugins/config/lsp.lua b/neovim/lua/plugins/config/lsp.lua
index 4f0b719..cd0150d 100644
--- a/neovim/lua/plugins/config/lsp.lua
+++ b/neovim/lua/plugins/config/lsp.lua
@@ -7,38 +7,34 @@ if not ok then
 end
 
 local custom_attach = function(_, bufnr)
-  local function buf_set_keymap(...)
-    vim.api.nvim_buf_set_keymap(bufnr, ...)
-  end
+  local opts = { noremap=true, silent=true, buffer=bufnr }
 
-  local function buf_set_option(...)
-    vim.api.nvim_buf_set_option(bufnr, ...)
-  end
+  -- Enable completion triggered by <c-x><c-o>
+  vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
 
-  buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-  local opts = { noremap=true, silent=true }
-
-  -- See `:help vim.lsp.*` for documentation on any of the below functions
-  buf_set_keymap('n', '<leader>h', '<Cmd>lua vim.lsp.buf.hover()<CR>', { noremap=true, silent=true })
-  buf_set_keymap('n', '<leader>gd', '<Cmd>lua vim.lsp.buf.definition()<CR>', { noremap=true, silent=true })
-  buf_set_keymap('n', '<leader>gr', '<cmd>lua vim.lsp.buf.references()<CR>', { noremap=true, silent=true })
-  buf_set_keymap('n', '<leader>gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', { noremap=true, silent=true })
-  buf_set_keymap('n', '<leader>dl', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', { noremap=true, silent=true })
-  buf_set_keymap('n', '<leader>dn', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', { noremap=true, silent=true })
-  buf_set_keymap('n', '<leader>dp', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', { noremap=true, silent=true })
-  buf_set_keymap('n', '<leader>de', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', { noremap=true, silent=true })
-  buf_set_keymap('n', '<leader>gt', '<cmd>lua vim.lsp.buf.type_definition()<CR>', { noremap=true, silent=true })
-  buf_set_keymap('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', { noremap=true, silent=true })
-  buf_set_keymap("n", "<leader>ff", "<cmd>lua vim.lsp.buf.format { async = true }<CR>", opts)
-  buf_set_keymap('n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
-  buf_set_keymap('n', '<leader>dec', '<Cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-  --buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-  --buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
-  --buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
-  --buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
+  -- See `:help vim.diagnostic.*` for documentation on any of the diagnostics functions
+  vim.keymap.set('n', '<leader>h',   vim.lsp.buf.hover, opts)
+  vim.keymap.set('n', '<leader>gd',  vim.lsp.buf.definition, opts)
+  vim.keymap.set('n', '<leader>gr',  vim.lsp.buf.references, opts)
+  vim.keymap.set('n', '<leader>gi',  vim.lsp.buf.implementation, opts)
+  vim.keymap.set('n', '<leader>dl',  vim.diagnostic.setloclist, opts)
+  vim.keymap.set('n', '<leader>dn',  vim.diagnostic.goto_next, opts)
+  vim.keymap.set('n', '<leader>dp',  vim.diagnostic.goto_prev, opts)
+  vim.keymap.set('n', '<leader>gt',  vim.lsp.buf.type_definition, opts)
+  vim.keymap.set('n', '<leader>rn',  vim.lsp.buf.rename, opts)
+  vim.keymap.set("n", '<leader>ff',  function() vim.lsp.buf.format{ async = true } end, opts)
+  vim.keymap.set('n', '<leader>ca',  vim.lsp.buf.code_action, opts)
+  vim.keymap.set('n', '<leader>dec', vim.lsp.buf.declaration, opts)
+  --buf_set_keymap('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+  --buf_set_keymap('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
+  --buf_set_keymap('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
+  --buf_set_keymap('n', '<space>wl', function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end', opts)
 end
 
+local lsp_flags = {
+  debounce_text_changes = 150,
+}
+
 -- Go
 lspconfig.gopls.setup{
   on_attach = custom_attach,
@@ -57,16 +53,20 @@ lspconfig.gopls.setup{
       hoverKind = "FullDocumentation",
     },
   },
+  flags = lsp_flags,
 }
 
 -- Golangci-lint language server
 -- requires golangci-lint and golangci-lint-langserver
-lspconfig.golangci_lint_ls.setup{}
+lspconfig.golangci_lint_ls.setup{
+  flags = lsp_flags,
+}
 
 -- Jsonnet
 lspconfig.jsonnet_ls.setup{
   on_attach = custom_attach,
   cmd = {"jsonnet-language-server", "--lint"},
+  flags = lsp_flags,
 }
 
 -- Terraform
@@ -75,6 +75,7 @@ lspconfig.terraformls.setup{
   cmd       = {"terraform-ls", "serve", "-log-file="..log_directory.."/terraformls.log"},
   filetypes = {"terraform", "hcl", "tf"},
   root_dir  = lspconfig.util.root_pattern{".terraform", ".git", "main.tf"},
+  flags = lsp_flags,
 }
 
 -- Python
@@ -82,6 +83,7 @@ lspconfig.pylsp.setup{
   on_attach = custom_attach,
   cmd       = { "pylsp" },
   filetypes = { "python" },
+  flags = lsp_flags,
 }
 
 -- Lua
@@ -112,5 +114,6 @@ lspconfig.sumneko_lua.setup {
         enable = false,
       },
     }
-  }
+  },
+  flags = lsp_flags,
 }