Support dim_inactive with existing integrations

lua/catppuccin/core/integrations/bufferline.lua

@@ -1,29 +1,34 @@
 local M = {}
 
 function M.get(cp)
-  local transparent_background = require("catppuccin.config").options.transparent_background
+	local cnf = require("catppuccin.config").options
-  local bg_highlight = transparent_background and "NONE" or cp.base
+	local transparent_background = cnf.transparent_background
+	local dim_inactive = cnf.dim_inactive
+	local bg_highlight = (transparent_background and dim_inactive and cp.dim)
+		or (transparent_background and "NONE")
+		or (dim_inactive and cp.dim)
+		or cp.base
 
-  local inactive_bg = transparent_background and "NONE" or cp.mantle
+	local inactive_bg = transparent_background and "NONE" or cp.mantle
 
-  return {
+	return {
-    BufferLineFill = { bg = bg_highlight },
+		BufferLineFill = { bg = bg_highlight },
-    BufferLineBackcrust = { fg = cp.text, bg = inactive_bg }, -- others
+		BufferLineBackcrust = { fg = cp.text, bg = inactive_bg }, -- others
-    BufferLineBufferVisible = { fg = cp.surface1, bg = inactive_bg },
+		BufferLineBufferVisible = { fg = cp.surface1, bg = inactive_bg },
-    BufferLineBufferSelected = { fg = cp.text, bg = cp.base, style = "bold,italic" }, -- current
+		BufferLineBufferSelected = { fg = cp.text, bg = cp.base, style = "bold,italic" }, -- current
-    BufferLineTab = { fg = cp.surface1, bg = cp.base },
+		BufferLineTab = { fg = cp.surface1, bg = cp.base },
-    BufferLineTabSelected = { fg = cp.red, bg = cp.blue },
+		BufferLineTabSelected = { fg = cp.red, bg = cp.blue },
-    BufferLineTabClose = { fg = cp.red, bg = inactive_bg },
+		BufferLineTabClose = { fg = cp.red, bg = inactive_bg },
-    BufferLineIndicatorSelected = { fg = cp.peach, bg = cp.base },
+		BufferLineIndicatorSelected = { fg = cp.peach, bg = cp.base },
-    -- separators
+		-- separators
-    BufferLineSeparator = { fg = inactive_bg, bg = inactive_bg },
+		BufferLineSeparator = { fg = inactive_bg, bg = inactive_bg },
-    BufferLineSeparatorVisible = { fg = inactive_bg, bg = inactive_bg },
+		BufferLineSeparatorVisible = { fg = inactive_bg, bg = inactive_bg },
-    BufferLineSeparatorSelected = { fg = inactive_bg, bg = inactive_bg },
+		BufferLineSeparatorSelected = { fg = inactive_bg, bg = inactive_bg },
-    -- close buttons
+		-- close buttons
-    BufferLineCloseButton = { fg = cp.surface1, bg = inactive_bg },
+		BufferLineCloseButton = { fg = cp.surface1, bg = inactive_bg },
-    BufferLineCloseButtonVisible = { fg = cp.surface1, bg = inactive_bg },
+		BufferLineCloseButtonVisible = { fg = cp.surface1, bg = inactive_bg },
-    BufferLineCloseButtonSelected = { fg = cp.red, bg = cp.base },
+		BufferLineCloseButtonSelected = { fg = cp.red, bg = cp.base },
-  }
+	}
 end
 
 return M

lua/catppuccin/core/integrations/gitsigns.lua

@@ -1,10 +1,15 @@
 local M = {}
 
 function M.get(cp)
+	local cnf = require("catppuccin.config").options
+	local bg_highlight = (cnf.transparent_background and cnf.dim_inactive and cp.dim)
+		or (cnf.transparent_background and "NONE")
+		or (cnf.dim_inactive and cp.dim)
+		or cp.base
 	return {
-		GitSignsAdd = { fg = cp.green, bg = cnf.transparent_background and cp.none or cp.base }, -- diff mode: Added line |diff.txt|
+		GitSignsAdd = { fg = cp.green, bg = bg_highlight }, -- diff mode: Added line |diff.txt|
-		GitSignsChange = { fg = cp.yellow, bg = cnf.transparent_background and cp.none or cp.base }, -- diff mode: Changed line |diff.txt|
+		GitSignsChange = { fg = cp.yellow, bg = bg_highlight }, -- diff mode: Changed line |diff.txt|
-		GitSignsDelete = { fg = cp.red, bg = cnf.transparent_background and cp.none or cp.base }, -- diff mode: Deleted line |diff.txt|
+		GitSignsDelete = { fg = cp.red, bg = bg_highlight }, -- diff mode: Deleted line |diff.txt|
 	}
 end
 

lua/catppuccin/core/integrations/ts_rainbow.lua

@@ -1,16 +1,21 @@
 local M = {}
 
 function M.get(cp)
-	local transparent_background = require("catppuccin.config").options.transparent_background
+	local cnf = require("catppuccin.config").options
-	local bg_highlight = transparent_background and "NONE" or cp.base
+	local transparent_background = cnf.transparent_background
+	local dim_inactive = cnf.dim_inactive
+	local bg_highlight = (transparent_background and dim_inactive and cp.dim)
+		or (transparent_background and "NONE")
+		or (dim_inactive and cp.dim)
+		or cp.base
 	return {
-		rainbowcol1 = {bg = bg_highlight, fg = cp.red},
+		rainbowcol1 = { bg = bg_highlight, fg = cp.red },
-		rainbowcol2 = {bg = bg_highlight, fg = cp.teal},
+		rainbowcol2 = { bg = bg_highlight, fg = cp.teal },
-		rainbowcol3 = {bg = bg_highlight, fg = cp.yellow},
+		rainbowcol3 = { bg = bg_highlight, fg = cp.yellow },
-		rainbowcol4 = {bg = bg_highlight, fg = cp.blue},
+		rainbowcol4 = { bg = bg_highlight, fg = cp.blue },
-		rainbowcol5 = {bg = bg_highlight, fg = cp.pink},
+		rainbowcol5 = { bg = bg_highlight, fg = cp.pink },
-		rainbowcol6 = {bg = bg_highlight, fg = cp.flamingo},
+		rainbowcol6 = { bg = bg_highlight, fg = cp.flamingo },
-		rainbowcol7 = {bg = bg_highlight, fg = cp.green},
+		rainbowcol7 = { bg = bg_highlight, fg = cp.green },
 	}
 end