diff --git a/lua/plugins/configs/catppuccin.lua b/lua/plugins/configs/catppuccin.lua new file mode 100644 index 0000000..b07368c --- /dev/null +++ b/lua/plugins/configs/catppuccin.lua @@ -0,0 +1,29 @@ +local present, catppuccin = pcall(require, "catppuccin") + +if present then + vim.g.catppuccin_flavour = "macchiato" + + catppuccin.setup({ + term_colors = true, + compile = { + enabled = true, + path = vim.fn.stdpath("cache") .. "/catppuccin", + }, + integration = { + neotree = { + enabled = true, + show_root = true, + transparent_panel = false, + }, + navic = { + enabled = true, + custom_bg = "NONE", + }, + lsp_saga = true, + treesitter_context = true, + ts_rainbow = true, + }, + }) + + vim.cmd("colorscheme catppuccin") +end diff --git a/lua/plugins/configs/lualine.lua b/lua/plugins/configs/lualine.lua index 41b3fb4..54d56dd 100644 --- a/lua/plugins/configs/lualine.lua +++ b/lua/plugins/configs/lualine.lua @@ -11,6 +11,7 @@ lualine.setup({ refresh = { winbar = 50, }, + theme = "catppuccin", }, sections = { lualine_a = { "mode" }, diff --git a/lua/plugins/configs/nightfox.lua b/lua/plugins/configs/nightfox.lua index ce68292..b448fc7 100644 --- a/lua/plugins/configs/nightfox.lua +++ b/lua/plugins/configs/nightfox.lua @@ -1,4 +1,4 @@ -local present, nightfox = pcall(require, "nightfox") +local present, _ = pcall(require, "nightfox") if present then vim.cmd("colorscheme nordfox") diff --git a/lua/plugins/packer.lua b/lua/plugins/packer.lua index 9cf2f15..1c0ae21 100644 --- a/lua/plugins/packer.lua +++ b/lua/plugins/packer.lua @@ -21,6 +21,16 @@ vim.cmd([[ augroup end ]]) +vim.api.nvim_create_autocmd("User", { + pattern = "PackerCompileDone", + callback = function() + vim.cmd("CatppuccinCompile") + vim.defer_fn(function() + vim.cmd("colorscheme catppuccin") + end, 0) + end, +}) + local packer = require("packer") packer.init({ @@ -33,6 +43,7 @@ packer.init({ enable = true, threshold = 0, }, + auto_reload_compiled = true, }) return packer.startup(function(use) @@ -74,7 +85,13 @@ return packer.startup(function(use) "EdenEast/nightfox.nvim", run = ":NightfoxCompile", config = function() - require("plugins.configs.nightfox") + -- require("plugins.configs.nightfox") + end, + }) + use({ + "catppuccin/nvim", + config = function() + require("plugins.configs.catppuccin") end, })