more html stuff

This commit is contained in:
Patrick Neff 2024-03-04 19:16:41 +01:00
parent 0e0596227b
commit afe5889b5e
2 changed files with 10 additions and 5 deletions

View File

@ -9,7 +9,6 @@ local capabilities = vim.lsp.protocol.make_client_capabilities()
local cmp_lsp_capabilities = cmp_lsp.default_capabilities() local cmp_lsp_capabilities = cmp_lsp.default_capabilities()
capabilities = vim.tbl_deep_extend("keep", capabilities, cmp_lsp_capabilities) capabilities = vim.tbl_deep_extend("keep", capabilities, cmp_lsp_capabilities)
vim.fn.sign_define("DiagnosticSignError", { text = "", texthl = "DiagnosticSignError" }) vim.fn.sign_define("DiagnosticSignError", { text = "", texthl = "DiagnosticSignError" })
vim.fn.sign_define("DiagnosticSignWarn", { text = "", texthl = "DiagnosticSignWarn" }) vim.fn.sign_define("DiagnosticSignWarn", { text = "", texthl = "DiagnosticSignWarn" })
vim.fn.sign_define("DiagnosticSignInfo", { text = "", texthl = "DiagnosticSignInfo" }) 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", "<leader>xd", vim.diagnostic.open_float, { desc = "Open floating diagnostic message" }) vim.keymap.set("n", "<leader>xd", vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
vim.keymap.set("n", "<leader>xl", vim.diagnostic.setloclist, { desc = "Open diagnostics list" }) vim.keymap.set("n", "<leader>xl", vim.diagnostic.setloclist, { desc = "Open diagnostics list" })
null_ls.setup { null_ls.setup({
sources = { sources = {
null_ls.builtins.code_actions.shellcheck, null_ls.builtins.code_actions.shellcheck,
null_ls.builtins.code_actions.gitsigns, null_ls.builtins.code_actions.gitsigns,
@ -30,13 +29,14 @@ null_ls.setup {
null_ls.builtins.diagnostics.ruff, null_ls.builtins.diagnostics.ruff,
null_ls.builtins.diagnostics.statix, null_ls.builtins.diagnostics.statix,
null_ls.builtins.diagnostics.commitlint, null_ls.builtins.diagnostics.commitlint,
null_ls.builtins.diagnostics.djlint.with({ extra_filetypes = { "html" } }),
null_ls.builtins.formatting.beautysh, null_ls.builtins.formatting.beautysh,
null_ls.builtins.formatting.jq, null_ls.builtins.formatting.jq,
null_ls.builtins.formatting.ruff, null_ls.builtins.formatting.ruff,
null_ls.builtins.formatting.stylua, 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 = { local servers = {
["lua_ls"] = {}, ["lua_ls"] = {},
@ -55,7 +55,11 @@ local servers = {
}, },
}, },
["emmet_ls"] = {}, ["emmet_ls"] = {},
["html"] = {}, ["html"] = {
settings = {
provideFormatter = true,
},
},
["pyright"] = {}, ["pyright"] = {},
["ruff_lsp"] = {}, ["ruff_lsp"] = {},
--["nil_ls"] = {}, --["nil_ls"] = {},

View File

@ -80,6 +80,7 @@ let
vim-table-mode vim-table-mode
which-key-nvim which-key-nvim
harpoon harpoon
vim-jinja
(mkNeovimPlugin inputs.competitest-nvim "competitest.nvim") (mkNeovimPlugin inputs.competitest-nvim "competitest.nvim")
]; ];