From 2d328cc72fea4c85d906900a41fb6a6b7ce8e7a6 Mon Sep 17 00:00:00 2001
From: Pocco81 <pocco451@gmail.com>
Date: Sat, 21 Aug 2021 12:04:59 -0500
Subject: [PATCH] feat: light theme (Light Melya) + cleanup

---
 lua/catppuccino/color_schemes/catppuccino.lua |  1 -
 lua/catppuccino/color_schemes/light_melya.lua | 76 +++++++++++++++++++
 lua/catppuccino/color_schemes/neon_latte.lua  |  1 -
 .../core/integrations/bufferline.lua          |  2 +-
 lua/catppuccino/utils/util.lua                |  1 -
 5 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 lua/catppuccino/color_schemes/light_melya.lua

diff --git a/lua/catppuccino/color_schemes/catppuccino.lua b/lua/catppuccino/color_schemes/catppuccino.lua
index 80f3982..79fe3f4 100644
--- a/lua/catppuccino/color_schemes/catppuccino.lua
+++ b/lua/catppuccino/color_schemes/catppuccino.lua
@@ -1,5 +1,4 @@
 local util = require("catppuccino.utils.util")
-local opts = require("catppuccino.config").options
 
 local colors = {
     none = "NONE",
diff --git a/lua/catppuccino/color_schemes/light_melya.lua b/lua/catppuccino/color_schemes/light_melya.lua
new file mode 100644
index 0000000..d6430cf
--- /dev/null
+++ b/lua/catppuccino/color_schemes/light_melya.lua
@@ -0,0 +1,76 @@
+local util = require("catppuccino.utils.util")
+
+local colors = {
+    none = "NONE",
+    bg = "#fbfbfb", -- nvim bg
+    fg = "#0E171C", -- fg color (text)
+    fg_gutter = "#3b4261",
+    black = "#393b44",
+    gray = "#2a2e36",
+    red = "#B0304E",
+    green = "#76AB49",
+    yellow = "#FFCE1F",
+    blue = "#157C8E",
+    magenta = "#A414CC",
+    cyan = "#63cdcf",
+    white = "#dfdfe0",
+    orange = "#A414CC",
+    pink = "#D67AD2",
+    black_br = "#7f8c98",
+    red_bg = "#D84652",
+    green_br = "#58cd8b",
+    yellow_br = "#FFE37E",
+    blue_br = "#84CEE4",
+    magenta_br = "#B8A1E3",
+    cyan_br = "#59F0FF",
+    white_br = "#0E171C",
+    orange_br = "#F3843F",
+    pink_br = "#DF97DB",
+    comment = "#526175",
+    git = {
+        add = "#dfdfe0",
+        change = "#F4843E",
+        delete = "#e06c75",
+        conflict = "#FFE070",
+    }
+}
+
+util.bg = colors.bg
+colors.bg_alt = util.darken(colors.bg, 0.75, "#000000")
+colors.bg_highlight = util.darken(colors.bg, 0.85, "#000000")
+colors.fg_alt = util.darken(colors.fg, 0.80, "#000000")
+
+colors.diff = {
+    -- also used for gitsigns
+    add = util.darken(colors.blue, 0.50),
+    delete = util.darken(colors.red, 0.50),
+    change = util.darken(colors.yellow, 0.50),
+    text = colors.blue
+}
+
+colors.git.ignore = colors.black
+colors.black = util.darken(colors.bg, 0.8, "#000000")
+colors.border_highlight = colors.blue
+colors.border = colors.black
+
+-- Popups and statusline always get a dark background
+colors.bg_popup = colors.bg_alt
+colors.bg_statusline = colors.bg_alt
+
+-- Sidebar and Floats are configurable
+-- colors.bg_sidebar = config.darkSidebar and colors.bg_alt or colors.bg
+-- colors.bg_float = config.darkFloat and colors.bg_alt or colors.bg
+colors.bg_sidebar = colors.bg_alt
+colors.bg_float = colors.bg_alt
+
+colors.bg_visual = util.darken(colors.blue, 0.2)
+colors.bg_search = util.darken(colors.cyan, 0.3)
+colors.fg_sidebar = colors.fg_alt
+
+colors.error = colors.red_bg
+colors.warning = colors.yellow
+colors.info = colors.blue
+colors.hint = colors.white_br
+colors.variable = colors.white
+
+return colors
diff --git a/lua/catppuccino/color_schemes/neon_latte.lua b/lua/catppuccino/color_schemes/neon_latte.lua
index 5033a9f..d0b9022 100644
--- a/lua/catppuccino/color_schemes/neon_latte.lua
+++ b/lua/catppuccino/color_schemes/neon_latte.lua
@@ -1,5 +1,4 @@
 local util = require("catppuccino.utils.util")
-local opts = require("catppuccino.config").options
 
 local colors = {
     none = "NONE",
diff --git a/lua/catppuccino/core/integrations/bufferline.lua b/lua/catppuccino/core/integrations/bufferline.lua
index 31ee721..9b0c060 100644
--- a/lua/catppuccino/core/integrations/bufferline.lua
+++ b/lua/catppuccino/core/integrations/bufferline.lua
@@ -4,7 +4,7 @@ return {
     BufferLineFill = {bg = util.brighten(cpt.bg, 0.04)},
     BufferLineBackground = {fg = cpt.gray, bg = cpt.black},
     BufferLineBufferVisible = {fg = cpt.gray, bg = cpt.black},
-    BufferLineBufferSelected = {fg = cpt.white, bg = cpt.bg},
+    BufferLineBufferSelected = {fg = cpt.fg, bg = cpt.bg},
     BufferLineTab = {fg = cpt.gray, bg = cpt.bg},
     BufferLineTabSelected = {fg = cpt.red, bg = cpt.blue},
     BufferLineTabClose = {fg = cpt.red, bg = cpt.black},
diff --git a/lua/catppuccino/utils/util.lua b/lua/catppuccino/utils/util.lua
index 0433259..0932f13 100644
--- a/lua/catppuccino/utils/util.lua
+++ b/lua/catppuccino/utils/util.lua
@@ -1,5 +1,4 @@
 local hsluv = require("catppuccino.utils.hsluv")
-local opts = require("catppuccino.config").options
 
 local g = vim.g
 local o = vim.o