From a9a4c2b7207276c8177887f39b7c4d2580471b47 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Fri, 5 Nov 2021 16:22:14 -0500 Subject: [PATCH] dev: started migrating from katppuccino -> catppuccin --- .../api/colors.lua | 0 lua/{katppuccino => catppuccin}/config.lua | 0 .../core/color_palette.lua | 0 .../core/integrations/barbar.lua | 0 .../core/integrations/bufferline.lua | 0 .../core/integrations/cmp.lua | 0 .../core/integrations/dashboard.lua | 0 .../core/integrations/fern.lua | 0 .../core/integrations/gitgutter.lua | 0 .../core/integrations/gitsigns.lua | 0 .../core/integrations/hop.lua | 0 .../core/integrations/indent_blankline.lua | 0 .../core/integrations/lightspeed.lua | 0 .../core/integrations/lsp_saga.lua | 0 .../core/integrations/lsp_trouble.lua | 0 .../core/integrations/markdown.lua | 0 .../core/integrations/native_lsp.lua | 0 .../core/integrations/neogit.lua | 0 .../core/integrations/nvimtree.lua | 0 .../core/integrations/telescope.lua | 0 .../core/integrations/treesitter.lua | 0 .../core/integrations/ts_rainbow.lua | 0 .../core/integrations/vim_sneak.lua | 0 .../core/integrations/which_key.lua | 0 .../core/mapper.lua | 0 .../core/remaps.lua | 0 lua/catppuccin/init.lua | 16 ++++++++ lua/catppuccin/main.lua | 37 +++++++++++++++++++ .../utils/colors.lua | 0 .../utils/hsluv.lua | 0 .../utils/util.lua | 0 lua/katppuccino/init.lua | 16 -------- lua/katppuccino/main.lua | 37 ------------------- 33 files changed, 53 insertions(+), 53 deletions(-) rename lua/{katppuccino => catppuccin}/api/colors.lua (100%) rename lua/{katppuccino => catppuccin}/config.lua (100%) rename lua/{katppuccino => catppuccin}/core/color_palette.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/barbar.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/bufferline.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/cmp.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/dashboard.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/fern.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/gitgutter.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/gitsigns.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/hop.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/indent_blankline.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/lightspeed.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/lsp_saga.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/lsp_trouble.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/markdown.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/native_lsp.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/neogit.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/nvimtree.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/telescope.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/treesitter.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/ts_rainbow.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/vim_sneak.lua (100%) rename lua/{katppuccino => catppuccin}/core/integrations/which_key.lua (100%) rename lua/{katppuccino => catppuccin}/core/mapper.lua (100%) rename lua/{katppuccino => catppuccin}/core/remaps.lua (100%) create mode 100644 lua/catppuccin/init.lua create mode 100644 lua/catppuccin/main.lua rename lua/{katppuccino => catppuccin}/utils/colors.lua (100%) rename lua/{katppuccino => catppuccin}/utils/hsluv.lua (100%) rename lua/{katppuccino => catppuccin}/utils/util.lua (100%) delete mode 100644 lua/katppuccino/init.lua delete mode 100644 lua/katppuccino/main.lua diff --git a/lua/katppuccino/api/colors.lua b/lua/catppuccin/api/colors.lua similarity index 100% rename from lua/katppuccino/api/colors.lua rename to lua/catppuccin/api/colors.lua diff --git a/lua/katppuccino/config.lua b/lua/catppuccin/config.lua similarity index 100% rename from lua/katppuccino/config.lua rename to lua/catppuccin/config.lua diff --git a/lua/katppuccino/core/color_palette.lua b/lua/catppuccin/core/color_palette.lua similarity index 100% rename from lua/katppuccino/core/color_palette.lua rename to lua/catppuccin/core/color_palette.lua diff --git a/lua/katppuccino/core/integrations/barbar.lua b/lua/catppuccin/core/integrations/barbar.lua similarity index 100% rename from lua/katppuccino/core/integrations/barbar.lua rename to lua/catppuccin/core/integrations/barbar.lua diff --git a/lua/katppuccino/core/integrations/bufferline.lua b/lua/catppuccin/core/integrations/bufferline.lua similarity index 100% rename from lua/katppuccino/core/integrations/bufferline.lua rename to lua/catppuccin/core/integrations/bufferline.lua diff --git a/lua/katppuccino/core/integrations/cmp.lua b/lua/catppuccin/core/integrations/cmp.lua similarity index 100% rename from lua/katppuccino/core/integrations/cmp.lua rename to lua/catppuccin/core/integrations/cmp.lua diff --git a/lua/katppuccino/core/integrations/dashboard.lua b/lua/catppuccin/core/integrations/dashboard.lua similarity index 100% rename from lua/katppuccino/core/integrations/dashboard.lua rename to lua/catppuccin/core/integrations/dashboard.lua diff --git a/lua/katppuccino/core/integrations/fern.lua b/lua/catppuccin/core/integrations/fern.lua similarity index 100% rename from lua/katppuccino/core/integrations/fern.lua rename to lua/catppuccin/core/integrations/fern.lua diff --git a/lua/katppuccino/core/integrations/gitgutter.lua b/lua/catppuccin/core/integrations/gitgutter.lua similarity index 100% rename from lua/katppuccino/core/integrations/gitgutter.lua rename to lua/catppuccin/core/integrations/gitgutter.lua diff --git a/lua/katppuccino/core/integrations/gitsigns.lua b/lua/catppuccin/core/integrations/gitsigns.lua similarity index 100% rename from lua/katppuccino/core/integrations/gitsigns.lua rename to lua/catppuccin/core/integrations/gitsigns.lua diff --git a/lua/katppuccino/core/integrations/hop.lua b/lua/catppuccin/core/integrations/hop.lua similarity index 100% rename from lua/katppuccino/core/integrations/hop.lua rename to lua/catppuccin/core/integrations/hop.lua diff --git a/lua/katppuccino/core/integrations/indent_blankline.lua b/lua/catppuccin/core/integrations/indent_blankline.lua similarity index 100% rename from lua/katppuccino/core/integrations/indent_blankline.lua rename to lua/catppuccin/core/integrations/indent_blankline.lua diff --git a/lua/katppuccino/core/integrations/lightspeed.lua b/lua/catppuccin/core/integrations/lightspeed.lua similarity index 100% rename from lua/katppuccino/core/integrations/lightspeed.lua rename to lua/catppuccin/core/integrations/lightspeed.lua diff --git a/lua/katppuccino/core/integrations/lsp_saga.lua b/lua/catppuccin/core/integrations/lsp_saga.lua similarity index 100% rename from lua/katppuccino/core/integrations/lsp_saga.lua rename to lua/catppuccin/core/integrations/lsp_saga.lua diff --git a/lua/katppuccino/core/integrations/lsp_trouble.lua b/lua/catppuccin/core/integrations/lsp_trouble.lua similarity index 100% rename from lua/katppuccino/core/integrations/lsp_trouble.lua rename to lua/catppuccin/core/integrations/lsp_trouble.lua diff --git a/lua/katppuccino/core/integrations/markdown.lua b/lua/catppuccin/core/integrations/markdown.lua similarity index 100% rename from lua/katppuccino/core/integrations/markdown.lua rename to lua/catppuccin/core/integrations/markdown.lua diff --git a/lua/katppuccino/core/integrations/native_lsp.lua b/lua/catppuccin/core/integrations/native_lsp.lua similarity index 100% rename from lua/katppuccino/core/integrations/native_lsp.lua rename to lua/catppuccin/core/integrations/native_lsp.lua diff --git a/lua/katppuccino/core/integrations/neogit.lua b/lua/catppuccin/core/integrations/neogit.lua similarity index 100% rename from lua/katppuccino/core/integrations/neogit.lua rename to lua/catppuccin/core/integrations/neogit.lua diff --git a/lua/katppuccino/core/integrations/nvimtree.lua b/lua/catppuccin/core/integrations/nvimtree.lua similarity index 100% rename from lua/katppuccino/core/integrations/nvimtree.lua rename to lua/catppuccin/core/integrations/nvimtree.lua diff --git a/lua/katppuccino/core/integrations/telescope.lua b/lua/catppuccin/core/integrations/telescope.lua similarity index 100% rename from lua/katppuccino/core/integrations/telescope.lua rename to lua/catppuccin/core/integrations/telescope.lua diff --git a/lua/katppuccino/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua similarity index 100% rename from lua/katppuccino/core/integrations/treesitter.lua rename to lua/catppuccin/core/integrations/treesitter.lua diff --git a/lua/katppuccino/core/integrations/ts_rainbow.lua b/lua/catppuccin/core/integrations/ts_rainbow.lua similarity index 100% rename from lua/katppuccino/core/integrations/ts_rainbow.lua rename to lua/catppuccin/core/integrations/ts_rainbow.lua diff --git a/lua/katppuccino/core/integrations/vim_sneak.lua b/lua/catppuccin/core/integrations/vim_sneak.lua similarity index 100% rename from lua/katppuccino/core/integrations/vim_sneak.lua rename to lua/catppuccin/core/integrations/vim_sneak.lua diff --git a/lua/katppuccino/core/integrations/which_key.lua b/lua/catppuccin/core/integrations/which_key.lua similarity index 100% rename from lua/katppuccino/core/integrations/which_key.lua rename to lua/catppuccin/core/integrations/which_key.lua diff --git a/lua/katppuccino/core/mapper.lua b/lua/catppuccin/core/mapper.lua similarity index 100% rename from lua/katppuccino/core/mapper.lua rename to lua/catppuccin/core/mapper.lua diff --git a/lua/katppuccino/core/remaps.lua b/lua/catppuccin/core/remaps.lua similarity index 100% rename from lua/katppuccino/core/remaps.lua rename to lua/catppuccin/core/remaps.lua diff --git a/lua/catppuccin/init.lua b/lua/catppuccin/init.lua new file mode 100644 index 0000000..24ac335 --- /dev/null +++ b/lua/catppuccin/init.lua @@ -0,0 +1,16 @@ +local M = {} + +function M.load() + require("catppucin.main").main("load") +end + +function M.remap(hi_groups) + hi_groups = hi_groups or {} + require("catppucin.core.remaps").set_hig_remaps(hi_groups) +end + +function M.setup(custom_opts) + require("catppucin.config").set_options(custom_opts) +end + +return M diff --git a/lua/catppuccin/main.lua b/lua/catppuccin/main.lua new file mode 100644 index 0000000..44433fe --- /dev/null +++ b/lua/catppuccin/main.lua @@ -0,0 +1,37 @@ +local M = {} + +local utils = require("catppucin.utils.util") + +local function load() + local catppucin = require("catppucin") + + if catppucin.before_loading ~= nil then + catppucin.before_loading() + end + + -- colorscheme gets evaluated from mapper.lua + local theme = require("catppucin.core.mapper").apply() + utils.load(theme) + + if catppucin.after_loading ~= nil then + catppucin.after_loading() + end +end + +local function clear() + vim.cmd("hi clear") +end + +function M.main(option) + option = option or "load" + + if option == "load" then + load() + elseif option == "clear" then + clear() + else + print("catppucin: option was not recognized") + end +end + +return M diff --git a/lua/katppuccino/utils/colors.lua b/lua/catppuccin/utils/colors.lua similarity index 100% rename from lua/katppuccino/utils/colors.lua rename to lua/catppuccin/utils/colors.lua diff --git a/lua/katppuccino/utils/hsluv.lua b/lua/catppuccin/utils/hsluv.lua similarity index 100% rename from lua/katppuccino/utils/hsluv.lua rename to lua/catppuccin/utils/hsluv.lua diff --git a/lua/katppuccino/utils/util.lua b/lua/catppuccin/utils/util.lua similarity index 100% rename from lua/katppuccino/utils/util.lua rename to lua/catppuccin/utils/util.lua diff --git a/lua/katppuccino/init.lua b/lua/katppuccino/init.lua deleted file mode 100644 index 98ff05c..0000000 --- a/lua/katppuccino/init.lua +++ /dev/null @@ -1,16 +0,0 @@ -local M = {} - -function M.load() - require("katppuccino.main").main("load") -end - -function M.remap(hi_groups) - hi_groups = hi_groups or {} - require("katppuccino.core.remaps").set_hig_remaps(hi_groups) -end - -function M.setup(custom_opts) - require("katppuccino.config").set_options(custom_opts) -end - -return M diff --git a/lua/katppuccino/main.lua b/lua/katppuccino/main.lua deleted file mode 100644 index b952bff..0000000 --- a/lua/katppuccino/main.lua +++ /dev/null @@ -1,37 +0,0 @@ -local M = {} - -local utils = require("katppuccino.utils.util") - -local function load() - local katppuccino = require("katppuccino") - - if katppuccino.before_loading ~= nil then - katppuccino.before_loading() - end - - -- colorscheme gets evaluated from mapper.lua - local theme = require("katppuccino.core.mapper").apply() - utils.load(theme) - - if katppuccino.after_loading ~= nil then - katppuccino.after_loading() - end -end - -local function clear() - vim.cmd("hi clear") -end - -function M.main(option) - option = option or "load" - - if option == "load" then - load() - elseif option == "clear" then - clear() - else - print("katppuccino: option was not recognized") - end -end - -return M