diff --git a/lua/cosmic/lsp/providers/null_ls.lua b/lua/cosmic/lsp/providers/null_ls.lua index ac4788d..bea9eea 100644 --- a/lua/cosmic/lsp/providers/null_ls.lua +++ b/lua/cosmic/lsp/providers/null_ls.lua @@ -1,7 +1,8 @@ local config = require('cosmic.config') -local on_attach = require('cosmic.lsp.providers.defaults').on_attach +local defaults = require('cosmic.lsp.providers.defaults') local null_ls = require('null-ls') +local config_opts = config.lsp.servers.null_ls or {} null_ls.config(vim.tbl_deep_extend('force', { -- you must define at least one source for the plugin to work sources = { @@ -19,8 +20,6 @@ null_ls.config(vim.tbl_deep_extend('force', { }), null_ls.builtins.code_actions.gitsigns, }, -}, config.lsp.servers.null_ls or {})) +}, config_opts or {})) -require('lspconfig')['null-ls'].setup({ - on_attach = on_attach, -}) +require('lspconfig')['null-ls'].setup(vim.tbl_deep_extend('force', defaults, config_opts.opts or {})) diff --git a/lua/cosmic/modules/session/init.lua b/lua/cosmic/modules/session/init.lua index 102d13b..481a060 100644 --- a/lua/cosmic/modules/session/init.lua +++ b/lua/cosmic/modules/session/init.lua @@ -1,6 +1,7 @@ local config = require('cosmic.config') local defaults = { pre_save_cmds = { 'NvimTreeClose', 'cclose', 'lua vim.notify.dismiss()' }, + post_restore_cmds = { 'NvimTreeRefresh' }, auto_session_enabled = false, auto_save_enabled = true, auto_restore_enabled = false,