diff --git a/neovim-ide/plugin/lsp.lua b/neovim-ide/plugin/lsp.lua index 56e3ea6..c3638e3 100644 --- a/neovim-ide/plugin/lsp.lua +++ b/neovim-ide/plugin/lsp.lua @@ -9,7 +9,6 @@ local capabilities = vim.lsp.protocol.make_client_capabilities() local cmp_lsp_capabilities = cmp_lsp.default_capabilities() capabilities = vim.tbl_deep_extend("keep", capabilities, cmp_lsp_capabilities) - vim.fn.sign_define("DiagnosticSignError", { text = " ", texthl = "DiagnosticSignError" }) vim.fn.sign_define("DiagnosticSignWarn", { text = "", texthl = "DiagnosticSignWarn" }) vim.fn.sign_define("DiagnosticSignInfo", { text = "", texthl = "DiagnosticSignInfo" }) @@ -21,7 +20,7 @@ vim.keymap.set("n", "]d", vim.diagnostic.goto_next, { desc = "Go to next diagnos vim.keymap.set("n", "xd", vim.diagnostic.open_float, { desc = "Open floating diagnostic message" }) vim.keymap.set("n", "xl", vim.diagnostic.setloclist, { desc = "Open diagnostics list" }) -null_ls.setup { +null_ls.setup({ sources = { null_ls.builtins.code_actions.shellcheck, null_ls.builtins.code_actions.gitsigns, @@ -30,13 +29,14 @@ null_ls.setup { null_ls.builtins.diagnostics.ruff, null_ls.builtins.diagnostics.statix, null_ls.builtins.diagnostics.commitlint, + null_ls.builtins.diagnostics.djlint.with({ extra_filetypes = { "html" } }), null_ls.builtins.formatting.beautysh, null_ls.builtins.formatting.jq, null_ls.builtins.formatting.ruff, null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.djlint.with({extra_filetypes = {"html"}}), + null_ls.builtins.formatting.djlint.with({ extra_filetypes = { "html" } }), }, -} +}) local servers = { ["lua_ls"] = {}, @@ -55,7 +55,11 @@ local servers = { }, }, ["emmet_ls"] = {}, - ["html"] = {}, + ["html"] = { + settings = { + provideFormatter = true, + }, + }, ["pyright"] = {}, ["ruff_lsp"] = {}, --["nil_ls"] = {}, diff --git a/neovim-ide/plugins.nix b/neovim-ide/plugins.nix index 1bf8555..9c4a7d8 100644 --- a/neovim-ide/plugins.nix +++ b/neovim-ide/plugins.nix @@ -80,6 +80,7 @@ let vim-table-mode which-key-nvim harpoon + vim-jinja (mkNeovimPlugin inputs.competitest-nvim "competitest.nvim") ];