feat: make lvim.lsp a builtin

2 files changed, 7 insertions, 11 deletions

diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index 4cb9cf54..031751f3 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -50,9 +50,8 @@ local M = {}
 M.config = function()
   local join_paths = require("lvim.utils").join_paths
 
+  local users_config = lvim.lsp
   lvim.lsp = {
-    -- Function that gets called to configure lvim.lsp
-    config = nil,
     templates_dir = join_paths(get_runtime_dir(), "site", "after", "ftplugin"),
     diagnostics = {
       signs = {
@@ -149,11 +148,9 @@ M.config = function()
       },
       config = {},
     },
-    ---@deprecated use lvim.lsp.automatic_configuration.skipped_servers instead
-    override = {},
-    ---@deprecated use lvim.lsp.installer.setup.automatic_installation instead
-    automatic_servers_installation = nil,
   }
+  local config = vim.tbl_deep_extend("force", lvim.lsp, users_config)
+  lvim.lsp = require("lvim.core.builtins").add_completion(config)
 end
 
 return M
diff --git a/lua/lvim/lsp/init.lua b/lua/lvim/lsp/init.lua
index 03650a99..a1862abb 100644
--- a/lua/lvim/lsp/init.lua
+++ b/lua/lvim/lsp/init.lua
@@ -86,14 +86,13 @@ function M.get_common_opts()
   }
 end
 
+function M.config()
+  require("lvim.lsp.config").config()
+end
+
 function M.setup()
   Log:debug "Setting up LSP support"
 
-  require("lvim.lsp.config").config()
-  if type(lvim.lsp.config) == "function" then
-    lvim.lsp.config()
-  end
-
   local lsp_status_ok, _ = pcall(require, "lspconfig")
   if not lsp_status_ok then
     return