From f94234f30fbaa9d2bb8db47b21648ed6cd681e33 Mon Sep 17 00:00:00 2001
From: Pocco81 <pocco451@gmail.com>
Date: Fri, 5 Nov 2021 16:31:33 -0500
Subject: [PATCH] fix: plugin/ and colors/

---
 colors/catppuccin.vim                    |  3 ++
 colors/katppuccino.vim                   |  3 --
 lua/lightline/colorscheme/catppuccin.lua | 37 ++++++++++++++++++++++++
 lua/lualine/themes/catppuccin.lua        | 36 +++++++++++++++++++++++
 plugin/{ktpcmds.vim => ctpcmds.vim}      |  6 ++--
 5 files changed, 79 insertions(+), 6 deletions(-)
 create mode 100644 colors/catppuccin.vim
 delete mode 100644 colors/katppuccino.vim
 create mode 100644 lua/lightline/colorscheme/catppuccin.lua
 create mode 100644 lua/lualine/themes/catppuccin.lua
 rename plugin/{ktpcmds.vim => ctpcmds.vim} (64%)

diff --git a/colors/catppuccin.vim b/colors/catppuccin.vim
new file mode 100644
index 0000000..9b4a0ee
--- /dev/null
+++ b/colors/catppuccin.vim
@@ -0,0 +1,3 @@
+lua << EOF
+require('catppuccin').load()
+EOF
diff --git a/colors/katppuccino.vim b/colors/katppuccino.vim
deleted file mode 100644
index 7cb7db2..0000000
--- a/colors/katppuccino.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-lua << EOF
-require('katppuccino').load()
-EOF
diff --git a/lua/lightline/colorscheme/catppuccin.lua b/lua/lightline/colorscheme/catppuccin.lua
new file mode 100644
index 0000000..7cffd0c
--- /dev/null
+++ b/lua/lightline/colorscheme/catppuccin.lua
@@ -0,0 +1,37 @@
+local cp = require("catppuccin.core.color_palette")
+local catppuccin = {}
+
+catppuccin.normal = {
+	left = { { cp.catppuccin14, cp.catppuccin9 }, { cp.catppuccin9, cp.catppuccin1 } },
+	middle = { { cp.catppuccin9, cp.catppuccin12 } },
+	right = { { cp.catppuccin13, cp.catppuccin1 }, { cp.catppuccin9, cp.catppuccin1 } },
+	error = { { cp.catppuccin14, cp.catppuccin5 } },
+	warning = { { cp.catppuccin14, cp.catppuccin8 } },
+}
+
+catppuccin.insert = {
+	left = { { cp.catppuccin14, cp.catppuccin7 }, { cp.catppuccin9, cp.catppuccin1 } },
+}
+
+catppuccin.visual = {
+	left = { { cp.catppuccin14, cp.catppuccin3 }, { cp.catppuccin9, cp.catppuccin1 } },
+}
+
+catppuccin.replace = {
+	left = { { cp.catppuccin14, cp.catppuccin5 }, { cp.catppuccin9, cp.catppuccin1 } },
+}
+
+catppuccin.inactive = {
+	left = { { cp.catppuccin9, cp.catppuccin1 }, { cp.catppuccin11, cp.catppuccin1 } },
+	middle = { { cp.catppuccin12, cp.catppuccin1 } },
+	right = { { cp.catppuccin12, cp.catppuccin1 }, { cp.catppuccin11, cp.catppuccin1 } },
+}
+
+catppuccin.tabline = {
+	left = { { cp.catppuccin11, cp.catppuccin1 }, { cp.catppuccin11, cp.catppuccin1 } },
+	middle = { { cp.catppuccin12, cp.catppuccin1 } },
+	right = { { cp.catppuccin12, cp.catppuccin1 }, { cp.catppuccin11, cp.catppuccin1 } },
+	tabsel = { { cp.catppuccin9, cp.catppuccin12 }, { cp.catppuccin11, cp.catppuccin1 } },
+}
+
+return catppuccin
diff --git a/lua/lualine/themes/catppuccin.lua b/lua/lualine/themes/catppuccin.lua
new file mode 100644
index 0000000..36fdd6a
--- /dev/null
+++ b/lua/lualine/themes/catppuccin.lua
@@ -0,0 +1,36 @@
+local cp = require("catppuccin.core.color_palette")
+local catppuccin = {}
+
+catppuccin.normal = {
+	a = { bg = cp.catppuccin9, fg = cp.catppuccin14 },
+	b = { bg = cp.catppuccin12, fg = cp.catppuccin9 },
+	c = { bg = cp.catppuccin14, fg = cp.catppuccin13 },
+}
+
+catppuccin.insert = {
+	a = { bg = cp.catppuccin7, fg = cp.catppuccin14 },
+	b = { bg = cp.catppuccin12, fg = cp.catppuccin7 },
+}
+
+catppuccin.command = {
+	a = { bg = cp.catppuccin6, fg = cp.catppuccin14 },
+	b = { bg = cp.catppuccin12, fg = cp.catppuccin6 },
+}
+
+catppuccin.visual = {
+	a = { bg = cp.catppuccin3, fg = cp.catppuccin14 },
+	b = { bg = cp.catppuccin12, fg = cp.catppuccin3 },
+}
+
+catppuccin.replace = {
+	a = { bg = cp.catppuccin5, fg = cp.catppuccin14 },
+	b = { bg = cp.catppuccin12, fg = cp.catppuccin5 },
+}
+
+catppuccin.inactive = {
+	a = { bg = cp.catppuccin14, fg = cp.catppuccin9 },
+	b = { bg = cp.catppuccin14, fg = cp.catppuccin12, gui = "bold" },
+	c = { bg = cp.catppuccin14, fg = cp.catppuccin12 },
+}
+
+return catppuccin
diff --git a/plugin/ktpcmds.vim b/plugin/ctpcmds.vim
similarity index 64%
rename from plugin/ktpcmds.vim
rename to plugin/ctpcmds.vim
index 7fbd43c..a070964 100644
--- a/plugin/ktpcmds.vim
+++ b/plugin/ctpcmds.vim
@@ -1,17 +1,17 @@
 " GPL-3.0 License
 
 " prevent the plugin's interface from loading twice
-if exists('g:loaded_katppuccino') | finish | endif
+if exists('g:loaded_catppuccin') | 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'katppuccino.main'.main('clear')
+command! -nargs=0 CPClear call v:lua.require'catppuccin.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_katppuccino = 1
+let g:loaded_catppuccin = 1