122 files changed, 221 insertions, 542 deletions
diff --git a/lua/lspconfig.lua b/lua/lspconfig.lua
index 2e7f848c..e6db7361 100644
--- a/lua/lspconfig.lua
+++ b/lua/lspconfig.lua
@@ -4,8 +4,6 @@ local M = {
   util = require 'lspconfig/util',
 }
 
-local script_path = M.util.script_path()
-
 M._root = {}
 
 function M.available_servers()
@@ -72,9 +70,21 @@ end
 local mt = {}
 function mt:__index(k)
   if configs[k] == nil then
-    -- dofile is used here as a performance hack to increase the speed of calls to setup({})
-    -- dofile does not cache module lookups, and requires the absolute path to the target file
-    pcall(dofile, script_path .. 'lspconfig/' .. k .. '.lua')
+    local success, config = pcall(require, 'lspconfig.server_configurations.' .. k)
+    if success then
+      configs[k] = config
+    else
+      vim.notify(
+        string.format(
+          'Cannot access configuration for %s. Ensure this server is listed in '
+            .. '`server_configurations.md` or added as a custom server.',
+          k
+        ),
+        vim.log.levels.WARN
+      )
+      -- Return a dummy function for compatibility with user configs
+      return { setup = function() end }
+    end
   end
   return configs[k]
 end
diff --git a/lua/lspconfig/als.lua b/lua/lspconfig/server_configurations/als.lua
index f0e7808e..2dfc8011 100644
--- a/lua/lspconfig/als.lua
+++ b/lua/lspconfig/server_configurations/als.lua
@@ -1,13 +1,11 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
-local server_name = 'als'
 local bin_name = 'ada_language_server'
 
 if vim.fn.has 'win32' == 1 then
   bin_name = 'ada_language_server.exe'
 end
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name },
     filetypes = { 'ada' },
diff --git a/lua/lspconfig/angularls.lua b/lua/lspconfig/server_configurations/angularls.lua
index 5c7120d8..8f98e700 100644
--- a/lua/lspconfig/angularls.lua
+++ b/lua/lspconfig/server_configurations/angularls.lua
@@ -1,8 +1,5 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'angularls'
-
 -- Angular requires a node_modules directory to probe for @angular/language-service and typescript
 -- in order to use your projects configured versions.
 -- This defaults to the vim cwd, but will get overwritten by the resolved root of the file.
@@ -14,7 +11,7 @@ end
 
 local default_probe_dir = get_probe_dir(vim.fn.getcwd())
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = {
       'ngserver',
diff --git a/lua/lspconfig/ansiblels.lua b/lua/lspconfig/server_configurations/ansiblels.lua
index 39e6b58b..79b1e1b7 100644
--- a/lua/lspconfig/ansiblels.lua
+++ b/lua/lspconfig/server_configurations/ansiblels.lua
@@ -1,8 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
-local server_name = 'ansiblels'
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { 'ansible-language-server', '--stdio' },
     settings = {
diff --git a/lua/lspconfig/arduino_language_server.lua b/lua/lspconfig/server_configurations/arduino_language_server.lua
index 6c9258f2..e4acf8ee 100644
--- a/lua/lspconfig/arduino_language_server.lua
+++ b/lua/lspconfig/server_configurations/arduino_language_server.lua
@@ -1,13 +1,10 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.arduino_language_server = {
+return {
   default_config = {
     cmd = { 'arduino-language-server' },
     filetypes = { 'arduino' },
-    root_dir = function(fname)
-      return util.root_pattern '*.ino'(fname)
-    end,
+    root_dir = util.root_pattern '*.ino',
   },
   docs = {
     description = [[
@@ -51,5 +48,3 @@ For further instruction about configuration options, run `arduino-language-serve
 ]],
   },
 }
-
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/bashls.lua b/lua/lspconfig/server_configurations/bashls.lua
index 9c45e931..6ae9fb34 100644
--- a/lua/lspconfig/bashls.lua
+++ b/lua/lspconfig/server_configurations/bashls.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'bashls'
-
-configs[server_name] = {
+return {
   default_config = {
     cmd = { 'bash-language-server', 'start' },
     cmd_env = {
diff --git a/lua/lspconfig/beancount.lua b/lua/lspconfig/server_configurations/beancount.lua
index f5e69114..6a352140 100644
--- a/lua/lspconfig/beancount.lua
+++ b/lua/lspconfig/server_configurations/beancount.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'beancount'
-local bin_name = 'beancount-langserver'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name },
+    cmd = { 'beancount-langserver' },
     filetypes = { 'beancount' },
     root_dir = util.find_git_ancestor,
     single_file_support = true,
diff --git a/lua/lspconfig/bicep.lua b/lua/lspconfig/server_configurations/bicep.lua
index b09b31f1..fc08b629 100644
--- a/lua/lspconfig/bicep.lua
+++ b/lua/lspconfig/server_configurations/bicep.lua
@@ -1,8 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
-local server_name = 'bicep'
 
-configs[server_name] = {
+return {
   default_config = {
     filetypes = { 'bicep' },
     root_dir = util.find_git_ancestor,
diff --git a/lua/lspconfig/bsl_ls.lua b/lua/lspconfig/server_configurations/bsl_ls.lua
index 048e20e5..f9b34acb 100644
--- a/lua/lspconfig/bsl_ls.lua
+++ b/lua/lspconfig/server_configurations/bsl_ls.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local name = 'bsl_ls'
-
-configs[name] = {
+return {
   default_config = {
     filetypes = { 'bsl', 'os' },
     root_dir = util.find_git_ancestor,
diff --git a/lua/lspconfig/ccls.lua b/lua/lspconfig/server_configurations/ccls.lua
index 7fecdf44..9d6ff4da 100644
--- a/lua/lspconfig/ccls.lua
+++ b/lua/lspconfig/server_configurations/ccls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.ccls = {
+return {
   default_config = {
     cmd = { 'ccls' },
     filetypes = { 'c', 'cpp', 'objc', 'objcpp' },
diff --git a/lua/lspconfig/clangd.lua b/lua/lspconfig/server_configurations/clangd.lua
index 7fe9ada1..9b4a31c7 100644
--- a/lua/lspconfig/clangd.lua
+++ b/lua/lspconfig/server_configurations/clangd.lua
@@ -1,4 +1,3 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
 -- https://clangd.llvm.org/extensions.html#switch-between-sourceheader
@@ -37,7 +36,7 @@ local default_capabilities = vim.tbl_deep_extend(
   }
 )
 
-configs.clangd = {
+return {
   default_config = {
     cmd = { 'clangd', '--background-index' },
     filetypes = { 'c', 'cpp', 'objc', 'objcpp' },
@@ -72,5 +71,3 @@ For details on how to automatically generate one using CMake look [here](https:/
     },
   },
 }
-
-configs.clangd.switch_source_header = switch_source_header
diff --git a/lua/lspconfig/clojure_lsp.lua b/lua/lspconfig/server_configurations/clojure_lsp.lua
index 75aaa1d4..73c693f5 100644
--- a/lua/lspconfig/clojure_lsp.lua
+++ b/lua/lspconfig/server_configurations/clojure_lsp.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.clojure_lsp = {
+return {
   default_config = {
     cmd = { 'clojure-lsp' },
     filetypes = { 'clojure', 'edn' },
diff --git a/lua/lspconfig/cmake.lua b/lua/lspconfig/server_configurations/cmake.lua
index 9592dec2..0ba4dc30 100644
--- a/lua/lspconfig/cmake.lua
+++ b/lua/lspconfig/server_configurations/cmake.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.cmake = {
+return {
   default_config = {
     cmd = { 'cmake-language-server' },
     filetypes = { 'cmake' },
diff --git a/lua/lspconfig/codeqlls.lua b/lua/lspconfig/server_configurations/codeqlls.lua
index e80070e7..d3dd8fbe 100644
--- a/lua/lspconfig/codeqlls.lua
+++ b/lua/lspconfig/server_configurations/codeqlls.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'codeqlls'
-
-configs[server_name] = {
+return {
   default_config = {
     cmd = { 'codeql', 'execute', 'language-server', '--check-errors', 'ON_CHANGE', '-q' },
     filetypes = { 'ql' },
diff --git a/lua/lspconfig/crystalline.lua b/lua/lspconfig/server_configurations/crystalline.lua
index 3bd4e390..f20bff27 100644
--- a/lua/lspconfig/crystalline.lua
+++ b/lua/lspconfig/server_configurations/crystalline.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.crystalline = {
+return {
   default_config = {
     cmd = { 'crystalline' },
     filetypes = { 'crystal' },
diff --git a/lua/lspconfig/csharp_ls.lua b/lua/lspconfig/server_configurations/csharp_ls.lua
index b26cb137..1e4809a7 100644
--- a/lua/lspconfig/csharp_ls.lua
+++ b/lua/lspconfig/server_configurations/csharp_ls.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'csharp_ls'
-
-configs[server_name] = {
+return {
   default_config = {
     cmd = { 'csharp-ls' },
     root_dir = util.root_pattern('*.sln', '*.csproj', '.git'),
diff --git a/lua/lspconfig/cssls.lua b/lua/lspconfig/server_configurations/cssls.lua
index 07cc608f..0c71965c 100644
--- a/lua/lspconfig/cssls.lua
+++ b/lua/lspconfig/server_configurations/cssls.lua
@@ -1,10 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'cssls'
 local bin_name = 'vscode-css-language-server'
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     filetypes = { 'css', 'scss', 'less' },
diff --git a/lua/lspconfig/cucumber_language_server.lua b/lua/lspconfig/server_configurations/cucumber_language_server.lua
index 6b8ecbfe..0a9a20c9 100644
--- a/lua/lspconfig/cucumber_language_server.lua
+++ b/lua/lspconfig/server_configurations/cucumber_language_server.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.cucumber_language_server = {
+return {
   default_config = {
     cmd = { 'cucumber-language-server', '--stdio' },
     filetypes = { 'cucumber' },
@@ -25,4 +24,3 @@ npm install -g @cucumber/language-server
     },
   },
 }
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/dartls.lua b/lua/lspconfig/server_configurations/dartls.lua
index 9a14960b..3e683ac2 100644
--- a/lua/lspconfig/dartls.lua
+++ b/lua/lspconfig/server_configurations/dartls.lua
@@ -1,7 +1,5 @@
 local util = require 'lspconfig/util'
-local configs = require 'lspconfig/configs'
 
-local server_name = 'dartls'
 local bin_name = 'dart'
 
 local find_dart_sdk_root_path = function()
@@ -30,7 +28,7 @@ local analysis_server_snapshot_path = function()
   return snapshot
 end
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, analysis_server_snapshot_path(), '--lsp' },
     filetypes = { 'dart' },
@@ -61,4 +59,3 @@ Language server for dart.
     },
   },
 }
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/denols.lua b/lua/lspconfig/server_configurations/denols.lua
index 4b0d2616..6fdc76ac 100644
--- a/lua/lspconfig/denols.lua
+++ b/lua/lspconfig/server_configurations/denols.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 local lsp = vim.lsp
 
-local server_name = 'denols'
-
 local function deno_uri_to_uri(uri)
   -- denols returns deno:/https/deno.land/std%400.85.0/http/server.ts
   -- nvim-lsp only handles deno://
@@ -105,7 +102,7 @@ local function denols_references(context)
   lsp.buf_request(0, 'textDocument/references', params)
 end
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { 'deno', 'lsp' },
     filetypes = {
@@ -166,9 +163,3 @@ vim.g.markdown_fenced_languages = {
     },
   },
 }
-
-configs.denols.definition = denols_definition
-configs.denols.references = denols_references
-configs.denols.buf_cache = buf_cache
-configs.denols.virtual_text_document = virtual_text_document
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/dhall_lsp_server.lua b/lua/lspconfig/server_configurations/dhall_lsp_server.lua
index 9378ed62..85b34463 100644
--- a/lua/lspconfig/dhall_lsp_server.lua
+++ b/lua/lspconfig/server_configurations/dhall_lsp_server.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.dhall_lsp_server = {
+return {
   default_config = {
     cmd = { 'dhall-lsp-server' },
     filetypes = { 'dhall' },
diff --git a/lua/lspconfig/diagnosticls.lua b/lua/lspconfig/server_configurations/diagnosticls.lua
index ccfd76bd..0de9932f 100644
--- a/lua/lspconfig/diagnosticls.lua
+++ b/lua/lspconfig/server_configurations/diagnosticls.lua
@@ -1,13 +1,11 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'diagnosticls'
 local bin_name = 'diagnostic-languageserver'
 if vim.fn.has 'win32' == 1 then
   bin_name = bin_name .. '.cmd'
 end
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     root_dir = util.find_git_ancestor,
diff --git a/lua/lspconfig/dockerls.lua b/lua/lspconfig/server_configurations/dockerls.lua
index 7de58e98..dc84d5b9 100644
--- a/lua/lspconfig/dockerls.lua
+++ b/lua/lspconfig/server_configurations/dockerls.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'dockerls'
-local bin_name = 'docker-langserver'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name, '--stdio' },
+    cmd = { 'docker-langserver', '--stdio' },
     filetypes = { 'dockerfile' },
     root_dir = util.root_pattern 'Dockerfile',
     single_file_support = true,
@@ -25,5 +21,3 @@ npm install -g dockerfile-language-server-nodejs
     },
   },
 }
-
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/dotls.lua b/lua/lspconfig/server_configurations/dotls.lua
index be1e86f3..6e308e21 100644
--- a/lua/lspconfig/dotls.lua
+++ b/lua/lspconfig/server_configurations/dotls.lua
@@ -1,18 +1,10 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'dotls'
-local bin_name = 'dot-language-server'
-
-local root_files = {
-  '.git',
-}
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name, '--stdio' },
+    cmd = { 'dot-language-server', '--stdio' },
     filetypes = { 'dot' },
-    root_dir = util.root_pattern(unpack(root_files)),
+    root_dir = util.find_git_ancestor,
     single_file_support = true,
   },
   docs = {
diff --git a/lua/lspconfig/efm.lua b/lua/lspconfig/server_configurations/efm.lua
index a96b22de..48c8453d 100644
--- a/lua/lspconfig/efm.lua
+++ b/lua/lspconfig/server_configurations/efm.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'efm'
-local bin_name = 'efm-langserver'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name },
+    cmd = { 'efm-langserver' },
     root_dir = util.find_git_ancestor,
     -- EFM does not support NULL root directories
     -- https://github.com/neovim/nvim-lspconfig/issues/1412
@@ -36,4 +32,3 @@ require('lspconfig')['efm'].setup{
     },
   },
 }
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/elixirls.lua b/lua/lspconfig/server_configurations/elixirls.lua
index e922b6c0..fff15826 100644
--- a/lua/lspconfig/elixirls.lua
+++ b/lua/lspconfig/server_configurations/elixirls.lua
@@ -1,8 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'elixirls'
-configs[server_name] = {
+return {
   default_config = {
     filetypes = { 'elixir', 'eelixir' },
     root_dir = function(fname)
@@ -40,5 +38,3 @@ require'lspconfig'.elixirls.setup{
     },
   },
 }
-
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/elmls.lua b/lua/lspconfig/server_configurations/elmls.lua
index 7bc62290..286eadcb 100644
--- a/lua/lspconfig/elmls.lua
+++ b/lua/lspconfig/server_configurations/elmls.lua
@@ -1,16 +1,14 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 local lsp = vim.lsp
 local api = vim.api
 
-local server_name = 'elmls'
 local bin_name = 'elm-language-server'
 
 local default_capabilities = lsp.protocol.make_client_capabilities()
 default_capabilities.offsetEncoding = { 'utf-8', 'utf-16' }
 local elm_root_pattern = util.root_pattern 'elm.json'
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name },
     -- TODO(ashkan) if we comment this out, it will allow elmls to operate on elm.json. It seems like it could do that, but no other editor allows it right now.
@@ -43,5 +41,3 @@ npm install -g elm elm-test elm-format @elm-tooling/elm-language-server
     },
   },
 }
-
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/ember.lua b/lua/lspconfig/server_configurations/ember.lua
index d042eca6..a9570fce 100644
--- a/lua/lspconfig/ember.lua
+++ b/lua/lspconfig/server_configurations/ember.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'ember'
-local bin_name = 'ember-language-server'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name, '--stdio' },
+    cmd = { 'ember-language-server', '--stdio' },
     filetypes = { 'handlebars', 'typescript', 'javascript' },
     root_dir = util.root_pattern('ember-cli-build.js', '.git'),
   },
@@ -25,5 +21,3 @@ npm install -g @lifeart/ember-language-server
     },
   },
 }
-
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/emmet_ls.lua b/lua/lspconfig/server_configurations/emmet_ls.lua
index 06b8e040..58d5b4e5 100644
--- a/lua/lspconfig/emmet_ls.lua
+++ b/lua/lspconfig/server_configurations/emmet_ls.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'emmet_ls'
-
-configs[server_name] = {
+return {
   default_config = {
     cmd = { 'emmet-ls', '--stdio' },
     filetypes = { 'html', 'css' },
diff --git a/lua/lspconfig/erlangls.lua b/lua/lspconfig/server_configurations/erlangls.lua
index adaf9b35..d463685a 100644
--- a/lua/lspconfig/erlangls.lua
+++ b/lua/lspconfig/server_configurations/erlangls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.erlangls = {
+return {
   default_config = {
     cmd = { 'erlang_ls' },
     filetypes = { 'erlang' },
diff --git a/lua/lspconfig/esbonio.lua b/lua/lspconfig/server_configurations/esbonio.lua
index ac0e184e..8911a237 100755..100644
--- a/lua/lspconfig/esbonio.lua
+++ b/lua/lspconfig/server_configurations/esbonio.lua
@@ -1,11 +1,10 @@
-local configs = require 'lspconfig/configs'
-local utils = require 'lspconfig/util'
+local util = require 'lspconfig/util'
 
-configs.esbonio = {
+return {
   default_config = {
     cmd = { 'python3', '-m', 'esbonio' },
     filetypes = { 'rst' },
-    root_dir = utils.find_git_ancestor,
+    root_dir = util.find_git_ancestor,
   },
   docs = {
     description = [[
diff --git a/lua/lspconfig/eslint.lua b/lua/lspconfig/server_configurations/eslint.lua
index 5bf253cd..dea4bcfd 100644
--- a/lua/lspconfig/eslint.lua
+++ b/lua/lspconfig/server_configurations/eslint.lua
@@ -1,4 +1,3 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 local lsp = vim.lsp
 
@@ -11,6 +10,7 @@ local get_eslint_client = function()
   end
   return nil
 end
+
 local function fix_all(opts)
   opts = opts or {}
 
@@ -43,7 +43,7 @@ local function fix_all(opts)
 end
 
 local bin_name = 'vscode-eslint-language-server'
-configs.eslint = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     filetypes = {
@@ -164,5 +164,3 @@ Messages already handled in lspconfig: eslint/openDoc, eslint/confirmESLintExecu
 ]],
   },
 }
-
-configs.eslint.fix_all = fix_all
diff --git a/lua/lspconfig/flow.lua b/lua/lspconfig/server_configurations/flow.lua
index 2a4bd880..b6e44b86 100644
--- a/lua/lspconfig/flow.lua
+++ b/lua/lspconfig/server_configurations/flow.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.flow = {
+return {
   default_config = {
     cmd = { 'npx', '--no-install', 'flow', 'lsp' },
     filetypes = { 'javascript', 'javascriptreact', 'javascript.jsx' },
@@ -27,4 +26,3 @@ npx flow lsp --help
     },
   },
 }
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/flux-lsp.lua b/lua/lspconfig/server_configurations/flux-lsp.lua
index 6d10b2cb..96e3e30a 100644
--- a/lua/lspconfig/flux-lsp.lua
+++ b/lua/lspconfig/server_configurations/flux-lsp.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'flux-lsp'
-local bin_name = 'flux-lsp'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name },
+    cmd = { 'flux-lsp' },
     filetypes = { 'flux' },
     root_dir = util.find_git_ancestor,
   },
@@ -23,5 +19,3 @@ cargo install --git https://github.com/influxdata/flux-lsp
     },
   },
 }
-
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/fortls.lua b/lua/lspconfig/server_configurations/fortls.lua
index 6e9c88ca..d31c7567 100644
--- a/lua/lspconfig/fortls.lua
+++ b/lua/lspconfig/server_configurations/fortls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.fortls = {
+return {
   default_config = {
     cmd = { 'fortls' },
     filetypes = { 'fortran' },
@@ -24,4 +23,3 @@ Fortran Language Server for the Language Server Protocol
     },
   },
 }
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/fsautocomplete.lua b/lua/lspconfig/server_configurations/fsautocomplete.lua
index c4aa173c..d26fa887 100644
--- a/lua/lspconfig/fsautocomplete.lua
+++ b/lua/lspconfig/server_configurations/fsautocomplete.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'fsautocomplete'
-
-configs[server_name] = {
+return {
   default_config = {
     cmd = { 'dotnet', 'fsautocomplete', '--background-service-enabled' },
     root_dir = util.root_pattern('*.sln', '*.fsproj', '.git'),
diff --git a/lua/lspconfig/fstar.lua b/lua/lspconfig/server_configurations/fstar.lua
index df94225b..e1eae21c 100644
--- a/lua/lspconfig/fstar.lua
+++ b/lua/lspconfig/server_configurations/fstar.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.fstar = {
+return {
   default_config = {
     cmd = { 'fstar.exe', '--lsp' },
     filetypes = { 'fstar' },
diff --git a/lua/lspconfig/gdscript.lua b/lua/lspconfig/server_configurations/gdscript.lua
index b39de1a2..2c7a2d22 100644
--- a/lua/lspconfig/gdscript.lua
+++ b/lua/lspconfig/server_configurations/gdscript.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.gdscript = {
+return {
   default_config = {
     cmd = { 'nc', 'localhost', '6008' },
     filetypes = { 'gd', 'gdscript', 'gdscript3' },
@@ -18,5 +17,3 @@ Language server for GDScript, used by Godot Engine.
     },
   },
 }
-
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/ghcide.lua b/lua/lspconfig/server_configurations/ghcide.lua
index 9eef2c7f..dda606cf 100644
--- a/lua/lspconfig/ghcide.lua
+++ b/lua/lspconfig/server_configurations/ghcide.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.ghcide = {
+return {
   default_config = {
     cmd = { 'ghcide', '--lsp' },
     filetypes = { 'haskell', 'lhaskell' },
diff --git a/lua/lspconfig/gopls.lua b/lua/lspconfig/server_configurations/gopls.lua
index 0126b127..de306736 100644
--- a/lua/lspconfig/gopls.lua
+++ b/lua/lspconfig/server_configurations/gopls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.gopls = {
+return {
   default_config = {
     cmd = { 'gopls' },
     filetypes = { 'go', 'gomod' },
diff --git a/lua/lspconfig/graphql.lua b/lua/lspconfig/server_configurations/graphql.lua
index 10af6f11..39baf65c 100644
--- a/lua/lspconfig/graphql.lua
+++ b/lua/lspconfig/server_configurations/graphql.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'graphql'
-local bin_name = 'graphql-lsp'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name, 'server', '-m', 'stream' },
+    cmd = { 'graphql-lsp', 'server', '-m', 'stream' },
     filetypes = { 'graphql' },
     root_dir = util.root_pattern('.git', '.graphqlrc*', '.graphql.config.*', 'graphql.config.*'),
   },
diff --git a/lua/lspconfig/groovyls.lua b/lua/lspconfig/server_configurations/groovyls.lua
index 49afa19d..b0aeab8d 100644
--- a/lua/lspconfig/groovyls.lua
+++ b/lua/lspconfig/server_configurations/groovyls.lua
@@ -1,15 +1,11 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local name = 'groovyls'
-local bin_name = 'groovy-language-server-all.jar'
-
-configs[name] = {
+return {
   default_config = {
     cmd = {
       'java',
       '-jar',
-      bin_name,
+      'groovy-language-server-all.jar',
     },
     filetypes = { 'groovy' },
     root_dir = function(fname)
@@ -36,16 +32,5 @@ require'lspconfig'.groovyls.setup{
 }
 ```
 ]],
-    default_config = {
-      cmd = {
-        'java',
-        '-jar',
-        bin_name,
-      },
-      filetypes = { 'groovy' },
-      root_dir = function(fname)
-        return util.root_pattern 'Jenkinsfile'(fname) or util.find_git_ancestor(fname)
-      end,
-    },
   },
 }
diff --git a/lua/lspconfig/haxe_language_server.lua b/lua/lspconfig/server_configurations/haxe_language_server.lua
index fd3bdc21..1fc3e206 100644
--- a/lua/lspconfig/haxe_language_server.lua
+++ b/lua/lspconfig/server_configurations/haxe_language_server.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.haxe_language_server = {
+return {
   default_config = {
     cmd = { 'haxe-language-server' },
     filetypes = { 'haxe' },
diff --git a/lua/lspconfig/hie.lua b/lua/lspconfig/server_configurations/hie.lua
index f991afbe..dafee6b2 100644
--- a/lua/lspconfig/hie.lua
+++ b/lua/lspconfig/server_configurations/hie.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.hie = {
+return {
   default_config = {
     cmd = { 'hie-wrapper', '--lsp' },
     filetypes = { 'haskell' },
diff --git a/lua/lspconfig/hls.lua b/lua/lspconfig/server_configurations/hls.lua
index 0d617a7b..ee58a96e 100644
--- a/lua/lspconfig/hls.lua
+++ b/lua/lspconfig/server_configurations/hls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.hls = {
+return {
   default_config = {
     cmd = { 'haskell-language-server-wrapper', '--lsp' },
     filetypes = { 'haskell', 'lhaskell' },
diff --git a/lua/lspconfig/html.lua b/lua/lspconfig/server_configurations/html.lua
index c2ac4f36..d208ddf3 100644
--- a/lua/lspconfig/html.lua
+++ b/lua/lspconfig/server_configurations/html.lua
@@ -1,10 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'html'
 local bin_name = 'vscode-html-language-server'
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     filetypes = { 'html' },
diff --git a/lua/lspconfig/idris2_lsp.lua b/lua/lspconfig/server_configurations/idris2_lsp.lua
index ad8ef594..2a149afd 100644
--- a/lua/lspconfig/idris2_lsp.lua
+++ b/lua/lspconfig/server_configurations/idris2_lsp.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.idris2_lsp = {
+return {
   default_config = {
     cmd = { 'idris2-lsp' },
     filetypes = { 'idris2' },
diff --git a/lua/lspconfig/intelephense.lua b/lua/lspconfig/server_configurations/intelephense.lua
index 1131ad91..0428ffe7 100644
--- a/lua/lspconfig/intelephense.lua
+++ b/lua/lspconfig/server_configurations/intelephense.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'intelephense'
-local bin_name = 'intelephense'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name, '--stdio' },
+    cmd = { 'intelephense', '--stdio' },
     filetypes = { 'php' },
     root_dir = function(pattern)
       local cwd = vim.loop.cwd()
diff --git a/lua/lspconfig/java_language_server.lua b/lua/lspconfig/server_configurations/java_language_server.lua
index aa21f19c..c4d47144 100644
--- a/lua/lspconfig/java_language_server.lua
+++ b/lua/lspconfig/server_configurations/java_language_server.lua
@@ -1,9 +1,6 @@
 local lspconfig = require 'lspconfig'
-local configs = require 'lspconfig/configs'
 
-local name = 'java_language_server'
-
-configs[name] = {
+return {
   default_config = {
     filetypes = { 'java' },
     root_dir = lspconfig.util.root_pattern('build.gradle', 'pom.xml', '.git'),
diff --git a/lua/lspconfig/jdtls.lua b/lua/lspconfig/server_configurations/jdtls.lua
index ad448448..353b1d42 100644
--- a/lua/lspconfig/jdtls.lua
+++ b/lua/lspconfig/server_configurations/jdtls.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 local handlers = require 'vim.lsp.handlers'
 
-local server_name = 'jdtls'
-
 local sysname = vim.loop.os_uname().sysname
 local env = {
   HOME = vim.loop.os_homedir(),
@@ -103,7 +100,7 @@ local root_files = {
   { 'build.gradle', 'build.gradle.kts' },
 }
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = {
       get_java_executable(),
diff --git a/lua/lspconfig/jedi_language_server.lua b/lua/lspconfig/server_configurations/jedi_language_server.lua
index 4de08799..9f51f195 100644
--- a/lua/lspconfig/jedi_language_server.lua
+++ b/lua/lspconfig/server_configurations/jedi_language_server.lua
@@ -1,4 +1,3 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
 local root_files = {
@@ -9,7 +8,7 @@ local root_files = {
   'Pipfile',
 }
 
-configs.jedi_language_server = {
+return {
   default_config = {
     cmd = { 'jedi-language-server' },
     filetypes = { 'python' },
diff --git a/lua/lspconfig/jsonls.lua b/lua/lspconfig/server_configurations/jsonls.lua
index 6875e811..67ec2f4d 100644
--- a/lua/lspconfig/jsonls.lua
+++ b/lua/lspconfig/server_configurations/jsonls.lua
@@ -1,10 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'jsonls'
 local bin_name = 'vscode-json-language-server'
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     filetypes = { 'json' },
diff --git a/lua/lspconfig/jsonnet_ls.lua b/lua/lspconfig/server_configurations/jsonnet_ls.lua
index 34bc3910..1e882285 100644
--- a/lua/lspconfig/jsonnet_ls.lua
+++ b/lua/lspconfig/server_configurations/jsonnet_ls.lua
@@ -1,4 +1,3 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
 -- common jsonnet library paths
@@ -10,7 +9,7 @@ local function jsonnet_path(root_dir)
   return table.concat(paths, ':')
 end
 
-configs.jsonnet_ls = {
+return {
   default_config = {
     cmd = { 'jsonnet-language-server' },
     filetypes = { 'jsonnet', 'libsonnet' },
diff --git a/lua/lspconfig/julials.lua b/lua/lspconfig/server_configurations/julials.lua
index e2aa5d4f..b2821658 100644
--- a/lua/lspconfig/julials.lua
+++ b/lua/lspconfig/server_configurations/julials.lua
@@ -1,4 +1,3 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
 local cmd = {
@@ -41,7 +40,7 @@ local cmd = {
   ]],
 }
 
-configs.julials = {
+return {
   default_config = {
     cmd = cmd,
     filetypes = { 'julia' },
diff --git a/lua/lspconfig/kotlin_language_server.lua b/lua/lspconfig/server_configurations/kotlin_language_server.lua
index 12b53980..7639463b 100644
--- a/lua/lspconfig/kotlin_language_server.lua
+++ b/lua/lspconfig/server_configurations/kotlin_language_server.lua
@@ -1,13 +1,4 @@
---- default config for gradle-projects of the
---- kotlin-language-server: https://github.com/fwcd/kotlin-language-server
----
---- This server requires vim to be aware of the kotlin-filetype.
---- You could refer for this capability to:
---- https://github.com/udalov/kotlin-vim (recommended)
---- Note that there is no LICENSE specified yet.
-
 local util = require 'lspconfig/util'
-local configs = require 'lspconfig/configs'
 
 local bin_name = 'kotlin-language-server'
 if vim.fn.has 'win32' == 1 then
@@ -31,7 +22,7 @@ local fallback_root_files = {
   'build.gradle.kts', -- Gradle
 }
 
-configs.kotlin_language_server = {
+return {
   default_config = {
     filetypes = { 'kotlin' },
     root_dir = function(fname)
@@ -49,6 +40,11 @@ configs.kotlin_language_server = {
     It is built via gradle and developed on github.
     Source and additional description:
     https://github.com/fwcd/kotlin-language-server
+
+    This server requires vim to be aware of the kotlin-filetype.
+    You could refer for this capability to:
+    https://github.com/udalov/kotlin-vim (recommended)
+    Note that there is no LICENSE specified yet.
     ]],
     default_config = {
       root_dir = [[root_pattern("settings.gradle")]],
diff --git a/lua/lspconfig/lean3ls.lua b/lua/lspconfig/server_configurations/lean3ls.lua
index 37c5cc7c..347d53b6 100644
--- a/lua/lspconfig/lean3ls.lua
+++ b/lua/lspconfig/server_configurations/lean3ls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.lean3ls = {
+return {
   default_config = {
     cmd = { 'lean-language-server', '--stdio', '--', '-M', '4096', '-T', '100000' },
     filetypes = { 'lean3' },
diff --git a/lua/lspconfig/leanls.lua b/lua/lspconfig/server_configurations/leanls.lua
index 7592e575..f9bdaef9 100644
--- a/lua/lspconfig/leanls.lua
+++ b/lua/lspconfig/server_configurations/leanls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.leanls = {
+return {
   default_config = {
     cmd = { 'lean', '--server' },
     filetypes = { 'lean' },
diff --git a/lua/lspconfig/lelwel_ls.lua b/lua/lspconfig/server_configurations/lelwel_ls.lua
index fe8db069..174664f1 100644
--- a/lua/lspconfig/lelwel_ls.lua
+++ b/lua/lspconfig/server_configurations/lelwel_ls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.lelwel_ls = {
+return {
   default_config = {
     cmd = { 'lelwel-ls' },
     filetypes = { 'llw' },
diff --git a/lua/lspconfig/lemminx.lua b/lua/lspconfig/server_configurations/lemminx.lua
index 26e4c409..6afabe1d 100644
--- a/lua/lspconfig/lemminx.lua
+++ b/lua/lspconfig/server_configurations/lemminx.lua
@@ -1,8 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'lemminx'
-configs[server_name] = {
+return {
   default_config = {
     filetypes = { 'xml', 'xsd', 'svg' },
     root_dir = util.find_git_ancestor,
@@ -31,5 +29,3 @@ NOTE to macOS users: Binaries from unidentified developers are blocked by defaul
     },
   },
 }
-
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/ltex.lua b/lua/lspconfig/server_configurations/ltex.lua
index 0726b31c..dea1f213 100644
--- a/lua/lspconfig/ltex.lua
+++ b/lua/lspconfig/server_configurations/ltex.lua
@@ -1,4 +1,3 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
 local language_id_mapping = {
@@ -10,7 +9,7 @@ local language_id_mapping = {
   xhtml = 'xhtml',
 }
 
-configs.ltex = {
+return {
   default_config = {
     cmd = { 'ltex-ls' },
     filetypes = { 'bib', 'markdown', 'org', 'plaintex', 'rst', 'rnoweb', 'tex' },
diff --git a/lua/lspconfig/metals.lua b/lua/lspconfig/server_configurations/metals.lua
index 45e54bd4..9badb1d9 100644
--- a/lua/lspconfig/metals.lua
+++ b/lua/lspconfig/server_configurations/metals.lua
@@ -1,11 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
-local server_name = 'metals'
-local bin_name = 'metals'
 
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name },
+    cmd = { 'metals' },
     filetypes = { 'scala' },
     root_dir = util.root_pattern('build.sbt', 'build.sc', 'build.gradle', 'pom.xml'),
     message_level = vim.lsp.protocol.MessageType.Log,
diff --git a/lua/lspconfig/mint.lua b/lua/lspconfig/server_configurations/mint.lua
index 670d26d8..bc4a5092 100644
--- a/lua/lspconfig/mint.lua
+++ b/lua/lspconfig/server_configurations/mint.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.mint = {
+return {
   default_config = {
     cmd = { 'mint', 'ls' },
     filetypes = { 'mint' },
diff --git a/lua/lspconfig/nickel_ls.lua b/lua/lspconfig/server_configurations/nickel_ls.lua
index 93508a66..b8ce112d 100644
--- a/lua/lspconfig/nickel_ls.lua
+++ b/lua/lspconfig/server_configurations/nickel_ls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.nickel_ls = {
+return {
   default_config = {
     cmd = { 'nls' },
     filetypes = { 'ncl', 'nickel' },
diff --git a/lua/lspconfig/nimls.lua b/lua/lspconfig/server_configurations/nimls.lua
index d74dcc99..da12a5fa 100644
--- a/lua/lspconfig/nimls.lua
+++ b/lua/lspconfig/server_configurations/nimls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.nimls = {
+return {
   default_config = {
     cmd = { 'nimlsp' },
     filetypes = { 'nim' },
diff --git a/lua/lspconfig/ocamlls.lua b/lua/lspconfig/server_configurations/ocamlls.lua
index ca833fff..26bf226c 100644
--- a/lua/lspconfig/ocamlls.lua
+++ b/lua/lspconfig/server_configurations/ocamlls.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'ocamlls'
-local bin_name = 'ocaml-language-server'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name, '--stdio' },
+    cmd = { 'ocaml-language-server', '--stdio' },
     filetypes = { 'ocaml', 'reason' },
     root_dir = util.root_pattern('*.opam', 'esy.json', 'package.json'),
   },
diff --git a/lua/lspconfig/ocamllsp.lua b/lua/lspconfig/server_configurations/ocamllsp.lua
index aa954256..2b799634 100644
--- a/lua/lspconfig/ocamllsp.lua
+++ b/lua/lspconfig/server_configurations/ocamllsp.lua
@@ -1,4 +1,3 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
 local language_id_of = {
@@ -13,7 +12,7 @@ local get_language_id = function(_, ftype)
   return language_id_of[ftype]
 end
 
-configs.ocamllsp = {
+return {
   default_config = {
     cmd = { 'ocamllsp' },
     filetypes = { 'ocaml', 'ocaml.menhir', 'ocaml.interface', 'ocaml.ocamllex', 'reason' },
diff --git a/lua/lspconfig/omnisharp.lua b/lua/lspconfig/server_configurations/omnisharp.lua
index 1fcb4f64..d17a6e8b 100644
--- a/lua/lspconfig/omnisharp.lua
+++ b/lua/lspconfig/server_configurations/omnisharp.lua
@@ -1,8 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
-local server_name = 'omnisharp'
 
-configs[server_name] = {
+return {
   default_config = {
     filetypes = { 'cs', 'vb' },
     root_dir = function(fname)
diff --git a/lua/lspconfig/pasls.lua b/lua/lspconfig/server_configurations/pasls.lua
index e818300c..1c64f36d 100644
--- a/lua/lspconfig/pasls.lua
+++ b/lua/lspconfig/server_configurations/pasls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.pasls = {
+return {
   default_config = {
     cmd = { 'pasls' },
     filetypes = { 'pascal' },
diff --git a/lua/lspconfig/perlls.lua b/lua/lspconfig/server_configurations/perlls.lua
index 61275267..aa70d66c 100644
--- a/lua/lspconfig/perlls.lua
+++ b/lua/lspconfig/server_configurations/perlls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.perlls = {
+return {
   default_config = {
     cmd = {
       'perl',
diff --git a/lua/lspconfig/perlpls.lua b/lua/lspconfig/server_configurations/perlpls.lua
index a356bddd..dfd81f5f 100644
--- a/lua/lspconfig/perlpls.lua
+++ b/lua/lspconfig/server_configurations/perlpls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.perlpls = {
+return {
   default_config = {
     cmd = { 'pls' },
     settings = {
diff --git a/lua/lspconfig/phpactor.lua b/lua/lspconfig/server_configurations/phpactor.lua
index 77eb45d2..1b1947e2 100644
--- a/lua/lspconfig/phpactor.lua
+++ b/lua/lspconfig/server_configurations/phpactor.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'phpactor'
-local bin_name = 'phpactor'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name, 'language-server' },
+    cmd = { 'phpactor', 'language-server' },
     filetypes = { 'php' },
     root_dir = function(pattern)
       local cwd = vim.loop.cwd()
diff --git a/lua/lspconfig/powershell_es.lua b/lua/lspconfig/server_configurations/powershell_es.lua
index 377cdd23..fdfbd59c 100644
--- a/lua/lspconfig/powershell_es.lua
+++ b/lua/lspconfig/server_configurations/powershell_es.lua
@@ -1,7 +1,5 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'powershell_es'
 local temp_path = vim.fn.stdpath 'cache'
 
 local function make_cmd(new_config)
@@ -13,7 +11,7 @@ local function make_cmd(new_config)
   end
 end
 
-configs[server_name] = {
+return {
   default_config = {
     shell = 'pwsh',
     on_new_config = function(new_config, _)
diff --git a/lua/lspconfig/prismals.lua b/lua/lspconfig/server_configurations/prismals.lua
index ea53d205..a6ffa12e 100644
--- a/lua/lspconfig/prismals.lua
+++ b/lua/lspconfig/server_configurations/prismals.lua
@@ -1,13 +1,11 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'prismals'
 local bin_name = 'prisma-language-server'
 if vim.fn.has 'win32' == 1 then
   bin_name = bin_name .. '.cmd'
 end
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     filetypes = { 'prisma' },
diff --git a/lua/lspconfig/psalm.lua b/lua/lspconfig/server_configurations/psalm.lua
index c40d30f2..a11b4eca 100644
--- a/lua/lspconfig/psalm.lua
+++ b/lua/lspconfig/server_configurations/psalm.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'psalm'
-local bin_name = 'psalm-language-server'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name },
+    cmd = { 'psalm-language-server' },
     filetypes = { 'php' },
     root_dir = util.root_pattern('psalm.xml', 'psalm.xml.dist'),
   },
diff --git a/lua/lspconfig/puppet.lua b/lua/lspconfig/server_configurations/puppet.lua
index 3882823d..50c510fd 100644
--- a/lua/lspconfig/puppet.lua
+++ b/lua/lspconfig/server_configurations/puppet.lua
@@ -1,9 +1,5 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'puppet'
-local bin_name = 'puppet-languageserver'
-
 local root_files = {
   'manifests',
   '.puppet-lint.rc',
@@ -11,9 +7,9 @@ local root_files = {
   '.git',
 }
 
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name, '--stdio' },
+    cmd = { 'puppet-languageserver', '--stdio' },
     filetypes = { 'puppet' },
     root_dir = util.root_pattern(unpack(root_files)),
     single_file_support = true,
diff --git a/lua/lspconfig/purescriptls.lua b/lua/lspconfig/server_configurations/purescriptls.lua
index d55564f7..92f7122e 100644
--- a/lua/lspconfig/purescriptls.lua
+++ b/lua/lspconfig/server_configurations/purescriptls.lua
@@ -1,13 +1,11 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'purescriptls'
 local bin_name = 'purescript-language-server'
 if vim.fn.has 'win32' == 1 then
   bin_name = bin_name .. '.cmd'
 end
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     filetypes = { 'purescript' },
diff --git a/lua/lspconfig/pylsp.lua b/lua/lspconfig/server_configurations/pylsp.lua
index 42a87150..dee5446b 100644
--- a/lua/lspconfig/pylsp.lua
+++ b/lua/lspconfig/server_configurations/pylsp.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.pylsp = {
+return {
   default_config = {
     cmd = { 'pylsp' },
     filetypes = { 'python' },
diff --git a/lua/lspconfig/pyre.lua b/lua/lspconfig/server_configurations/pyre.lua
index 8701f39b..f0af8b35 100644
--- a/lua/lspconfig/pyre.lua
+++ b/lua/lspconfig/server_configurations/pyre.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.pyre = {
+return {
   default_config = {
     cmd = { 'pyre', 'persistent' },
     filetypes = { 'python' },
diff --git a/lua/lspconfig/pyright.lua b/lua/lspconfig/server_configurations/pyright.lua
index d17aac5e..fc7a1d99 100644
--- a/lua/lspconfig/pyright.lua
+++ b/lua/lspconfig/server_configurations/pyright.lua
@@ -1,7 +1,5 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'pyright'
 local bin_name = 'pyright-langserver'
 if vim.fn.has 'win32' == 1 then
   bin_name = bin_name .. '.cmd'
@@ -24,7 +22,7 @@ local function organize_imports()
   vim.lsp.buf.execute_command(params)
 end
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     filetypes = { 'python' },
diff --git a/lua/lspconfig/r_language_server.lua b/lua/lspconfig/server_configurations/r_language_server.lua
index 396702bc..79c9b27f 100644
--- a/lua/lspconfig/r_language_server.lua
+++ b/lua/lspconfig/server_configurations/r_language_server.lua
@@ -1,7 +1,6 @@
 local util = require 'lspconfig/util'
-local configs = require 'lspconfig/configs'
 
-configs.r_language_server = {
+return {
   default_config = {
     cmd = { 'R', '--slave', '-e', 'languageserver::run()' },
     filetypes = { 'r', 'rmd' },
diff --git a/lua/lspconfig/racket_langserver.lua b/lua/lspconfig/server_configurations/racket_langserver.lua
index 71c95636..7b86f0dd 100644
--- a/lua/lspconfig/racket_langserver.lua
+++ b/lua/lspconfig/server_configurations/racket_langserver.lua
@@ -1,15 +1,10 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local root_files = {
-  '.git',
-}
-
-configs.racket_langserver = {
+return {
   default_config = {
     cmd = { 'racket', '--lib', 'racket-langserver' },
     filetypes = { 'racket', 'scheme' },
-    root_dir = util.root_pattern(unpack(root_files)),
+    root_dir = util.find_git_ancestor,
     single_file_support = true,
   },
   docs = {
diff --git a/lua/lspconfig/rescriptls.lua b/lua/lspconfig/server_configurations/rescriptls.lua
index 13ea1b73..c6bbd912 100644
--- a/lua/lspconfig/rescriptls.lua
+++ b/lua/lspconfig/server_configurations/rescriptls.lua
@@ -1,13 +1,10 @@
-local lspconfig = require 'lspconfig'
-local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
-local name = 'rescriptls'
-
-configs[name] = {
+return {
   default_config = {
     cmd = {},
     filetypes = { 'rescript' },
-    root_dir = lspconfig.util.root_pattern('bsconfig.json', '.git'),
+    root_dir = util.root_pattern('bsconfig.json', '.git'),
     settings = {},
   },
   docs = {
diff --git a/lua/lspconfig/rls.lua b/lua/lspconfig/server_configurations/rls.lua
index d9bf3acd..68429236 100644
--- a/lua/lspconfig/rls.lua
+++ b/lua/lspconfig/server_configurations/rls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.rls = {
+return {
   default_config = {
     cmd = { 'rls' },
     filetypes = { 'rust' },
diff --git a/lua/lspconfig/rnix.lua b/lua/lspconfig/server_configurations/rnix.lua
index 66a205de..a2ee06bd 100644
--- a/lua/lspconfig/rnix.lua
+++ b/lua/lspconfig/server_configurations/rnix.lua
@@ -1,10 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local name = 'rnix'
-
-configs[name] = {
-
+return {
   default_config = {
     cmd = { 'rnix-lsp' },
     filetypes = { 'nix' },
diff --git a/lua/lspconfig/robotframework_ls.lua b/lua/lspconfig/server_configurations/robotframework_ls.lua
index b55d9fcb..0370de39 100644
--- a/lua/lspconfig/robotframework_ls.lua
+++ b/lua/lspconfig/server_configurations/robotframework_ls.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'robotframework_ls'
-
-configs[server_name] = {
+return {
   default_config = {
     cmd = { 'robotframework_ls' },
     filetypes = { 'robot' },
diff --git a/lua/lspconfig/rome.lua b/lua/lspconfig/server_configurations/rome.lua
index 242fa2c2..9c9472c6 100644
--- a/lua/lspconfig/rome.lua
+++ b/lua/lspconfig/server_configurations/rome.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.rome = {
+return {
   default_config = {
     cmd = { 'rome', 'lsp' },
     filetypes = {
diff --git a/lua/lspconfig/rust_analyzer.lua b/lua/lspconfig/server_configurations/rust_analyzer.lua
index 285ba0f3..cd8c3aad 100644
--- a/lua/lspconfig/rust_analyzer.lua
+++ b/lua/lspconfig/server_configurations/rust_analyzer.lua
@@ -1,4 +1,3 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
 local function reload_workspace(bufnr)
@@ -11,7 +10,7 @@ local function reload_workspace(bufnr)
   end)
 end
 
-configs.rust_analyzer = {
+return {
   default_config = {
     cmd = { 'rust-analyzer' },
     filetypes = { 'rust' },
@@ -79,5 +78,3 @@ See [docs](https://github.com/rust-analyzer/rust-analyzer/tree/master/docs/user#
     },
   },
 }
-
-configs.rust_analyzer.reload_workspace = reload_workspace
diff --git a/lua/lspconfig/scry.lua b/lua/lspconfig/server_configurations/scry.lua
index 3d57d801..50f2d7ce 100644
--- a/lua/lspconfig/scry.lua
+++ b/lua/lspconfig/server_configurations/scry.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.scry = {
+return {
   default_config = {
     cmd = { 'scry' },
     filetypes = { 'crystal' },
diff --git a/lua/lspconfig/serve_d.lua b/lua/lspconfig/server_configurations/serve_d.lua
index 1764e06a..3522cf48 100644
--- a/lua/lspconfig/serve_d.lua
+++ b/lua/lspconfig/server_configurations/serve_d.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.serve_d = {
+return {
   default_config = {
     cmd = { 'serve-d' },
     filetypes = { 'd' },
diff --git a/lua/lspconfig/sixtyfps.lua b/lua/lspconfig/server_configurations/sixtyfps.lua
index 1ebc8774..da90fe30 100644
--- a/lua/lspconfig/sixtyfps.lua
+++ b/lua/lspconfig/server_configurations/sixtyfps.lua
@@ -1,6 +1,4 @@
-local configs = require 'lspconfig/configs'
-
-configs.sixtyfps = {
+return {
   default_config = {
     cmd = { 'sixtyfps-lsp' },
     filetypes = { 'sixtyfps' },
diff --git a/lua/lspconfig/solang.lua b/lua/lspconfig/server_configurations/solang.lua
index 43698443..49c84e47 100644
--- a/lua/lspconfig/solang.lua
+++ b/lua/lspconfig/server_configurations/solang.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.solang = {
+return {
   default_config = {
     cmd = { 'solang', '--language-server', '--target', 'ewasm' },
     filetypes = { 'solidity' },
diff --git a/lua/lspconfig/solargraph.lua b/lua/lspconfig/server_configurations/solargraph.lua
index acaaa1ca..f34419d1 100644
--- a/lua/lspconfig/solargraph.lua
+++ b/lua/lspconfig/server_configurations/solargraph.lua
@@ -1,11 +1,11 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
 local bin_name = 'solargraph'
 if vim.fn.has 'win32' == 1 then
   bin_name = bin_name .. '.bat'
 end
-configs.solargraph = {
+
+return {
   default_config = {
     cmd = { bin_name, 'stdio' },
     settings = {
diff --git a/lua/lspconfig/sorbet.lua b/lua/lspconfig/server_configurations/sorbet.lua
index 5d275d70..e3073025 100644
--- a/lua/lspconfig/sorbet.lua
+++ b/lua/lspconfig/server_configurations/sorbet.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'sorbet'
-local bin_name = 'srb'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name, 'tc', '--lsp' },
+    cmd = { 'srb', 'tc', '--lsp' },
     filetypes = { 'ruby' },
     root_dir = util.root_pattern('Gemfile', '.git'),
   },
diff --git a/lua/lspconfig/sourcekit.lua b/lua/lspconfig/server_configurations/sourcekit.lua
index e5b31486..4e2ba469 100644
--- a/lua/lspconfig/sourcekit.lua
+++ b/lua/lspconfig/server_configurations/sourcekit.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.sourcekit = {
+return {
   default_config = {
     cmd = { 'sourcekit-lsp' },
     filetypes = { 'swift', 'c', 'cpp', 'objective-c', 'objective-cpp' },
diff --git a/lua/lspconfig/spectral.lua b/lua/lspconfig/server_configurations/spectral.lua
index 661cb9b1..342d789a 100644
--- a/lua/lspconfig/spectral.lua
+++ b/lua/lspconfig/server_configurations/spectral.lua
@@ -1,10 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'spectral_ls'
 local bin_name = 'spectral-language-server'
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     filetypes = { 'yaml', 'json', 'yml' },
diff --git a/lua/lspconfig/sqlls.lua b/lua/lspconfig/server_configurations/sqlls.lua
index 1f91b6c0..6b377e65 100644
--- a/lua/lspconfig/sqlls.lua
+++ b/lua/lspconfig/server_configurations/sqlls.lua
@@ -1,16 +1,9 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'sqlls'
-
-local root_pattern = util.root_pattern '.sqllsrc.json'
-
-configs[server_name] = {
+return {
   default_config = {
     filetypes = { 'sql', 'mysql' },
-    root_dir = function(fname)
-      return root_pattern(fname) or vim.loop.os_homedir()
-    end,
+    root_dir = util.root_pattern '.sqllsrc.json',
     settings = {},
   },
   docs = {
diff --git a/lua/lspconfig/sqls.lua b/lua/lspconfig/server_configurations/sqls.lua
index 307f204f..4aa3614e 100644
--- a/lua/lspconfig/sqls.lua
+++ b/lua/lspconfig/server_configurations/sqls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.sqls = {
+return {
   default_config = {
     cmd = { 'sqls' },
     filetypes = { 'sql', 'mysql' },
diff --git a/lua/lspconfig/stylelint_lsp.lua b/lua/lspconfig/server_configurations/stylelint_lsp.lua
index cd435de8..5f99a1f3 100644
--- a/lua/lspconfig/stylelint_lsp.lua
+++ b/lua/lspconfig/server_configurations/stylelint_lsp.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.stylelint_lsp = {
+return {
   default_config = {
     cmd = { 'stylelint-lsp', '--stdio' },
     filetypes = {
diff --git a/lua/lspconfig/sumneko_lua.lua b/lua/lspconfig/server_configurations/sumneko_lua.lua
index 36df08ed..d11ff739 100644
--- a/lua/lspconfig/sumneko_lua.lua
+++ b/lua/lspconfig/server_configurations/sumneko_lua.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local name = 'sumneko_lua'
-
-configs[name] = {
+return {
   default_config = {
     filetypes = { 'lua' },
     root_dir = util.find_git_ancestor,
diff --git a/lua/lspconfig/svelte.lua b/lua/lspconfig/server_configurations/svelte.lua
index f395f8d7..8920d603 100644
--- a/lua/lspconfig/svelte.lua
+++ b/lua/lspconfig/server_configurations/svelte.lua
@@ -1,13 +1,11 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'svelte'
 local bin_name = 'svelteserver'
 if vim.fn.has 'win32' == 1 then
   bin_name = bin_name .. '.cmd'
 end
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     filetypes = { 'svelte' },
diff --git a/lua/lspconfig/svls.lua b/lua/lspconfig/server_configurations/svls.lua
index 3b87793c..9f302003 100644
--- a/lua/lspconfig/svls.lua
+++ b/lua/lspconfig/server_configurations/svls.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'svls'
-
-configs[server_name] = {
+return {
   default_config = {
     cmd = { 'svls' },
     filetypes = { 'verilog', 'systemverilog' },
diff --git a/lua/lspconfig/tailwindcss.lua b/lua/lspconfig/server_configurations/tailwindcss.lua
index 4b87185e..70c4b4bc 100644
--- a/lua/lspconfig/tailwindcss.lua
+++ b/lua/lspconfig/server_configurations/tailwindcss.lua
@@ -1,10 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'tailwindcss'
 local bin_name = 'tailwindcss-language-server'
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     -- filetypes copied and adjusted from tailwindcss-intellisense
diff --git a/lua/lspconfig/taplo.lua b/lua/lspconfig/server_configurations/taplo.lua
index 5c64adc3..a14b59a7 100644
--- a/lua/lspconfig/taplo.lua
+++ b/lua/lspconfig/server_configurations/taplo.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.taplo = {
+return {
   default_config = {
     cmd = { 'taplo-lsp', 'run' },
     filetypes = { 'toml' },
diff --git a/lua/lspconfig/terraform_lsp.lua b/lua/lspconfig/server_configurations/terraform_lsp.lua
index 39e8f49c..a48abb14 100644
--- a/lua/lspconfig/terraform_lsp.lua
+++ b/lua/lspconfig/server_configurations/terraform_lsp.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.terraform_lsp = {
+return {
   default_config = {
     cmd = { 'terraform-lsp' },
     filetypes = { 'terraform', 'hcl' },
@@ -42,4 +41,3 @@ choice:
     },
   },
 }
--- vim:et ts=2 sw=2
diff --git a/lua/lspconfig/terraformls.lua b/lua/lspconfig/server_configurations/terraformls.lua
index ec976f28..b4079801 100644
--- a/lua/lspconfig/terraformls.lua
+++ b/lua/lspconfig/server_configurations/terraformls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.terraformls = {
+return {
   default_config = {
     cmd = { 'terraform-ls', 'serve' },
     filetypes = { 'terraform' },
diff --git a/lua/lspconfig/texlab.lua b/lua/lspconfig/server_configurations/texlab.lua
index c1e2c30a..982f0a2c 100644
--- a/lua/lspconfig/texlab.lua
+++ b/lua/lspconfig/server_configurations/texlab.lua
@@ -1,4 +1,3 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 local lsp = vim.lsp
 
@@ -65,7 +64,7 @@ end
 --   end)
 -- end
 
-configs.texlab = {
+return {
   default_config = {
     cmd = { 'texlab' },
     filetypes = { 'tex', 'bib' },
@@ -126,6 +125,3 @@ See https://github.com/latex-lsp/texlab/blob/master/docs/options.md for configur
 ]],
   },
 }
-
-configs.texlab.buf_build = buf_build
-configs.texlab.buf_search = buf_search
diff --git a/lua/lspconfig/tflint.lua b/lua/lspconfig/server_configurations/tflint.lua
index c48b85b5..6e83374c 100644
--- a/lua/lspconfig/tflint.lua
+++ b/lua/lspconfig/server_configurations/tflint.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.tflint = {
+return {
   default_config = {
     cmd = { 'tflint', '--langserver' },
     filetypes = { 'terraform' },
diff --git a/lua/lspconfig/theme_check.lua b/lua/lspconfig/server_configurations/theme_check.lua
index 1e8b24fe..469b20cb 100644
--- a/lua/lspconfig/theme_check.lua
+++ b/lua/lspconfig/server_configurations/theme_check.lua
@@ -1,10 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'theme_check'
 local bin_name = 'theme-check-language-server'
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     filetypes = { 'liquid' },
diff --git a/lua/lspconfig/tsserver.lua b/lua/lspconfig/server_configurations/tsserver.lua
index 6a23ae05..36d955b8 100644
--- a/lua/lspconfig/tsserver.lua
+++ b/lua/lspconfig/server_configurations/tsserver.lua
@@ -1,13 +1,11 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'tsserver'
 local bin_name = 'typescript-language-server'
 if vim.fn.has 'win32' == 1 then
   bin_name = bin_name .. '.cmd'
 end
 
-configs[server_name] = {
+return {
   default_config = {
     init_options = { hostInfo = 'neovim' },
     cmd = { bin_name, '--stdio' },
diff --git a/lua/lspconfig/typeprof.lua b/lua/lspconfig/server_configurations/typeprof.lua
index cf948dd4..0a68e00d 100644
--- a/lua/lspconfig/typeprof.lua
+++ b/lua/lspconfig/server_configurations/typeprof.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'typeprof'
-
-configs[server_name] = {
+return {
   default_config = {
     cmd = { 'typeprof', '--lsp', '--stdio' },
     filetypes = { 'ruby', 'eruby' },
diff --git a/lua/lspconfig/vala_ls.lua b/lua/lspconfig/server_configurations/vala_ls.lua
index e6128ca3..2ccce75c 100644
--- a/lua/lspconfig/vala_ls.lua
+++ b/lua/lspconfig/server_configurations/vala_ls.lua
@@ -1,4 +1,3 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
 local meson_matcher = function(path)
@@ -22,7 +21,7 @@ local meson_matcher = function(path)
   end
 end
 
-configs.vala_ls = {
+return {
   default_config = {
     cmd = { 'vala-language-server' },
     filetypes = { 'vala', 'genie' },
diff --git a/lua/lspconfig/vdmj.lua b/lua/lspconfig/server_configurations/vdmj.lua
index 5fa703ab..439b9a2a 100644
--- a/lua/lspconfig/vdmj.lua
+++ b/lua/lspconfig/server_configurations/vdmj.lua
@@ -1,4 +1,3 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
 if vim.fn.has 'nvim-0.5.1' == 0 then
@@ -6,8 +5,6 @@ if vim.fn.has 'nvim-0.5.1' == 0 then
   return
 end
 
-local server_name = 'vdmj'
-
 local mavenrepo = util.path.join(vim.env.HOME, '.m2', 'repository', 'com', 'fujitsu')
 
 local function get_jar_path(config, package, version)
@@ -41,7 +38,7 @@ local function find_vscode_ancestor(startpath)
   end)
 end
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { 'java' },
     filetypes = { 'vdmsl', 'vdmpp', 'vdmrt' },
diff --git a/lua/lspconfig/vimls.lua b/lua/lspconfig/server_configurations/vimls.lua
index 0991274e..fdb67cec 100644
--- a/lua/lspconfig/vimls.lua
+++ b/lua/lspconfig/server_configurations/vimls.lua
@@ -1,13 +1,11 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'vimls'
 local bin_name = 'vim-language-server'
 if vim.fn.has 'win32' == 1 then
   bin_name = bin_name .. '.cmd'
 end
 
-configs[server_name] = {
+return {
   default_config = {
     cmd = { bin_name, '--stdio' },
     filetypes = { 'vim' },
diff --git a/lua/lspconfig/vls.lua b/lua/lspconfig/server_configurations/vls.lua
index 836b9c63..e6782421 100644
--- a/lua/lspconfig/vls.lua
+++ b/lua/lspconfig/server_configurations/vls.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local name = 'vls'
-
-configs[name] = {
+return {
   default_config = {
     filetypes = { 'vlang' },
     root_dir = util.root_pattern('v.mod', '.git'),
diff --git a/lua/lspconfig/volar.lua b/lua/lspconfig/server_configurations/volar.lua
index 7c3aee24..6b6d579b 100644
--- a/lua/lspconfig/volar.lua
+++ b/lua/lspconfig/server_configurations/volar.lua
@@ -1,4 +1,3 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
 local function get_typescript_server_path(root_dir)
@@ -7,9 +6,6 @@ local function get_typescript_server_path(root_dir)
     or ''
 end
 
-local server_name = 'volar'
-local bin_name = 'volar-server'
-
 -- https://github.com/johnsoncodehk/volar/blob/master/packages/shared/src/types.ts
 local volar_init_options = {
   typescript = {
@@ -50,9 +46,9 @@ local volar_init_options = {
   },
 }
 
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name, '--stdio' },
+    cmd = { 'volar-server', '--stdio' },
     filetypes = { 'vue' },
     root_dir = util.root_pattern 'package.json',
     init_options = volar_init_options,
diff --git a/lua/lspconfig/vuels.lua b/lua/lspconfig/server_configurations/vuels.lua
index d80a0f87..40686271 100644
--- a/lua/lspconfig/vuels.lua
+++ b/lua/lspconfig/server_configurations/vuels.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'vuels'
-local bin_name = 'vls'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name },
+    cmd = { 'vls' },
     filetypes = { 'vue' },
     root_dir = util.root_pattern('package.json', 'vue.config.js'),
     init_options = {
@@ -61,44 +57,6 @@ npm install -g vls
 ]],
     default_config = {
       root_dir = [[root_pattern("package.json", "vue.config.js")]],
-      init_options = {
-        config = {
-          vetur = {
-            useWorkspaceDependencies = false,
-            validation = {
-              template = true,
-              style = true,
-              script = true,
-            },
-            completion = {
-              autoImport = false,
-              useScaffoldSnippets = false,
-              tagCasing = 'kebab',
-            },
-            format = {
-              defaultFormatter = {
-                js = 'none',
-                ts = 'none',
-              },
-              defaultFormatterOptions = {},
-              scriptInitialIndent = false,
-              styleInitialIndent = false,
-            },
-          },
-          css = {},
-          html = {
-            suggest = {},
-          },
-          javascript = {
-            format = {},
-          },
-          typescript = {
-            format = {},
-          },
-          emmet = {},
-          stylusSupremacy = {},
-        },
-      },
     },
   },
 }
diff --git a/lua/lspconfig/yamlls.lua b/lua/lspconfig/server_configurations/yamlls.lua
index 12fc2670..b9c2645e 100644
--- a/lua/lspconfig/yamlls.lua
+++ b/lua/lspconfig/server_configurations/yamlls.lua
@@ -1,12 +1,8 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'yamlls'
-local bin_name = 'yaml-language-server'
-
-configs[server_name] = {
+return {
   default_config = {
-    cmd = { bin_name, '--stdio' },
+    cmd = { 'yaml-language-server', '--stdio' },
     filetypes = { 'yaml' },
     root_dir = util.find_git_ancestor,
     single_file_support = true,
diff --git a/lua/lspconfig/zeta_note.lua b/lua/lspconfig/server_configurations/zeta_note.lua
index d7c51549..deed3c9d 100644
--- a/lua/lspconfig/zeta_note.lua
+++ b/lua/lspconfig/server_configurations/zeta_note.lua
@@ -1,9 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-local server_name = 'zeta_note'
-
-configs[server_name] = {
+return {
   default_config = {
     filetypes = { 'markdown' },
     root_dir = util.root_pattern '.zeta.toml',
diff --git a/lua/lspconfig/server_configurations/zk.lua b/lua/lspconfig/server_configurations/zk.lua
new file mode 100644
index 00000000..b01c027a
--- /dev/null
+++ b/lua/lspconfig/server_configurations/zk.lua
@@ -0,0 +1,53 @@
+local util = require 'lspconfig/util'
+
+return {
+  default_config = {
+    cmd = { 'zk', 'lsp' },
+    filetypes = { 'markdown' },
+    root_dir = util.root_pattern '.zk',
+  },
+  commands = {
+    ZkIndex = {
+      function()
+        vim.lsp.buf.execute_command {
+          command = 'zk.index',
+          arguments = { vim.api.nvim_buf_get_name(0) },
+        }
+      end,
+      description = 'Index',
+    },
+    ZkNew = {
+      function(...)
+        vim.lsp.buf_request(
+          0,
+          'workspace/executeCommand',
+          {
+            command = 'zk.new',
+            arguments = {
+              vim.api.nvim_buf_get_name(0),
+              ...,
+            },
+          },
+          util.compat_handler(function(_, result, _, _)
+            if not (result and result.path) then
+              return
+            end
+            vim.cmd('edit ' .. result.path)
+          end)
+        )
+      end,
+
+      description = 'ZkNew',
+    },
+  },
+  docs = {
+    description = [[
+github.com/mickael-menu/zk
+
+A plain text note-taking assistant
+]],
+    default_config = {
+      root_dir = [[root_pattern(".zk")]],
+    },
+  },
+}
diff --git a/lua/lspconfig/zls.lua b/lua/lspconfig/server_configurations/zls.lua
index a156f029..10deea2e 100644
--- a/lua/lspconfig/zls.lua
+++ b/lua/lspconfig/server_configurations/zls.lua
@@ -1,7 +1,6 @@
-local configs = require 'lspconfig/configs'
 local util = require 'lspconfig/util'
 
-configs.zls = {
+return {
   default_config = {
     cmd = { 'zls' },
     filetypes = { 'zig', 'zir' },
diff --git a/lua/lspconfig/zk.lua b/lua/lspconfig/zk.lua
deleted file mode 100644
index 5fd50a5b..00000000
--- a/lua/lspconfig/zk.lua
+++ /dev/null
@@ -1,48 +0,0 @@
-local configs = require 'lspconfig/configs'
-local util = require 'lspconfig/util'
-
-configs.zk = {
-  default_config = {
-    cmd = { 'zk', 'lsp' },
-    filetypes = { 'markdown' },
-    root_dir = util.root_pattern '.zk',
-  },
-
-  docs = {
-    description = [[
-github.com/mickael-menu/zk
-
-A plain text note-taking assistant
-]],
-    default_config = {
-      root_dir = [[root_pattern(".zk")]],
-    },
-  },
-}
-
-configs.zk.index = function()
-  vim.lsp.buf.execute_command {
-    command = 'zk.index',
-    arguments = { vim.api.nvim_buf_get_name(0) },
-  }
-end
-
-configs.zk.new = function(...)
-  vim.lsp.buf_request(
-    0,
-    'workspace/executeCommand',
-    {
-      command = 'zk.new',
-      arguments = {
-        vim.api.nvim_buf_get_name(0),
-        ...,
-      },
-    },
-    util.compat_handler(function(_, result, _, _)
-      if not (result and result.path) then
-        return
-      end
-      vim.cmd('edit ' .. result.path)
-    end)
-  )
-end
diff --git a/scripts/docgen.lua b/scripts/docgen.lua
index b5682e83..c0b8ec43 100644
--- a/scripts/docgen.lua
+++ b/scripts/docgen.lua
@@ -84,9 +84,9 @@ require'lspconfig'.{{template_name}}.setup{}
 
 local function require_all_configs()
   -- Configs are lazy-loaded, tickle them to populate the `configs` singleton.
-  for _, v in ipairs(vim.fn.glob('lua/lspconfig/*.lua', 1, 1)) do
+  for _, v in ipairs(vim.fn.glob('lua/lspconfig/server_configurations/*.lua', 1, 1)) do
     local module_name = v:gsub('.*/', ''):gsub('%.lua$', '')
-    require('lspconfig/' .. module_name)
+    require('lspconfig/server_configurations/' .. module_name)
   end
 end