From 3682671de455205133e962fac45edcd3a62c4929 Mon Sep 17 00:00:00 2001
From: Pocco81 <pocco451@gmail.com>
Date: Mon, 11 Jul 2022 18:40:16 -0500
Subject: [PATCH] fix: dimming feature

---
 lua/catppuccin/config.lua                     |  2 +-
 lua/catppuccin/core/integrations/gitsigns.lua | 21 +++++++++----------
 lua/catppuccin/lib/ui.lua                     | 12 +++++++++--
 lua/catppuccin/utils/colors.lua               |  4 ++++
 plugin/catppuccin.vim                         |  3 +--
 plugin/ctpcmds.vim                            |  3 ---
 6 files changed, 26 insertions(+), 19 deletions(-)
 delete mode 100644 plugin/ctpcmds.vim

diff --git a/lua/catppuccin/config.lua b/lua/catppuccin/config.lua
index f0e0920..28aa31f 100644
--- a/lua/catppuccin/config.lua
+++ b/lua/catppuccin/config.lua
@@ -7,7 +7,7 @@ config.options = {
 	dim_inactive = {
 		enable = true,
 		shade = "dark",
-		percentage = 10
+		percentage = 0.15
 	},
 	styles = {
 		comments = "italic",
diff --git a/lua/catppuccin/core/integrations/gitsigns.lua b/lua/catppuccin/core/integrations/gitsigns.lua
index 1642107..90f48ff 100644
--- a/lua/catppuccin/core/integrations/gitsigns.lua
+++ b/lua/catppuccin/core/integrations/gitsigns.lua
@@ -1,16 +1,15 @@
 local M = {}
 
-function M.get(cp)
-	local cnf = require("catppuccin.config").options
-	local bg_highlight = (cnf.transparent_background and cnf.dim_inactive.enable and cp.dim)
-		or (cnf.transparent_background and "NONE")
-		or (cnf.dim_inactive.enable and cp.dim)
-		or cp.base
-	return {
-		GitSignsAdd = { fg = cp.green, bg = bg_highlight }, -- diff mode: Added line |diff.txt|
-		GitSignsChange = { fg = cp.yellow, bg = bg_highlight }, -- diff mode: Changed line |diff.txt|
-		GitSignsDelete = { fg = cp.red, bg = bg_highlight }, -- diff mode: Deleted line |diff.txt|
-	}
+local cp = require("catppuccin.core.palettes.init").get_palette()
+local cnf = require("catppuccin.config").options
+local dim_percentage = cnf.dim_inactive.percentage
+local ucolors = require("catppuccin.utils.colors")
+
+function M.dim()
+	if cnf.dim_inactive.shade == "dark" then
+		return ucolors.darken(cp.base, dim_percentage, cp.mantle)
+	end
+	return ucolors.lighten(cp.surface0, dim_percentage, cp.base)
 end
 
 return M
diff --git a/lua/catppuccin/lib/ui.lua b/lua/catppuccin/lib/ui.lua
index 90e1aeb..aa0ec6a 100644
--- a/lua/catppuccin/lib/ui.lua
+++ b/lua/catppuccin/lib/ui.lua
@@ -4,12 +4,20 @@ local cp = require("catppuccin.core.palettes.init").get_palette()
 local cnf = require("catppuccin.config").options
 local dim_percentage = cnf.dim_inactive.percentage
 local ucolors = require("catppuccin.utils.colors")
+local latte = require("catppuccin.core.palettes.latte")
 
 function M.dim()
 	if cnf.dim_inactive.shade == "dark" then
-		return ucolors.darken(cp.base, dim_percentage, cp.crust)
+		print(vim.g.catppuccin_flavour)
+		return ucolors.vary_color(
+			{ latte = ucolors.darken(latte.base, dim_percentage, latte.mantle) },
+			ucolors.darken(cp.base, dim_percentage, cp.mantle)
+		)
 	end
-	return ucolors.lighten(cp.base, dim_percentage, cp.surface0)
+		return ucolors.vary_color(
+			{ latte = ucolors.lighten("#FBFCFD", dim_percentage, latte.base) },
+			ucolors.lighten(cp.surface0, dim_percentage, cp.base)
+		)
 end
 
 return M
diff --git a/lua/catppuccin/utils/colors.lua b/lua/catppuccin/utils/colors.lua
index f067818..efe8901 100644
--- a/lua/catppuccin/utils/colors.lua
+++ b/lua/catppuccin/utils/colors.lua
@@ -2,6 +2,10 @@ local M = {}
 
 local hsluv = require("catppuccin.utils.hsluv")
 
+M.bg = "#000000"
+M.fg = "#ffffff"
+M.day_brightness = 0.3
+
 ---@param hex_str string hexadecimal value of a color
 local hex_to_rgb = function(hex_str)
 	local hex = "[abcdef0-9][abcdef0-9]"
diff --git a/plugin/catppuccin.vim b/plugin/catppuccin.vim
index 4951cd1..141b212 100644
--- a/plugin/catppuccin.vim
+++ b/plugin/catppuccin.vim
@@ -5,8 +5,7 @@ function! s:FlavourCompletion(...) abort
 endfunction
 
 function! s:ApplyFlavour(args) abort
-	let l:flavour = matchstr(a:args[0], "[a-z]*")
-	let g:catppuccin_flavour = flavour
+	let g:catppuccin_flavour = matchstr(a:args[0], "[a-z]*")
 	colorscheme catppuccin
 endfunction
 
diff --git a/plugin/ctpcmds.vim b/plugin/ctpcmds.vim
deleted file mode 100644
index 6d8e259..0000000
--- a/plugin/ctpcmds.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-if exists('g:loaded_catppuccin') | finish | endif
-
-let g:loaded_catppuccin = 1