From: Thomas Teixeira <thomas.teixeira@startmail.com>
Date: Thu, 2 Nov 2023 12:20:28 +0000 (+0100)
Subject: feat: getting rid of unnecessary _dim variables
X-Git-Url: https://git.ramnitz.eu/?a=commitdiff_plain;h=54907e9a9d5f6a99d970fca344dd54099b6ab099;p=dabruin.kak

feat: getting rid of unnecessary _dim variables

I figured some rules that you need to respect when applying dim option:
1. you cannot use revert
When you specify the revert option, the background is still merged, even with fg attributes.
This means that dim attribute gets through -> revert the value directly in the face definition.
2. You need to specify both foreground and background
If background is missing, even if you use a @base or you fg, the background default will be merged with the dim one.
---

diff --git a/dabruin.kak b/dabruin.kak
index 2c0a169..91fa81e 100644
--- a/dabruin.kak
+++ b/dabruin.kak
@@ -9,41 +9,37 @@ evaluate-commands %sh{
 	foreground='rgb:F5F5F5'
 	grey='rgb:B2BECA'
 	deep='rgb:3D4C59'
-	# Using	two	other colors instead of	dim	option because it bleeds through selection.
-	# Need to investigate further the issue
-	foreground_dim='rgb:767676'
-	accent_dim="${kak_opt_dabruin_accent_dim:-rgb:854E00}"
 	## code
 	cat	<<-COLORSCHEME
-		face global	value ${foreground_dim}+i
+		face global	value ${foreground},${background}+di
 		face global	type default+bu
 		face global	variable ${foreground}+i
 		face global	module default@string
-		face global	function ${accent_dim}+i
+		face global	function ${accent}+di
 		face global	string ${grey}+i
 		face global	keyword	${accent}
 		face global	operator ${foreground}
 		face global	attribute ${foreground}+i
 		face global	comment	${deep}
 		face global	documentation comment
-		face global	meta ${accent_dim}
+		face global	meta ${accent}+d
 		face global	builtin	default+i
 
 		face global	title ${accent}+bi
 		face global	header title
 		face global	mono string
 		face global	block mono
-		face global	link ${accent_dim}+u
-		face global	bullet ${foreground_dim}
+		face global	link ${accent}+ud
+		face global	bullet ${foreground}+d
 		face global	list bullet
 
 		face global	Default	${foreground},${background}
-		face global	PrimarySelection ${foreground}+rfg
-		face global	SecondarySelection ${grey}+rfg
-		face global	PrimaryCursor ${foreground},${background}+rfg
-		face global	SecondaryCursor	${grey},${background}+rfg
-		face global	PrimaryCursorEol default+dfg@PrimaryCursor
-		face global	SecondaryCursorEol default+dfg@SecondaryCursor
+		face global	PrimarySelection ${background},${accent}+fg
+		face global	SecondarySelection ${accent}+drfg
+		face global	PrimaryCursor ${background},${foreground}+fg
+		face global	SecondaryCursor	${foreground}+drfg
+		face global	PrimaryCursorEol ${grey}+r
+		face global	SecondaryCursorEol ${grey}+dr
 		face global	LineNumbers	${grey},${background}+d
 		face global	LineNumbersWrapped ${background},${background}
 		face global	LineNumberCursor ${foreground},${background}