From 5b66c7c5fa708e644df24a26e6d173cfa4ee60bd Mon Sep 17 00:00:00 2001 From: andrzej Date: Wed, 13 Mar 2024 00:21:33 +0100 Subject: [PATCH] separate install and config --- lua/plugins/lsp/install.lua | 13 +++++++++++ lua/plugins/lsp/lspconfig.lua | 35 ------------------------------ lua/plugins/lsp/mason.lua | 41 ----------------------------------- 3 files changed, 13 insertions(+), 76 deletions(-) create mode 100644 lua/plugins/lsp/install.lua delete mode 100644 lua/plugins/lsp/lspconfig.lua delete mode 100644 lua/plugins/lsp/mason.lua diff --git a/lua/plugins/lsp/install.lua b/lua/plugins/lsp/install.lua new file mode 100644 index 0000000..6dc894b --- /dev/null +++ b/lua/plugins/lsp/install.lua @@ -0,0 +1,13 @@ +return { + { + "williamboman/mason.nvim", + dependencies = { "WhoIsSethDaniel/mason-tool-installer.nvim" }, + }, + { + "williamboman/mason-lspconfig.nvim", + }, + { + "neovim/nvim-lspconfig", + }, + +} diff --git a/lua/plugins/lsp/lspconfig.lua b/lua/plugins/lsp/lspconfig.lua deleted file mode 100644 index 340998c..0000000 --- a/lua/plugins/lsp/lspconfig.lua +++ /dev/null @@ -1,35 +0,0 @@ -return {"neovim/nvim-lspconfig", - config = function() - -local lsp_capabilities = require("cmp_nvim_lsp").default_capabilities() -local lspconfig = require('lspconfig') -lspconfig.lua_ls.setup { - capabilities = lsp_capabilities, - settings = { - Lua = { - diagnostics = { - globals = { "vim" }, - }, - }, - }, -} --- lspconfig.ltex.setup { --- capabilities = lsp_capabilities, --- } --- lspconfig.grammarly.setup { --- capabilities = lsp_capabilities, --- filetypes = { "markdown", "tex", "text", }, --- init_options = { --- clientId = "client_" --- }, --- root_dir = function(fname) --- return require'lspconfig'.util.find_git_ancestor(fname) or vim.loop.os_homedir() --- end, --- } --- lspconfig.marksman.setup { --- capabilities = lsp_capabilities, --- } - - end - - } diff --git a/lua/plugins/lsp/mason.lua b/lua/plugins/lsp/mason.lua deleted file mode 100644 index e7b09e4..0000000 --- a/lua/plugins/lsp/mason.lua +++ /dev/null @@ -1,41 +0,0 @@ -return { - { - "williamboman/mason.nvim", - dependencies = { "WhoIsSethDaniel/mason-tool-installer.nvim" }, - config = function() - -- import mason - local mason = require("mason") - local mason_tool_installer = require("mason-tool-installer") - - -- enable mason and configure icons - mason.setup({ - ui = { - icons = { - package_installed = "✓", - package_pending = "➜", - package_uninstalled = "✗", - }, - }, - }) - - mason_tool_installer.setup({ - ensure_installed = { - "prettier", -- prettier formatter - "stylua", -- lua formatter - "isort", -- python formatter - "black", -- python formatter - "pylint", -- python linter - "eslint_d", -- js linter - }, - }) - end, - }, - -- {"williamboman/mason-lspconfig.nvim", - -- config = function() - -- local mason_lspconfig = require("mason-lspconfig") - -- mason_lspconfig.setup { - -- ensure_installed = { "grammarly", "ltex" }, - -- } - -- end - -- } -}