diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index afbfebac..22a73d7a 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -54,8 +54,7 @@ "plugins.extras.lang.python-extended", "plugins.extras.lang.rust-extended", "plugins.extras.lang.sql", - "plugins.extras.lang.web.css", - "plugins.extras.lang.web.html", + "plugins.extras.lang.web.html-css", "plugins.extras.lang.web.typescript-extended", "plugins.extras.linting.eslint-extended", "plugins.extras.linting.shellcheck", @@ -88,4 +87,5 @@ "NEWS.md": "2123" }, "version": 2 -} \ No newline at end of file +} + diff --git a/.config/nvim/lua/plugins/extras/lang/web/css.lua b/.config/nvim/lua/plugins/extras/lang/web/html-css.lua similarity index 77% rename from .config/nvim/lua/plugins/extras/lang/web/css.lua rename to .config/nvim/lua/plugins/extras/lang/web/html-css.lua index 5102dae5..3b6ad327 100644 --- a/.config/nvim/lua/plugins/extras/lang/web/css.lua +++ b/.config/nvim/lua/plugins/extras/lang/web/html-css.lua @@ -2,15 +2,19 @@ return { { "nvim-treesitter/nvim-treesitter", opts = function(_, opts) - if type(opts.ensure_installed) == "table" then - vim.list_extend(opts.ensure_installed, { "css", "scss" }) - end + vim.list_extend(opts.ensure_installed, { + "html", + "css", + "scss", + }) end, }, { "neovim/nvim-lspconfig", opts = { servers = { + emmet_language_server = {}, + html = {}, cssmodules_ls = {}, cssls = { lint = { @@ -39,13 +43,19 @@ return { "williamboman/mason.nvim", opts = function(_, opts) opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "cssmodules-language-server", "css-lsp" }) + vim.list_extend(opts.ensure_installed, { + "emmet-language-server", + "html-lsp", + "cssmodules-language-server", + "css-lsp", + }) end, }, { "luckasRanarison/nvim-devdocs", optional = true, ensure_installed = { + "html", "css", "sass", }, diff --git a/.config/nvim/lua/plugins/extras/lang/web/html.lua b/.config/nvim/lua/plugins/extras/lang/web/html.lua deleted file mode 100644 index 855816f5..00000000 --- a/.config/nvim/lua/plugins/extras/lang/web/html.lua +++ /dev/null @@ -1,33 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - vim.list_extend(opts.ensure_installed, { - "html", - }) - end, - }, - { - "neovim/nvim-lspconfig", - opts = { - servers = { - emmet_language_server = {}, - html = {}, - }, - }, - }, - { - "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "emmet-language-server", "html-lsp" }) - end, - }, - { - "luckasRanarison/nvim-devdocs", - optional = true, - ensure_installed = { - "html", - }, - }, -}