.config/nvim/lua/lsp/init.lua

@@ -1,5 +1,6 @@
 local servers = {
     bashls = {},
+    cmake = {},
     clangd = {},
     eslint = {},
     gopls = {},
@@ -8,9 +9,12 @@ local servers = {
     kotlin_language_server = {},
     lua_ls = require('lsp.lua_ls'),
     pyright = {},
+    ruby_lsp = {},
     rust_analyzer = {},
     ts_ls = {},
-    ruby_lsp = {},
+    yamlls = require('lsp.yamlls'),
+    jsonls = {},
+    svls = {}
 }
 
 vim.lsp.set_log_level("debug")
@@ -44,22 +48,6 @@ end
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
 local lspconfig = require('lspconfig')
 
-for server_name, config in pairs(servers) do
-    lspconfig[server_name].setup({
-        capabilities = capabilities,
-        on_attach = on_attach,
-        settings = {
-            [server_name] = config ~= {} and {
-                settings = {
-                    [server_name] = {
-                        config
-                    }
-                }
-            } or {}
-        },
-    })
-end
-
 for server_name, config in pairs(servers) do
     lspconfig[server_name].setup(vim.tbl_deep_extend('keep', {
         capabilities = capabilities,

.config/nvim/lua/lsp/jdtls.lua

@@ -1,3 +1,5 @@
 return {
-    root_dir = vim.fs.dirname(vim.fs.find({'gradlew', '.git', 'mvnw'}, { upward = true })[1]),
+    settings = {
+        root_dir = vim.fs.dirname(vim.fs.find({'gradlew', '.git', 'mvnw'}, { upward = true })[1]),
+    }
 }

.config/nvim/lua/lsp/lua_ls.lua

@@ -1,11 +1,13 @@
 return {
-    Lua = {
-        workspace = {
-            checkThirdParty = true,
-            library = {
-                vim.env.VIMRUNTIME
-            }
+    settings = {
+        Lua = {
+            workspace = {
+                checkThirdParty = true,
+                library = {
+                    vim.env.VIMRUNTIME
+                }
+            },
+            telemetry = { enable = false },
         },
-        telemetry = { enable = false },
-    },
+    }
 }

.config/nvim/lua/lsp/yamlls.lua

@@ -0,0 +1,9 @@
+return {
+    settings = {
+        redhat = {
+            telemetry = {
+                enabled = false
+            }
+        }
+    }
+}