From 2fb6bddbc135e44c24902f96024b9ca01e6c26d6 Mon Sep 17 00:00:00 2001 From: Matt Leong Date: Mon, 15 Nov 2021 07:23:41 -0800 Subject: [PATCH] feat(themes): clean up theme config names --- lua/cosmic/config/examples/config.lua | 8 +++--- lua/cosmic/config/init.lua | 1 - lua/cosmic/core/theme/colors.lua | 25 +++++++++++-------- lua/cosmic/core/theme/integrated/nord.lua | 6 ++--- .../{rosepine.lua => rose-pine.lua} | 16 ++++++++++++ lua/cosmic/init.lua | 2 +- lua/cosmic/lsp/providers/init.lua | 2 -- lua/cosmic/lsp/providers/null_ls.lua | 2 +- lua/cosmic/pluginsInit.lua | 12 ++++++--- 9 files changed, 47 insertions(+), 27 deletions(-) rename lua/cosmic/core/theme/integrated/{rosepine.lua => rose-pine.lua} (60%) diff --git a/lua/cosmic/config/examples/config.lua b/lua/cosmic/config/examples/config.lua index f51bea7..7c138d8 100644 --- a/lua/cosmic/config/examples/config.lua +++ b/lua/cosmic/config/examples/config.lua @@ -18,11 +18,11 @@ config.statusline = { config.treesitter = {} -- theming, don't forget to run :PackerSync and reload CosmicNvim when chaning themes --- 'Catppuccino.nvim' --- 'gruvbox.nvim' --- 'nord.nvim' +-- 'catppuccino' +-- 'gruvbox' +-- 'nord' -- 'rose-pine' -config.theme = 'tokyonight.nvim' -- don't define or set to nil, if you want to enable your own theme in cosmic/config/plugins.lua +config.theme = 'tokyonight' -- don't define or set to nil, if you want to enable your own theme in cosmic/config/plugins.lua -- lsp settings config.lsp = { diff --git a/lua/cosmic/config/init.lua b/lua/cosmic/config/init.lua index b5ca872..19570bc 100644 --- a/lua/cosmic/config/init.lua +++ b/lua/cosmic/config/init.lua @@ -30,7 +30,6 @@ local default_config = { tsserver = { format = false, -- disable formatting all together }, - null_ls = {}, }, }, } diff --git a/lua/cosmic/core/theme/colors.lua b/lua/cosmic/core/theme/colors.lua index e0bfbbe..050b4e9 100644 --- a/lua/cosmic/core/theme/colors.lua +++ b/lua/cosmic/core/theme/colors.lua @@ -1,24 +1,27 @@ local config = require('cosmic.config') local colors = {} +local mod = 'cosmic.core.theme.integrated.' +local supported_themes = { + 'tokyonight', + 'catppuccino', + 'gruvbox', + 'rose-pine', + 'nord', +} -if config.theme == 'tokyonight.nvim' then - colors = require('cosmic.core.theme.integrated.tokyonight') -elseif config.theme == 'Catppuccino.nvim' then - colors = require('cosmic.core.theme.integrated.catppuccin') -elseif config.theme == 'gruvbox.nvim' then - colors = require('cosmic.core.theme.integrated.gruvbox') -elseif config.theme == 'rose-pine' then - colors = require('cosmic.core.theme.integrated.rosepine') -elseif config.theme == 'nord.nvim' then - colors = require('cosmic.core.theme.integrated.nord') +for _, theme in pairs(supported_themes) do + if theme == config.theme then + colors = require(mod .. theme) + end end if vim.tbl_isempty(colors) then return false end +-- @TODO: move elsewhere colors.notify_bg = 'Normal' -if config.theme == 'gruvbox.nvim' then +if config.theme == 'gruvbox' then colors.notify_bg = colors.bg end diff --git a/lua/cosmic/core/theme/integrated/nord.lua b/lua/cosmic/core/theme/integrated/nord.lua index 08bd101..ab7aa0e 100644 --- a/lua/cosmic/core/theme/integrated/nord.lua +++ b/lua/cosmic/core/theme/integrated/nord.lua @@ -1,9 +1,9 @@ local theme = require('nord.colors') local colors = { white = theme.nord4_gui, - bg = theme.nord2_gui, - bg_highlight = theme.nord2_gui, - statusline_bg = theme.nord0_gui, + bg = theme.nord1_gui, + bg_highlight = theme.nord1_gui, + statusline_bg = theme.nord2_gui, normal = theme.nord9_gui, insert = theme.nord14_gui, command = theme.nord13_gui, diff --git a/lua/cosmic/core/theme/integrated/rosepine.lua b/lua/cosmic/core/theme/integrated/rose-pine.lua similarity index 60% rename from lua/cosmic/core/theme/integrated/rosepine.lua rename to lua/cosmic/core/theme/integrated/rose-pine.lua index 33f19ba..48ff887 100644 --- a/lua/cosmic/core/theme/integrated/rosepine.lua +++ b/lua/cosmic/core/theme/integrated/rose-pine.lua @@ -1,4 +1,20 @@ local theme = require('rose-pine.palette') +--[[ base = '#191724', + surface = '#1f1d2e', + overlay = '#26233a', + inactive = '#555169', + subtle = '#6e6a86', + text = '#e0def4', + love = '#eb6f92', + gold = '#f6c177', + rose = '#ebbcba', + pine = '#31748f', + foam = '#9ccfd8', + iris = '#c4a7e7', + highlight = '#2a2837', + highlight_inactive = '#211f2d', + highlight_overlay = '#3a384a', + none = 'NONE', ]] local colors = { white = theme.text, bg = theme.surface, diff --git a/lua/cosmic/init.lua b/lua/cosmic/init.lua index 569376c..50d54c7 100644 --- a/lua/cosmic/init.lua +++ b/lua/cosmic/init.lua @@ -1,4 +1,5 @@ local cosmic_modules = { + 'cosmic.compiled', 'cosmic.disabled', 'cosmic.pluginsInit', 'cosmic.commands', @@ -15,7 +16,6 @@ for _, mod in ipairs(cosmic_modules) do end local user_config_modules = { - 'cosmic.compiled', 'cosmic.config.editor', 'cosmic.config.mappings', } diff --git a/lua/cosmic/lsp/providers/init.lua b/lua/cosmic/lsp/providers/init.lua index 3514224..0fb964f 100644 --- a/lua/cosmic/lsp/providers/init.lua +++ b/lua/cosmic/lsp/providers/init.lua @@ -19,8 +19,6 @@ lsp_installer.settings({ -- initial default serverse local requested_servers = { - -- 'eslint', - -- 'efm', 'tsserver', 'sumneko_lua', 'jsonls', diff --git a/lua/cosmic/lsp/providers/null_ls.lua b/lua/cosmic/lsp/providers/null_ls.lua index cf444f1..ac4788d 100644 --- a/lua/cosmic/lsp/providers/null_ls.lua +++ b/lua/cosmic/lsp/providers/null_ls.lua @@ -19,7 +19,7 @@ null_ls.config(vim.tbl_deep_extend('force', { }), null_ls.builtins.code_actions.gitsigns, }, -}, config.lsp.servers.null_ls)) +}, config.lsp.servers.null_ls or {})) require('lspconfig')['null-ls'].setup({ on_attach = on_attach, diff --git a/lua/cosmic/pluginsInit.lua b/lua/cosmic/pluginsInit.lua index 4c9cd10..a25ecb3 100644 --- a/lua/cosmic/pluginsInit.lua +++ b/lua/cosmic/pluginsInit.lua @@ -34,42 +34,46 @@ return packer.startup(function() use({ -- color scheme 'folke/tokyonight.nvim', + as = 'tokyonight', config = function() vim.g.tokyonight_style = 'night' vim.g.tokyonight_sidebars = { 'qf' } vim.cmd('color tokyonight') end, - disable = config.theme ~= 'tokyonight.nvim', + disable = config.theme ~= 'tokyonight', }) use({ 'Pocco81/Catppuccino.nvim', + as = 'catppuccino', config = function() vim.cmd('color catppuccin') end, branch = 'dev-remaster', - disable = config.theme ~= 'Catppuccino.nvim', + disable = config.theme ~= 'catppuccino', }) use({ 'shaunsingh/nord.nvim', + as = 'nord', config = function() vim.g.nord_contrast = true vim.g.nord_borders = true require('nord').set() end, - disable = config.theme ~= 'nord.nvim', + disable = config.theme ~= 'nord', }) use({ 'ellisonleao/gruvbox.nvim', + as = 'gruvbox', requires = { 'rktjmp/lush.nvim' }, config = function() -- todo: does nothing vim.o.background = 'dark' vim.cmd('colorscheme gruvbox') end, - disable = config.theme ~= 'gruvbox.nvim', + disable = config.theme ~= 'gruvbox', }) use({