diff --git a/.luafmt.toml b/.luafmt.toml deleted file mode 100644 index 032a7ed..0000000 --- a/.luafmt.toml +++ /dev/null @@ -1,11 +0,0 @@ -[indent] -kind = "Space" -width = 4 - -[layout] -max_line_width = 80 -max_blank_lines = 1 - -[output] -trailing_comma = "Multiline" -quote_style = "Double" diff --git a/after/lsp/emmylua_ls.lua b/after/lsp/emmylua_ls.lua deleted file mode 100644 index 7dd473f..0000000 --- a/after/lsp/emmylua_ls.lua +++ /dev/null @@ -1,37 +0,0 @@ -local lsp = require("lsp") - -local lua_library_paths = { vim.env.VIMRUNTIME } -vim.list_extend(lua_library_paths, require("pack").get_paths()) - ----@type vim.lsp.Config -return { - settings = { - emmylua = { - format = { - useDiff = true, - externalTool = { - program = "luafmt", - args = { - "--stdin", - "--level=lua-jit", - "--config=.luafmt.toml", - } - }, - }, - runtime = { - version = "LuaJIT", - requirePattern = { - "lua/?.lua", - "lua/?/init.lua", - }, - }, - workspace = { - library = lua_library_paths, - }, - hint = { - enable = false, - }, - } - }, - on_attach = lsp.on_attach, -} diff --git a/lua/lsp.lua b/lua/lsp.lua index 5a2b4a7..7bae990 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -72,14 +72,13 @@ function M.setup() "bashls", "clangd", "cmake", - "emmylua_ls", "gopls", -- "hyprls", "intelephense", -- "jedi_language_server", "lemminx", -- "xml_ls", - -- "lua_ls", + "lua_ls", "mesonlsp", "oxfmt", "oxlint", diff --git a/lua/plugins/mason-auto-install.lua b/lua/plugins/mason-auto-install.lua index 3ff6cef..6a5313d 100644 --- a/lua/plugins/mason-auto-install.lua +++ b/lua/plugins/mason-auto-install.lua @@ -9,7 +9,6 @@ require("mason-auto-install").setup({ "cmake-language-server", dependencies = { "golines" }, }, - "emmylua_ls", "gopls", "hyprls", { @@ -21,7 +20,7 @@ require("mason-auto-install").setup({ "lemminx", dependencies = { "xmlformatter" }, }, - -- "lua-language-server", + "lua-language-server", "mesonlsp", "oxfmt", "oxlint",