From b7708e58e26de8a6b672264f28381ac74f1bf53e Mon Sep 17 00:00:00 2001
From: Pocco81 <pocco451@gmail.com>
Date: Fri, 22 Apr 2022 17:11:02 -0500
Subject: [PATCH] refactor: colors + addition of ctp noon

---
 lua/catppuccin/core/mapper.lua         |  3 ++-
 lua/catppuccin/core/palettes/dusk.lua  | 12 +++++------
 lua/catppuccin/core/palettes/init.lua  |  2 +-
 lua/catppuccin/core/palettes/noon.lua  | 28 ++++++++++++++++++++++++++
 lua/catppuccin/core/palettes/storm.lua | 16 +++++++--------
 5 files changed, 45 insertions(+), 16 deletions(-)
 create mode 100644 lua/catppuccin/core/palettes/noon.lua

diff --git a/lua/catppuccin/core/mapper.lua b/lua/catppuccin/core/mapper.lua
index 83349ca..6ab1213 100644
--- a/lua/catppuccin/core/mapper.lua
+++ b/lua/catppuccin/core/mapper.lua
@@ -1,4 +1,5 @@
 local colors_util = require("catppuccin.utils.colors")
+local util = require("catppuccin.utils.util")
 local cp
 
 local M = {}
@@ -27,7 +28,7 @@ local function get_base()
 		lCursor = { fg = cp.black2, bg = cp.white }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
 		CursorIM = { fg = cp.black2, bg = cp.white }, -- like Cursor, but used when in IME mode |CursorIM|
 		CursorColumn = { bg = cp.black1 }, -- Screen-column at the cursor, when 'cursorcolumn' is secp.
-		CursorLine = { bg = colors_util.vary_color({dawn = cp.black1}, cp.black3) }, -- Screen-line at the cursor, when 'cursorline' is secp.  Low-priority if foreground (ctermfg OR guifg) is not secp.
+		CursorLine = { bg = colors_util.vary_color({dawn = cp.black1}, util.darken(cp.black3, 0.64, cp.black2)) }, -- Screen-line at the cursor, when 'cursorline' is secp.  Low-priority if foreground (ctermfg OR guifg) is not secp.
 		Directory = { fg = cp.blue }, -- directory names (and other special names in listings)
 		EndOfBuffer = { fg = cp.black2 }, -- filler lines (~) after the end of the buffer.  By default, this is highlighted like |hl-NonText|.
 		ErrorMsg = { fg = cp.red, style = "bold,italic" }, -- error messages on the command line
diff --git a/lua/catppuccin/core/palettes/dusk.lua b/lua/catppuccin/core/palettes/dusk.lua
index 6d56528..4f1e92d 100644
--- a/lua/catppuccin/core/palettes/dusk.lua
+++ b/lua/catppuccin/core/palettes/dusk.lua
@@ -14,12 +14,12 @@ local color_palette = {
 	sapphire = "#74C7EC",
 	lavender = "#B4BEFE",
 	white = "#C6D0F5",
-	gray2 = "#ADB5D8",
-	gray1 = "#959BBA",
-	gray0 = "#7C809D",
-	black5 = "#63657F",
-	black4 = "#4B4B62",
-	black3 = "#323044",
+	gray2 = "#AEB7D9",
+	gray1 = "#969DBC",
+	gray0 = "#7E84A0",
+	black5 = "#666A83",
+	black4 = "#4E5167",
+	black3 = "#36374A",
 	black2 = "#1E1E2E",
 	black1 = "#181825",
 	black0 = "#101019",
diff --git a/lua/catppuccin/core/palettes/init.lua b/lua/catppuccin/core/palettes/init.lua
index 71bd5b2..797a0f8 100644
--- a/lua/catppuccin/core/palettes/init.lua
+++ b/lua/catppuccin/core/palettes/init.lua
@@ -3,7 +3,7 @@ local M = {}
 function M.get_palette()
 	local flvr = vim.g.catppuccin_flavour
 
-	if flvr == "dusk" or flvr == "dawn" or flvr == "storm" then
+	if flvr == "dusk" or flvr == "dawn" or flvr == "storm" or flvr == "noon" then
 		return require("catppuccin.core.palettes." .. flvr)
 	end
 	return require("catppuccin.core.palettes.dusk")
diff --git a/lua/catppuccin/core/palettes/noon.lua b/lua/catppuccin/core/palettes/noon.lua
new file mode 100644
index 0000000..5936111
--- /dev/null
+++ b/lua/catppuccin/core/palettes/noon.lua
@@ -0,0 +1,28 @@
+local color_palette = {
+	rosewater = "#F5E0DC", -- not ready
+	flamingo = "#F2CDCD",
+	pink = "#F5C2E7",
+	mauve = "#CB9DDF",			-- g +
+	red = "#E78284",			-- g +?
+	maroon = "#EA999C",			-- g
+	peach = "#EE9E76",			-- g +
+	yellow = "#E1C38A",			-- g +
+	green = "#A9CA87",			-- g +
+	teal = "#81C8BE",			-- g +
+	sky = "#99D1DB",			-- g? +
+	blue = "#90AAE9",			-- g +?
+	sapphire = "#85C1DC", -- gotta tweak this one
+	lavender = "#BFB7E4",		-- g
+	white = "#C6CEEF",			-- g
+	gray2 = "#B1B8D7",
+	gray1 = "#9BA2BF",
+	gray0 = "#868CA7",
+	black5 = "#707590",
+	black4 = "#5B5F78", --
+	black3 = "#454960", -- 
+	black2 = "#303348", --
+	black1 = "#252737",
+	black0 = "#181A25",
+}
+
+return color_palette
diff --git a/lua/catppuccin/core/palettes/storm.lua b/lua/catppuccin/core/palettes/storm.lua
index 56658d9..5241ef1 100644
--- a/lua/catppuccin/core/palettes/storm.lua
+++ b/lua/catppuccin/core/palettes/storm.lua
@@ -14,15 +14,15 @@ local color_palette = {
 	sapphire = "#34C3DC",
 	lavender = "#B8C1FE",
 	white = "#C5CFF5",
-	gray2 = "#A6AFD2",
-	gray1 = "#8289AA",
-	gray0 = "#5F6587",
-	black5 = "#4F5473",
-	black4 = "#3E435E",
-	black3 = "#2B3045",
+	gray2 = "#AEB7DA",
+	gray1 = "#979FC0",
+	gray0 = "#8087A5",
+	black5 = "#696F8A",
+	black4 = "#52576F",
+	black3 = "#3B3F55",
 	black2 = "#24273A",
-	black1 = "#1F2233",
-	black0 = "#1A1B26",
+	black1 = "#1F2232",
+	black0 = "#181926",
 }
 
 return color_palette