diff --git a/group_vars/arch/neovim.yml b/group_vars/arch/neovim.yml
index 5f53aad..ef6fb27 100644
--- a/group_vars/arch/neovim.yml
+++ b/group_vars/arch/neovim.yml
@@ -16,10 +16,6 @@ language_servers:
     server_name: "cssls"
     auto_setup: true
 
-  - package: eslint-language-server
-    server_name: "eslint"
-    auto_setup: true
-
   - package: bash-language-server
     server_name: "bashls"
     auto_setup: true
diff --git a/templates/nvim/lua/lsp.lua.j2 b/templates/nvim/lua/lsp.lua.j2
index 83775d9..83c1adc 100644
--- a/templates/nvim/lua/lsp.lua.j2
+++ b/templates/nvim/lua/lsp.lua.j2
@@ -8,12 +8,17 @@ local on_attach = function(client, bufnr)
   vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
   vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
   vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
-  vim.keymap.set('n', 'gh', vim.lsp.buf.document_highlight, opts)
-  vim.keymap.set('n', 'gH', vim.lsp.buf.clear_references, opts)
   vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+  vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
   vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
-
+  vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
   vim.keymap.set('n', '<space>la', vim.lsp.buf.code_action, opts)
+
+  vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
+  vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
+  vim.keymap.set('n', '<space>wl', function()
+    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+  end, opts)
   vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
 
   vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)