diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 8c9c0ff..b7714de 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -119,6 +119,9 @@ return require('packer').startup(function(use) -- highlight current symbol "RRethy/vim-illuminate", + + -- lua plugin development + "folke/lua-dev.nvim", }, config = function() require('plugins.nvim-lsp-setup') end, } diff --git a/nvim/lua/plugins/nvim-lsp-setup.lua b/nvim/lua/plugins/nvim-lsp-setup.lua index 4be694e..086fd97 100644 --- a/nvim/lua/plugins/nvim-lsp-setup.lua +++ b/nvim/lua/plugins/nvim-lsp-setup.lua @@ -1,9 +1,3 @@ -local utils = require("nvim-lsp-setup.utils") - -local nvim_runtime_path = vim.split(package.path, ";") -table.insert(nvim_runtime_path, "lua/?.lua") -table.insert(nvim_runtime_path, "lua/?/init.lua") - require("nvim-lsp-setup").setup({ default_mappings = false, mappings = { @@ -23,7 +17,7 @@ require("nvim-lsp-setup").setup({ [""] = "lua vim.diagnostic.goto_next()", }, on_attach = function(client) - utils.format_on_save(client) + require("nvim-lsp-setup.utils").format_on_save(client) require("illuminate").on_attach(client) end, servers = { @@ -48,16 +42,7 @@ require("nvim-lsp-setup").setup({ }, }, }), - sumneko_lua = { - settings = { - Lua = { - runtime = { version = "LuaJIT", path = nvim_runtime_path }, - diagnostics = { globals = { "vim" } }, - workspace = { library = vim.api.nvim_get_runtime_file("", true) }, - telemetry = { enable = false } - } - } - }, + sumneko_lua = require('lua-dev').setup({}), terraformls = {}, volar = {}, },