feat: move lsp configs to `lsp/`

13 files changed, 43 insertions, 56 deletions

diff --git a/init.lua b/init.lua
index 4207fc1..164a954 100644
--- a/init.lua
+++ b/init.lua
@@ -1,3 +1,4 @@
 require("pml68.settings")
 require("pml68.remap")
+require("pml68.lsp")
 require("pml68.lazy")
diff --git a/lua/pml68/configs/settings/asm_lsp.lua b/lsp/asm_lsp.lua
index da468c7..da468c7 100644
--- a/lua/pml68/configs/settings/asm_lsp.lua
+++ b/lsp/asm_lsp.lua
diff --git a/lua/pml68/configs/settings/clangd.lua b/lsp/clangd.lua
index c5d4994..c5d4994 100644
--- a/lua/pml68/configs/settings/clangd.lua
+++ b/lsp/clangd.lua
diff --git a/lua/pml68/configs/settings/emmet_language_server.lua b/lsp/emmet_language_server.lua
index 18073fd..18073fd 100644
--- a/lua/pml68/configs/settings/emmet_language_server.lua
+++ b/lsp/emmet_language_server.lua
diff --git a/lua/pml68/configs/settings/gopls.lua b/lsp/gopls.lua
index a2b5212..a2b5212 100644
--- a/lua/pml68/configs/settings/gopls.lua
+++ b/lsp/gopls.lua
diff --git a/lua/pml68/configs/settings/jsonls.lua b/lsp/jsonls.lua
index c6c0776..c6c0776 100644
--- a/lua/pml68/configs/settings/jsonls.lua
+++ b/lsp/jsonls.lua
diff --git a/lua/pml68/configs/settings/lua_ls.lua b/lsp/lua_ls.lua
index a212aff..a212aff 100644
--- a/lua/pml68/configs/settings/lua_ls.lua
+++ b/lsp/lua_ls.lua
diff --git a/lua/pml68/configs/settings/pyright.lua b/lsp/pyright.lua
index b7e9a2a..b7e9a2a 100644
--- a/lua/pml68/configs/settings/pyright.lua
+++ b/lsp/pyright.lua
diff --git a/lua/pml68/configs/settings/rust_analyzer.lua b/lsp/rust_analyzer.lua
index 3b687c6..3b687c6 100644
--- a/lua/pml68/configs/settings/rust_analyzer.lua
+++ b/lsp/rust_analyzer.lua
diff --git a/lua/pml68/configs/lspconfig.lua b/lua/pml68/configs/lspconfig.lua
deleted file mode 100644
index 0460b4c..0000000
--- a/lua/pml68/configs/lspconfig.lua
+++ /dev/null
@@ -1,52 +0,0 @@
-local capabilities = vim.tbl_deep_extend("force",
-  vim.lsp.protocol.make_client_capabilities(),
-  require('cmp_nvim_lsp').default_capabilities()
-)
-local lspconfig = require("lspconfig")
-
-local servers = {
-  -- "asm_lsp",
-  "html",
-  "ts_ls",
-  "cssls",
-  "svelte",
-  "bashls",
-  "clangd",
-  "pyright",
-  "emmet_language_server",
-  "jsonls",
-  "rust_analyzer",
-  "kotlin_language_server",
-  "lua_ls",
-  "glsl_analyzer",
-  "csharp_ls",
-  "gopls",
-  "unocss",
-}
-
-vim.api.nvim_create_autocmd({ "BufEnter" }, {
-  pattern = { "build.sh", "*.subpackage.sh", "PKGBUILD", "*.install",
-    "makepkg.conf", "*.ebuild", "*.eclass", "color.map", "make.conf" },
-  callback = function()
-    vim.lsp.start({
-      name = "termux",
-      cmd = { "termux-language-server" }
-    })
-  end,
-})
-
-for _, server in pairs(servers) do
-  local opts = {
-    capabilities = capabilities,
-    on_attach = function(client, bufnr)
-      require("workspace-diagnostics").populate_workspace_diagnostics(client, bufnr)
-    end
-  }
-
-  local require_ok, conf_opts = pcall(require, "pml68.configs.settings." .. server)
-  if require_ok then
-    opts = vim.tbl_deep_extend("force", opts, conf_opts)
-  end
-
-  lspconfig[server].setup(opts)
-end
diff --git a/lua/pml68/configs/mason.lua b/lua/pml68/configs/mason.lua
index a317aaa..8635109 100644
--- a/lua/pml68/configs/mason.lua
+++ b/lua/pml68/configs/mason.lua
@@ -16,7 +16,7 @@ return {
     "typescript-language-server",
     "pyright",
     "glsl_analyzer",
-    "kotlin-language-server",
+    "kotlin-lsp",
     "jdtls",
     "csharp-language-server",
     "gopls",
diff --git a/lua/pml68/lsp.lua b/lua/pml68/lsp.lua
new file mode 100644
index 0000000..08a6b00
--- /dev/null
+++ b/lua/pml68/lsp.lua
@@ -0,0 +1,41 @@
+local servers = {
+  -- "asm_lsp",
+  "html",
+  "ts_ls",
+  "cssls",
+  "svelte",
+  "bashls",
+  "clangd",
+  "pyright",
+  "emmet_language_server",
+  "jsonls",
+  "rust_analyzer",
+  "kotlin_lsp",
+  "lua_ls",
+  "glsl_analyzer",
+  "csharp_ls",
+  "gopls",
+  "unocss",
+}
+
+vim.api.nvim_create_autocmd({ "BufEnter" }, {
+  pattern = { "build.sh", "*.subpackage.sh", "PKGBUILD", "*.install",
+    "makepkg.conf", "*.ebuild", "*.eclass", "color.map", "make.conf" },
+  callback = function()
+    vim.lsp.start({
+      name = "termux",
+      cmd = { "termux-language-server" }
+    })
+  end,
+})
+
+vim.lsp.config('*', {
+  -- capabilities = vim.tbl_deep_extend("force",
+  --   vim.lsp.protocol.make_client_capabilities(),
+  --   require('cmp_nvim_lsp').default_capabilities()),
+  on_attach = function(client, bufnr)
+    require("workspace-diagnostics").populate_workspace_diagnostics(client, bufnr)
+  end
+})
+
+vim.lsp.enable(servers)
diff --git a/lua/pml68/plugins/lsp.lua b/lua/pml68/plugins/lsp.lua
index 90cc935..999320e 100644
--- a/lua/pml68/plugins/lsp.lua
+++ b/lua/pml68/plugins/lsp.lua
@@ -2,9 +2,6 @@ return {
   {
     "neovim/nvim-lspconfig",
     event = { "BufReadPost", "BufNewFile" },
-    config = function()
-      require("pml68.configs.lspconfig")
-    end
   },
   {
     "mason-org/mason.nvim",