diff --git a/lua/cosmic/config/init.lua b/lua/cosmic/config/init.lua index 011a521..6e5f249 100644 --- a/lua/cosmic/config/init.lua +++ b/lua/cosmic/config/init.lua @@ -14,18 +14,18 @@ local default_config = { -- vim.diagnostic.config settiings servers = { -- enable/disable server + formatting - -- rust_analyzer = true, -- enable non-default servers + -- enable non-default servers + -- rust_analyzer = true, -- or override lsp server options - --[[ - rust_analyzer = { + --[[ rust_analyzer = { opts = {} - }, - ]] + }, ]] sumneko_lua = { format = false, -- disable formatting all together }, + html = true, tsserver = { format = false, -- disable formatting all together }, diff --git a/lua/cosmic/lsp/providers/defaults.lua b/lua/cosmic/lsp/providers/defaults.lua index 133fa53..6731d1e 100644 --- a/lua/cosmic/lsp/providers/defaults.lua +++ b/lua/cosmic/lsp/providers/defaults.lua @@ -36,28 +36,12 @@ function M.on_attach(client, bufnr) client.resolved_capabilities.document_formatting = false client.resolved_capabilities.document_range_formatting = false end - - --[[ require('lsp_signature').on_attach({ - bind = true, -- This is mandatory, otherwise border config won't get registered. - handler_opts = { - border = 'single', - }, - }, bufnr) ]] end M.flags = { debounce_text_changes = 150, } ---[[ local function get_capabilities() - local ok, cmp_nvim_lsp = pcall(require, 'cmp_nvim_lsp') - if not ok then - return {} - end - return cmp_nvim_lsp.update_capabilities(vim.lsp.protocol.make_client_capabilities()) -end - -M.capabilities = get_capabilities() ]] M.capabilities = {} M.root_dir = function(fname) diff --git a/lua/cosmic/lsp/providers/init.lua b/lua/cosmic/lsp/providers/init.lua index 0fb964f..56fb00c 100644 --- a/lua/cosmic/lsp/providers/init.lua +++ b/lua/cosmic/lsp/providers/init.lua @@ -17,14 +17,9 @@ lsp_installer.settings({ }, }) --- initial default serverse -local requested_servers = { - 'tsserver', - 'sumneko_lua', - 'jsonls', - 'cssls', - 'html', -} +-- initial default servers +-- by default tsserver/ts_utils and null_ls are enabled +local requested_servers = {} -- get disabled servers from config local disabled_servers = {} diff --git a/lua/cosmic/lsp/providers/null_ls.lua b/lua/cosmic/lsp/providers/null_ls.lua index ac4788d..6a942a1 100644 --- a/lua/cosmic/lsp/providers/null_ls.lua +++ b/lua/cosmic/lsp/providers/null_ls.lua @@ -17,6 +17,7 @@ null_ls.config(vim.tbl_deep_extend('force', { '-', }, }), + null_ls.builtins.formatting.stylelint, null_ls.builtins.code_actions.gitsigns, }, }, config.lsp.servers.null_ls or {}))