diff --git a/lua/cosmic/core/theme/colors.lua b/lua/cosmic/core/theme/colors.lua index 15576cd..54084b1 100644 --- a/lua/cosmic/core/theme/colors.lua +++ b/lua/cosmic/core/theme/colors.lua @@ -13,10 +13,4 @@ if vim.tbl_isempty(colors) then return false end --- @TODO: move elsewhere -colors.notify_bg = 'Normal' -if config.theme == 'gruvbox' then - colors.notify_bg = colors.bg -end - return colors diff --git a/lua/cosmic/core/theme/highlights.lua b/lua/cosmic/core/theme/highlights.lua index f2496d9..ea6c0b0 100644 --- a/lua/cosmic/core/theme/highlights.lua +++ b/lua/cosmic/core/theme/highlights.lua @@ -56,11 +56,6 @@ highlight('NotifyTRACEIcon', nil, colors.trace) highlight('TelescopeBorder', 'None', colors.floatBorder) highlight('FloatermBorder', 'None', colors.floatBorder) -highlight('StatusLine', colors.statusline_bg, 'StatusLine') +highlight('StatusLine', colors.statusline_bg, colors.statusline_bg) highlight('FloatBorder', 'None', colors.floatBorder) highlight('NormalFloat', 'Normal', 'Normal') - -local config = require('cosmic.config') -if config.theme == 'gruvbox.nvim' then - vim.o.background = 'dark' -end diff --git a/lua/cosmic/core/theme/plugins.lua b/lua/cosmic/core/theme/plugins.lua index eacafe6..42b33fe 100644 --- a/lua/cosmic/core/theme/plugins.lua +++ b/lua/cosmic/core/theme/plugins.lua @@ -46,9 +46,8 @@ function M.init(use, config) as = 'gruvbox', requires = { 'rktjmp/lush.nvim' }, config = function() - -- todo: does nothing vim.o.background = 'dark' - vim.cmd('colorscheme gruvbox') + vim.cmd('color gruvbox') end, disable = config.theme ~= 'gruvbox', }) diff --git a/lua/cosmic/init.lua b/lua/cosmic/init.lua index 50d54c7..b79d2b6 100644 --- a/lua/cosmic/init.lua +++ b/lua/cosmic/init.lua @@ -10,7 +10,11 @@ local cosmic_modules = { for _, mod in ipairs(cosmic_modules) do local ok, err = pcall(require, mod) - if not ok then + if mod == 'cosmic.compiled' and not ok then + vim.notify('Run :PackerCompile!', vim.log.levels.WARN, { + title = 'CosmicNvim', + }) + elseif not ok then error(('Error loading %s...\n\n%s'):format(mod, err)) end end