Merge branch 'master' of https://gitea.brudi.xyz/kenobi/dotfiles
This commit is contained in:
commit
8b1abcfda9
|
@ -43,9 +43,10 @@ local lsp_flags = {
|
||||||
}
|
}
|
||||||
|
|
||||||
local capabilities = require('cmp_nvim_lsp').default_capabilities(
|
local capabilities = require('cmp_nvim_lsp').default_capabilities(
|
||||||
|
|
||||||
vim.lsp.protocol.make_client_capabilities()
|
vim.lsp.protocol.make_client_capabilities()
|
||||||
)
|
)
|
||||||
|
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
||||||
|
|
||||||
require('mason-lspconfig').setup_handlers {
|
require('mason-lspconfig').setup_handlers {
|
||||||
function(server_name)
|
function(server_name)
|
||||||
require('lspconfig')[server_name].setup {
|
require('lspconfig')[server_name].setup {
|
||||||
|
@ -93,14 +94,15 @@ require('mason-lspconfig').setup_handlers {
|
||||||
require('lspconfig')['html'].setup {
|
require('lspconfig')['html'].setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
flags = lsp_flags,
|
flags = lsp_flags,
|
||||||
cmd = { "html-languageserver", "--stdio" },
|
cmd = { "vscode-html-language-server", "--stdio" },
|
||||||
filetypes = { "html" },
|
filetypes = { "html" },
|
||||||
init_options = {
|
init_options = {
|
||||||
configurationSection = { "html", "css", "javascript" },
|
configurationSection = { "html", "css", "javascript" },
|
||||||
embeddedLanguages = {
|
embeddedLanguages = {
|
||||||
css = true,
|
css = true,
|
||||||
javascript = true
|
javascript = true
|
||||||
}
|
},
|
||||||
|
provideFormatter = true
|
||||||
},
|
},
|
||||||
settings = {}
|
settings = {}
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,6 +58,7 @@ require 'nvim-tree'.setup {
|
||||||
hijack_cursor = true,
|
hijack_cursor = true,
|
||||||
auto_reload_on_write = true,
|
auto_reload_on_write = true,
|
||||||
hijack_unnamed_buffer_when_opening = true,
|
hijack_unnamed_buffer_when_opening = true,
|
||||||
|
sync_root_with_cwd = true,
|
||||||
diagnostics = {
|
diagnostics = {
|
||||||
enable = true,
|
enable = true,
|
||||||
icons = {
|
icons = {
|
||||||
|
|
Loading…
Reference in New Issue