diff --git a/nvim/init.lua b/nvim/init.lua index f3717c4..c4003a7 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -7,7 +7,7 @@ require('lualine_config') require('mappings') require('trim').setup({ - disable = {"markdown", "vimwiki"}, + ft_blocklist= {"markdown", "vimwiki"}, patterns = { [[%s/\s\+$//e]], -- remove unwanted spaces [[%s/\($\n\s*\)\+\%$//]], -- trim last line diff --git a/nvim/lua/lsp_config.lua b/nvim/lua/lsp_config.lua index 2ef7732..5e718aa 100644 --- a/nvim/lua/lsp_config.lua +++ b/nvim/lua/lsp_config.lua @@ -92,7 +92,7 @@ require("mason").setup { } } require("mason-lspconfig").setup { - ensure_installed = { "pyright", "texlab", "clangd", "bashls", "cmake", "jsonls", "tsserver", "vuels", "dockerls", "vimls", "html", "yamlls", "cssls", "sumneko_lua", "ltex"}, + ensure_installed = { "pyright", "texlab", "clangd", "bashls", "cmake", "jsonls", "tsserver", "vuels", "dockerls", "vimls", "html", "yamlls", "cssls", "lua_ls", "ltex"}, } require('lspconfig').pyright.setup { @@ -179,7 +179,7 @@ require('lspconfig').rust_analyzer.setup { capabilities = capabilities } -require'lspconfig'.sumneko_lua.setup { +require('lspconfig').lua_ls.setup { settings = { Lua = { runtime = {