diff --git a/nvim/init.lua b/nvim/init.lua index dbe5c4b..63168fb 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -49,6 +49,9 @@ require("packer").startup(function() -- indent lines use("lukas-reineke/indent-blankline.nvim") + + -- QOL + use 'm4xshen/autoclose.nvim' end) require("user.basics") @@ -101,14 +104,11 @@ configs.setup({ vim.opt.list = true vim.opt.listchars:append("space:⋅") vim.opt.listchars:append("eol:↴") ----require("ibl").setup({ ---- show_end_of_line = true, ---- show_current_context = true, ---- show_current_context_start = true, ----}) require("ibl").setup() +require("autoclose").setup() + nmap("", "TablineTabNew") nmap("", "TablineBufferNext") nmap("", "TablineBufferPrevious") diff --git a/nvim/lua/user/lsp/handlers.lua b/nvim/lua/user/lsp/handlers.lua index feccca2..3af754e 100644 --- a/nvim/lua/user/lsp/handlers.lua +++ b/nvim/lua/user/lsp/handlers.lua @@ -80,6 +80,10 @@ M.on_attach = function(client, bufnr) client.server_capabilities.documentFormattingProvider = false end + if client.name == "emmet_ls" then + client.capabilities.textDocument.completion.completionItem.snippetSupport = true + end + lsp_keymaps(bufnr) local status_ok, illuminate = pcall(require, "illuminate") if not status_ok then diff --git a/nvim/lua/user/lsp/mason.lua b/nvim/lua/user/lsp/mason.lua index 1eb4d60..b23d7bf 100644 --- a/nvim/lua/user/lsp/mason.lua +++ b/nvim/lua/user/lsp/mason.lua @@ -3,6 +3,7 @@ local servers = { "pyright", "tsserver", "terraformls", + "emmet_ls", } require("mason").setup() diff --git a/nvim/lua/user/lsp/settings/emmet_ls.lsp b/nvim/lua/user/lsp/settings/emmet_ls.lsp new file mode 100644 index 0000000..4e31f86 --- /dev/null +++ b/nvim/lua/user/lsp/settings/emmet_ls.lsp @@ -0,0 +1,8 @@ +return { + filetypes = { "css", "eruby", "html", "javascript", "javascriptreact", "less", "sass", "scss", "svelte", "pug", "typescriptreact", "vue" }, + init_options = { + html = { + ["bem.enabled"] = true + } + } +} diff --git a/sway/config b/sway/config index 452f582..4762ec8 100644 --- a/sway/config +++ b/sway/config @@ -2,7 +2,7 @@ output eDP-1 { #mode 1920x1080@60.004Hz mode 1920x1080@144.003Hz - scale 1.15 + scale 1.0 adaptive_sync on }