diff --git a/colors/catppuccino.vim b/colors/catppuccino.vim deleted file mode 100644 index 1f42425..0000000 --- a/colors/catppuccino.vim +++ /dev/null @@ -1,3 +0,0 @@ -lua << EOF -require('catppuccino').load() -EOF diff --git a/colors/katppuccino.vim b/colors/katppuccino.vim new file mode 100644 index 0000000..7cb7db2 --- /dev/null +++ b/colors/katppuccino.vim @@ -0,0 +1,3 @@ +lua << EOF +require('katppuccino').load() +EOF diff --git a/lua/catppuccino/init.lua b/lua/catppuccino/init.lua deleted file mode 100644 index f59a198..0000000 --- a/lua/catppuccino/init.lua +++ /dev/null @@ -1,16 +0,0 @@ -local M = {} - -function M.load() - require("catppuccino.main").main("load") -end - -function M.remap(hi_groups) - hi_groups = hi_groups or {} - require("catppuccino.core.remaps").set_hig_remaps(hi_groups) -end - -function M.setup(custom_opts) - require("catppuccino.config").set_options(custom_opts) -end - -return M diff --git a/lua/catppuccino/main.lua b/lua/catppuccino/main.lua deleted file mode 100644 index 4386aa1..0000000 --- a/lua/catppuccino/main.lua +++ /dev/null @@ -1,37 +0,0 @@ -local M = {} - -local utils = require("catppuccino.utils.util") - -local function load() - local catppuccino = require("catppuccino") - - if catppuccino.before_loading ~= nil then - catppuccino.before_loading() - end - - -- colorscheme gets evaluated from mapper.lua - local theme = require("catppuccino.core.mapper").apply() - utils.load(theme) - - if catppuccino.after_loading ~= nil then - catppuccino.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("Catppuccino: option was not recognized") - end -end - -return M diff --git a/lua/catppuccino/api/colors.lua b/lua/katppuccino/api/colors.lua similarity index 100% rename from lua/catppuccino/api/colors.lua rename to lua/katppuccino/api/colors.lua diff --git a/lua/catppuccino/config.lua b/lua/katppuccino/config.lua similarity index 100% rename from lua/catppuccino/config.lua rename to lua/katppuccino/config.lua diff --git a/lua/catppuccino/core/color_palette.lua b/lua/katppuccino/core/color_palette.lua similarity index 100% rename from lua/catppuccino/core/color_palette.lua rename to lua/katppuccino/core/color_palette.lua diff --git a/lua/catppuccino/core/integrations/barbar.lua b/lua/katppuccino/core/integrations/barbar.lua similarity index 100% rename from lua/catppuccino/core/integrations/barbar.lua rename to lua/katppuccino/core/integrations/barbar.lua diff --git a/lua/catppuccino/core/integrations/bufferline.lua b/lua/katppuccino/core/integrations/bufferline.lua similarity index 100% rename from lua/catppuccino/core/integrations/bufferline.lua rename to lua/katppuccino/core/integrations/bufferline.lua diff --git a/lua/catppuccino/core/integrations/cmp.lua b/lua/katppuccino/core/integrations/cmp.lua similarity index 100% rename from lua/catppuccino/core/integrations/cmp.lua rename to lua/katppuccino/core/integrations/cmp.lua diff --git a/lua/catppuccino/core/integrations/dashboard.lua b/lua/katppuccino/core/integrations/dashboard.lua similarity index 100% rename from lua/catppuccino/core/integrations/dashboard.lua rename to lua/katppuccino/core/integrations/dashboard.lua diff --git a/lua/catppuccino/core/integrations/fern.lua b/lua/katppuccino/core/integrations/fern.lua similarity index 100% rename from lua/catppuccino/core/integrations/fern.lua rename to lua/katppuccino/core/integrations/fern.lua diff --git a/lua/catppuccino/core/integrations/gitgutter.lua b/lua/katppuccino/core/integrations/gitgutter.lua similarity index 100% rename from lua/catppuccino/core/integrations/gitgutter.lua rename to lua/katppuccino/core/integrations/gitgutter.lua diff --git a/lua/catppuccino/core/integrations/gitsigns.lua b/lua/katppuccino/core/integrations/gitsigns.lua similarity index 100% rename from lua/catppuccino/core/integrations/gitsigns.lua rename to lua/katppuccino/core/integrations/gitsigns.lua diff --git a/lua/catppuccino/core/integrations/hop.lua b/lua/katppuccino/core/integrations/hop.lua similarity index 100% rename from lua/catppuccino/core/integrations/hop.lua rename to lua/katppuccino/core/integrations/hop.lua diff --git a/lua/catppuccino/core/integrations/indent_blankline.lua b/lua/katppuccino/core/integrations/indent_blankline.lua similarity index 100% rename from lua/catppuccino/core/integrations/indent_blankline.lua rename to lua/katppuccino/core/integrations/indent_blankline.lua diff --git a/lua/catppuccino/core/integrations/lightspeed.lua b/lua/katppuccino/core/integrations/lightspeed.lua similarity index 100% rename from lua/catppuccino/core/integrations/lightspeed.lua rename to lua/katppuccino/core/integrations/lightspeed.lua diff --git a/lua/catppuccino/core/integrations/lsp_saga.lua b/lua/katppuccino/core/integrations/lsp_saga.lua similarity index 100% rename from lua/catppuccino/core/integrations/lsp_saga.lua rename to lua/katppuccino/core/integrations/lsp_saga.lua diff --git a/lua/catppuccino/core/integrations/lsp_trouble.lua b/lua/katppuccino/core/integrations/lsp_trouble.lua similarity index 100% rename from lua/catppuccino/core/integrations/lsp_trouble.lua rename to lua/katppuccino/core/integrations/lsp_trouble.lua diff --git a/lua/catppuccino/core/integrations/markdown.lua b/lua/katppuccino/core/integrations/markdown.lua similarity index 100% rename from lua/catppuccino/core/integrations/markdown.lua rename to lua/katppuccino/core/integrations/markdown.lua diff --git a/lua/catppuccino/core/integrations/native_lsp.lua b/lua/katppuccino/core/integrations/native_lsp.lua similarity index 100% rename from lua/catppuccino/core/integrations/native_lsp.lua rename to lua/katppuccino/core/integrations/native_lsp.lua diff --git a/lua/catppuccino/core/integrations/neogit.lua b/lua/katppuccino/core/integrations/neogit.lua similarity index 100% rename from lua/catppuccino/core/integrations/neogit.lua rename to lua/katppuccino/core/integrations/neogit.lua diff --git a/lua/catppuccino/core/integrations/nvimtree.lua b/lua/katppuccino/core/integrations/nvimtree.lua similarity index 100% rename from lua/catppuccino/core/integrations/nvimtree.lua rename to lua/katppuccino/core/integrations/nvimtree.lua diff --git a/lua/catppuccino/core/integrations/telescope.lua b/lua/katppuccino/core/integrations/telescope.lua similarity index 100% rename from lua/catppuccino/core/integrations/telescope.lua rename to lua/katppuccino/core/integrations/telescope.lua diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/katppuccino/core/integrations/treesitter.lua similarity index 100% rename from lua/catppuccino/core/integrations/treesitter.lua rename to lua/katppuccino/core/integrations/treesitter.lua diff --git a/lua/catppuccino/core/integrations/ts_rainbow.lua b/lua/katppuccino/core/integrations/ts_rainbow.lua similarity index 100% rename from lua/catppuccino/core/integrations/ts_rainbow.lua rename to lua/katppuccino/core/integrations/ts_rainbow.lua diff --git a/lua/catppuccino/core/integrations/vim_sneak.lua b/lua/katppuccino/core/integrations/vim_sneak.lua similarity index 100% rename from lua/catppuccino/core/integrations/vim_sneak.lua rename to lua/katppuccino/core/integrations/vim_sneak.lua diff --git a/lua/catppuccino/core/integrations/which_key.lua b/lua/katppuccino/core/integrations/which_key.lua similarity index 100% rename from lua/catppuccino/core/integrations/which_key.lua rename to lua/katppuccino/core/integrations/which_key.lua diff --git a/lua/catppuccino/core/mapper.lua b/lua/katppuccino/core/mapper.lua similarity index 100% rename from lua/catppuccino/core/mapper.lua rename to lua/katppuccino/core/mapper.lua diff --git a/lua/catppuccino/core/remaps.lua b/lua/katppuccino/core/remaps.lua similarity index 100% rename from lua/catppuccino/core/remaps.lua rename to lua/katppuccino/core/remaps.lua diff --git a/lua/katppuccino/init.lua b/lua/katppuccino/init.lua new file mode 100644 index 0000000..98ff05c --- /dev/null +++ b/lua/katppuccino/init.lua @@ -0,0 +1,16 @@ +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 new file mode 100644 index 0000000..b952bff --- /dev/null +++ b/lua/katppuccino/main.lua @@ -0,0 +1,37 @@ +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 diff --git a/lua/catppuccino/utils/colors.lua b/lua/katppuccino/utils/colors.lua similarity index 100% rename from lua/catppuccino/utils/colors.lua rename to lua/katppuccino/utils/colors.lua diff --git a/lua/catppuccino/utils/hsluv.lua b/lua/katppuccino/utils/hsluv.lua similarity index 100% rename from lua/catppuccino/utils/hsluv.lua rename to lua/katppuccino/utils/hsluv.lua diff --git a/lua/catppuccino/utils/util.lua b/lua/katppuccino/utils/util.lua similarity index 96% rename from lua/catppuccino/utils/util.lua rename to lua/katppuccino/utils/util.lua index 307b313..31c3361 100644 --- a/lua/catppuccino/utils/util.lua +++ b/lua/katppuccino/utils/util.lua @@ -1,4 +1,4 @@ -local hsluv = require("catppuccino.utils.hsluv") +local hsluv = require("katppuccino.utils.hsluv") local g = vim.g local o = vim.o @@ -142,13 +142,13 @@ function util.load(theme) vim.cmd("syntax reset") end - g.colors_name = "catppuccino" + g.colors_name = "katppuccino" util.properties(theme.properties) util.syntax(theme.base) util.syntax(theme.integrations) - if require("catppuccino.config").options["term_colors"] then + if require("katppuccino.config").options["term_colors"] then util.terminal(theme.terminal) end end diff --git a/plugin/cpcmds.vim b/plugin/ktpcmds.vim similarity index 67% rename from plugin/cpcmds.vim rename to plugin/ktpcmds.vim index 37bf4a7..7fbd43c 100644 --- a/plugin/cpcmds.vim +++ b/plugin/ktpcmds.vim @@ -1,17 +1,17 @@ " GPL-3.0 License " prevent the plugin's interface from loading twice -if exists('g:loaded_catppuccino') | finish | endif +if exists('g:loaded_katppuccino') | finish | endif let s:save_cpo = &cpo " save user coptions set cpo&vim " reset them to defaults " Interface {{{ -command! -nargs=0 CPClear call v:lua.require'catppuccino.main'.main('clear') +command! -nargs=0 CPClear call v:lua.require'katppuccino.main'.main('clear') " }}} let &cpo = s:save_cpo " restore after unlet s:save_cpo " set to true the var that controls the plugin's loading -let g:loaded_catppuccino = 1 +let g:loaded_katppuccino = 1