diff --git a/.config/nvim/ftplugin/dockerfile.lua b/.config/nvim/ftplugin/dockerfile.lua
index 6fc764c..435b148 100644
--- a/.config/nvim/ftplugin/dockerfile.lua
+++ b/.config/nvim/ftplugin/dockerfile.lua
@@ -1,5 +1,7 @@
 -- packages
-require'lspconfig'.dockerls.setup {}
+require'lspconfig'.dockerls.setup {
+    on_attach = require'lspbinds',
+}
 
 -- variables
 
diff --git a/.config/nvim/ftplugin/python.lua b/.config/nvim/ftplugin/python.lua
index 303b8fa..dfc577a 100644
--- a/.config/nvim/ftplugin/python.lua
+++ b/.config/nvim/ftplugin/python.lua
@@ -1,5 +1,7 @@
 -- packages
-require'lspconfig'.pyright.setup {}
+require'lspconfig'.pyright.setup {
+    on_attach = require'lspbinds',
+}
 
 -- variables
 vim.cmd("let g:black_linelength=79")
diff --git a/.config/nvim/ftplugin/sh.lua b/.config/nvim/ftplugin/sh.lua
index bd8f24a..966fa33 100644
--- a/.config/nvim/ftplugin/sh.lua
+++ b/.config/nvim/ftplugin/sh.lua
@@ -1,5 +1,7 @@
 -- packages
-require'lspconfig'.bashls.setup{}
+require'lspconfig'.bashls.setup{
+    on_attach = require'lspbinds',
+}
 
 -- variables
 
diff --git a/.config/nvim/ftplugin/yaml.lua b/.config/nvim/ftplugin/yaml.lua
index 55c92e5..1bfc25b 100644
--- a/.config/nvim/ftplugin/yaml.lua
+++ b/.config/nvim/ftplugin/yaml.lua
@@ -1,5 +1,7 @@
 -- packages
-require'lspconfig'.yamlls.setup {}
+require'lspconfig'.yamlls.setup {
+    on_attach = require'lspbinds',
+}
 
 -- variables
 vim.o.shiftwidth = 2
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 689f596..79953a8 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -43,5 +43,3 @@ vim.keymap.set("n", "<C-k>", "<C-w>k"     )
 vim.keymap.set("n", "<C-l>", "<C-w>l"     )
 
 vim.keymap.set("n", "gf",    "gF"         )
-
-vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
diff --git a/.config/nvim/lspconfig.lua b/.config/nvim/lua/lspbinds.lua
similarity index 72%
rename from .config/nvim/lspconfig.lua
rename to .config/nvim/lua/lspbinds.lua
index 85c5217..56dfad6 100644
--- a/.config/nvim/lspconfig.lua
+++ b/.config/nvim/lua/lspbinds.lua
@@ -6,9 +6,7 @@ vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
 vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
 vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
 
--- Use an on_attach function to only map the following keys
--- after the language server attaches to the current buffer
-local on_attach = function(client, bufnr)
+return function(client, bufnr)
     -- Enable completion triggered by <c-x><c-o>
     vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
 
@@ -31,24 +29,3 @@ local on_attach = function(client, bufnr)
     vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
     vim.keymap.set('n', '<space>f', vim.lsp.buf.formatting, bufopts)
 end
-
-local lsp_flags = {
-    -- This is the default in Nvim 0.7+
-    debounce_text_changes = 150,
-}
-require('lspconfig')['pyright'].setup{
-    on_attach = on_attach,
-    flags = lsp_flags,
-}
-require('lspconfig')['tsserver'].setup{
-    on_attach = on_attach,
-    flags = lsp_flags,
-}
-require('lspconfig')['rust_analyzer'].setup{
-    on_attach = on_attach,
-    flags = lsp_flags,
-    -- Server-specific settings...
-    settings = {
-        ["rust-analyzer"] = {}
-    }
-}