From 8e4c45a2139de9b606584cec838d43cc9722fc03 Mon Sep 17 00:00:00 2001 From: Matt Leong Date: Mon, 15 Nov 2021 07:29:43 -0800 Subject: [PATCH] feat(plugins): move theme plugins to new file --- lua/cosmic/core/theme/colors.lua | 8 +--- lua/cosmic/core/theme/plugins.lua | 67 +++++++++++++++++++++++++++++++ lua/cosmic/pluginsInit.lua | 54 +------------------------ 3 files changed, 69 insertions(+), 60 deletions(-) create mode 100644 lua/cosmic/core/theme/plugins.lua diff --git a/lua/cosmic/core/theme/colors.lua b/lua/cosmic/core/theme/colors.lua index 050b4e9..15576cd 100644 --- a/lua/cosmic/core/theme/colors.lua +++ b/lua/cosmic/core/theme/colors.lua @@ -1,13 +1,7 @@ local config = require('cosmic.config') local colors = {} local mod = 'cosmic.core.theme.integrated.' -local supported_themes = { - 'tokyonight', - 'catppuccino', - 'gruvbox', - 'rose-pine', - 'nord', -} +local supported_themes = require('cosmic.core.theme.plugins').supported_themes for _, theme in pairs(supported_themes) do if theme == config.theme then diff --git a/lua/cosmic/core/theme/plugins.lua b/lua/cosmic/core/theme/plugins.lua new file mode 100644 index 0000000..eacafe6 --- /dev/null +++ b/lua/cosmic/core/theme/plugins.lua @@ -0,0 +1,67 @@ +local M = {} + +M.supported_themes = { + 'tokyonight', + 'catppuccino', + 'gruvbox', + 'rose-pine', + 'nord', +} + +function M.init(use, config) + 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', + }) + + use({ + 'Pocco81/Catppuccino.nvim', + as = 'catppuccino', + config = function() + vim.cmd('color catppuccin') + end, + branch = 'dev-remaster', + 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', + }) + + 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', + }) + + use({ + 'rose-pine/neovim', + as = 'rose-pine', + config = function() + vim.g.rose_pine_variant = 'moon' + vim.cmd('colorscheme rose-pine') + end, + disable = config.theme ~= 'rose-pine', + }) +end + +return M diff --git a/lua/cosmic/pluginsInit.lua b/lua/cosmic/pluginsInit.lua index a25ecb3..dca60d0 100644 --- a/lua/cosmic/pluginsInit.lua +++ b/lua/cosmic/pluginsInit.lua @@ -32,59 +32,7 @@ return packer.startup(function() 'nvim-lua/plenary.nvim', }) - 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', - }) - - use({ - 'Pocco81/Catppuccino.nvim', - as = 'catppuccino', - config = function() - vim.cmd('color catppuccin') - end, - branch = 'dev-remaster', - 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', - }) - - 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', - }) - - use({ - 'rose-pine/neovim', - as = 'rose-pine', - config = function() - vim.g.rose_pine_variant = 'moon' - vim.cmd('colorscheme rose-pine') - end, - disable = config.theme ~= 'rose-pine', - }) + require('cosmic.core.theme.plugins').init(use, config) use({ 'rcarriga/nvim-notify',