diff --git a/init.vim b/init.vim index 82cafcd..b449601 100644 --- a/init.vim +++ b/init.vim @@ -41,7 +41,6 @@ Plug 'iruzo/ripgrep.nvim' " For managing lsps Plug 'williamboman/mason.nvim' -Plug 'neovim/nvim-lspconfig' " Delete, change and add surrounding pairs Plug 'kylechui/nvim-surround' @@ -201,43 +200,13 @@ require('telescope').setup({ . lua << -local lspconfig = require('lspconfig') -local configs = require('lspconfig.configs') - -if not configs.lua_ls then - configs.lua_ls = { - default_config = { - cmd = {vim.fn.expand('~/.local/bin/lua-language-server')}, - filetypes = {'lua'}, - single_file_support = true, - autostart = true, - } - } -end - -lspconfig.lua_ls.setup({ - settings = { - Lua = { - diagnostics = { - globals = { "love" }, - } - } - } -}) - -lspconfig.cssls.setup({}) -. - -lua << --- require('lspconfig').lua_ls.setup({ --- settings = { --- Lua = { --- runtime = { --- version = "LuaJIT" --- } --- } --- } --- }) +vim.lsp.config['lua_ls'] = { + cmd = { 'lua-language-server' }, + filetypes = { 'lua' }, + root_markers = { '.luarc.json', '.git' }, + settings = { Lua = { diagnostics = { globals = { "vim" } } } } +} +vim.lsp.enable('lua_ls') . lua require("mason").setup()