From 7f1fea5a8c2b83f95e539438ddca9894e6db4fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= Date: Sat, 16 May 2026 13:00:37 +0200 Subject: [PATCH] kakoune: four-colors: use evaluate-commands --- .../.config/kak/colors/four-colors-dark.kak | 201 +++++++++--------- .../.config/kak/colors/four-colors-light.kak | 201 +++++++++--------- 2 files changed, 198 insertions(+), 204 deletions(-) diff --git a/kakoune/.config/kak/colors/four-colors-dark.kak b/kakoune/.config/kak/colors/four-colors-dark.kak index b97ea25..bcb5c2a 100644 --- a/kakoune/.config/kak/colors/four-colors-dark.kak +++ b/kakoune/.config/kak/colors/four-colors-dark.kak @@ -1,122 +1,119 @@ -# Four Colors Dark +# Four colors dark theme -declare-option str bg "272117" -declare-option str bgmenu "282e38" -declare-option str fg "a29e98" -declare-option str gray "58666d" +evaluate-commands %sh{ + bg="rgb:272117" + bgmenu="rgb:282e38" + fg="rgb:a29e98" + gray="rgb:58666d" -declare-option str yellow1 "dcb46e" -declare-option str yellow2 "af8842" -declare-option str yellow3 "845f10" + yellow1="rgb:dcb46e" + yellow2="rgb:af8842" + yellow3="rgb:845f10" -declare-option str green1 "73d0b1" -declare-option str green2 "44a386" -declare-option str green3 "04785d" + green1="rgb:73d0b1" + green2="rgb:44a386" + green3="rgb:04785d" -declare-option str blue1 "95bcfb" -declare-option str blue2 "6b90cc" -declare-option str blue3 "43669f" + blue1="rgb:95bcfb" + blue2="rgb:6b90cc" + blue3="rgb:43669f" -declare-option str pink1 "eca0c4" -declare-option str pink2 "bd7598" -declare-option str pink3 "904c6e" + pink1="rgb:eca0c4" + pink2="rgb:bd7598" + pink3="rgb:904c6e" -## CODE + echo " + ## CODE -set-face global value "rgb:%opt{pink1}" -set-face global type "rgb:%opt{green2}" -set-face global variable "rgb:%opt{yellow3}" -set-face global module "rgb:%opt{pink3}" -set-face global function "rgb:%opt{blue2}" -set-face global string "rgb:%opt{yellow2}" -set-face global keyword "rgb:%opt{blue1}" -set-face global operator "rgb:%opt{pink2}" -set-face global attribute "rgb:%opt{green1}" -set-face global comment "rgb:%opt{green3}" -set-face global documentation "rgb:%opt{green3}" -set-face global meta "rgb:%opt{blue3}" -set-face global builtin "rgb:%opt{green2}" + set-face global value $pink1 + set-face global type $green2 + set-face global variable $yellow3 + set-face global module $pink3 + set-face global function $blue2 + set-face global string $yellow2 + set-face global keyword $blue1 + set-face global operator $pink2 + set-face global attribute $green1 + set-face global comment $green3 + set-face global documentation $green3 + set-face global meta $blue3 + set-face global builtin $green2 -## MARKUP + ## MARKUP -set-face global title "rgb:%opt{pink3}" -set-face global header "rgb:%opt{pink2}" -set-face global mono "rgb:%opt{yellow2}" -set-face global block "rgb:%opt{blue2}" -set-face global link "rgb:%opt{blue1}" -set-face global bullet "rgb:%opt{pink1}" -set-face global list "rgb:%opt{pink1}" + set-face global title $pink3 + set-face global header $pink2 + set-face global mono $yellow2 + set-face global block $blue2 + set-face global link $blue1 + set-face global bullet $pink1 + set-face global list $pink1 -## BUILTIN + ## BUILTIN -set-face global Default "rgb:%opt{fg},rgb:%opt{bg}" -set-face global PrimarySelection "rgb:%opt{bg},rgb:%opt{green3}" -set-face global SecondarySelection "rgb:%opt{bg},rgb:%opt{blue3}" -set-face global PrimaryCursor "rgb:%opt{bg},rgb:%opt{green1}" -set-face global SecondaryCursor "rgb:%opt{bg},rgb:%opt{blue1}" -set-face global PrimaryCursorEol "rgb:%opt{bg},rgb:%opt{pink1}" -set-face global SecondaryCursorEol "rgb:%opt{bg},rgb:%opt{yellow1}" -set-face global MenuForeground "rgb:%opt{green1},rgb:%opt{green3}" -set-face global MenuBackground "rgb:%opt{fg},rgb:%opt{bgmenu}" -set-face global MenuInfo "rgb:%opt{green2}" -set-face global Information "rgb:%opt{fg},rgb:%opt{bgmenu}" -set-face global InlineInformation "rgb:%opt{blue2},rgb:%opt{bgmenu}" -set-face global Error "rgb:%opt{pink2}" -set-face global DiagnosticError "default,default,rgb:%opt{pink2}+c" -set-face global DiagnosticWarning "default,default,rgb:%opt{yellow2}+c" -set-face global StatusLine "rgb:%opt{fg},rgb:%opt{bgmenu}" -#}" -set-face global StatusLineMode "rgb:%opt{green2}" -set-face global StatusLineInfo "rgb:%opt{yellow2}" -set-face global StatusLineValue "rgb:%opt{blue2}" -set-face global StatusCursor "rgb:%opt{bg},rgb:%opt{green1}" -set-face global Prompt "rgb:%opt{blue3}" -set-face global BufferPadding "rgb:%opt{bg},rgb:%opt{bg}" + set-face global Default $fg,$bg + set-face global PrimarySelection $bg,$green3 + set-face global SecondarySelection $bg,$blue3 + set-face global PrimaryCursor $bg,$green1 + set-face global SecondaryCursor $bg,$blue1 + set-face global PrimaryCursorEol $bg,$pink1 + set-face global SecondaryCursorEol $bg,$yellow1 + set-face global MenuForeground $green1,$green3 + set-face global MenuBackground $fg,$bgmenu + set-face global MenuInfo $green2 + set-face global Information $fg,$bgmenu + set-face global InlineInformation $blue2,$bgmenu + set-face global Error $pink2 + set-face global DiagnosticError default,default,$pink2+c + set-face global DiagnosticWarning default,default,$yellow2+c + set-face global StatusLine $fg,$bgmenu + set-face global StatusLineMode $green2 + set-face global StatusLineInfo $yellow2 + set-face global StatusLineValue $blue2 + set-face global StatusCursor $bg,$green1 + set-face global Prompt $blue3 + set-face global BufferPadding $bg,$bg -# Built-in highlighter faces + # Built-in highlighter faces -set-face global LineNumbers "rgb:%opt{blue3}" -set-face global LineNumberCursor "rgb:%opt{blue3}" -set-face global LineNumbersWrapped "rgb:%opt{bg},rgb:%opt{bg}" -set-face global MatchingChar "rgb:%opt{yellow1}" -set-face global Whitespace "rgb:%opt{gray}" -set-face global WhitespaceIndent "rgb:%opt{gray}" -set-face global WrapMarker "rgb:%opt{yellow1}" + set-face global LineNumbers $blue3 + set-face global LineNumberCursor $blue3 + set-face global LineNumbersWrapped $bg,$bg + set-face global MatchingChar $yellow1 + set-face global Whitespace $gray + set-face global WhitespaceIndent $gray + set-face global WrapMarker $yellow1 -# PLUGINS + # PLUGINS -# kak-lsp + # kak-lsp -set-face global InfoDefault "default" -set-face global InfoBlock "rgb:%opt{green2}" -set-face global InfoBlockQuote "rgb:%opt{yellow2}" -set-face global InfoBullet "rgb:%opt{pink1}" -set-face global InfoHeader "rgb:%opt{pink3}" -set-face global InfoLink "rgb:%opt{blue1}" -set-face global InfoLinkMono "rgb:%opt{blue2}" + set-face global InfoDefault default + set-face global InfoBlock $green2 + set-face global InfoBlockQuote $yellow2 + set-face global InfoBullet $pink1 + set-face global InfoHeader $pink3 + set-face global InfoLink $blue1 + set-face global InfoLinkMono $blue2 -set-face global InfoMono "rgb:%opt{blue2}" -set-face global InfoRule "rgb:%opt{yellow2}" -set-face global InfoDiagnosticError "rgb:%opt{pink2}" -set-face global InfoDiagnosticHint "rgb:%opt{blue2}" -set-face global InfoDiagnosticInformation "rgb:%opt{green2}" -set-face global InfoDiagnosticWarning "rgb:%opt{yellow2}" + set-face global InfoMono $blue2 + set-face global InfoRule $yellow2 + set-face global InfoDiagnosticError $pink2 + set-face global InfoDiagnosticHint $blue2 + set-face global InfoDiagnosticInformation $green2 + set-face global InfoDiagnosticWarning $yellow2 -set-face global LineFlagError "rgb:%opt{pink2}" -set-face global LineFlagHint "rgb:%opt{blue2}" -set-face global LineFlagInfo "rgb:%opt{green2}" -set-face global LineFlagWarning "rgb:%opt{yellow2}" + set-face global LineFlagError $pink2 + set-face global LineFlagHint $blue2 + set-face global LineFlagInfo $green2 + set-face global LineFlagWarning $yellow2 -set-face global InlayDiagnosticError "rgb:%opt{pink2}" -set-face global InlayDiagnosticHint "rgb:%opt{blue2}" -set-face global InlayDiagnosticInfo "rgb:%opt{green2}" -set-face global InlayDiagnosticWarning "rgb:%opt{yellow2}" + set-face global InlayDiagnosticError $pink2 + set-face global InlayDiagnosticHint $blue2 + set-face global InlayDiagnosticInfo $green2 + set-face global InlayDiagnosticWarning $yellow2 -set-face global LineFlagError "rgb:%opt{pink2}" -set-face global LineFlagHint "rgb:%opt{blue2}" -set-face global LineFlagInfo "rgb:%opt{green2}" -set-face global LineFlagWarning "rgb:%opt{yellow2}" - - -set-face global SnippetsNextPlaceholders "rgb:%opt{bg},rgb:%opt{green2}" -set-face global SnippetsOtherPlaceholders "rgb:%opt{bg},rgb:%opt{yellow2}" + set-face global SnippetsNextPlaceholders $bg,$green2 + set-face global SnippetsOtherPlaceholders $bg,$yellow2 + " +} diff --git a/kakoune/.config/kak/colors/four-colors-light.kak b/kakoune/.config/kak/colors/four-colors-light.kak index 751699c..74a54f0 100644 --- a/kakoune/.config/kak/colors/four-colors-light.kak +++ b/kakoune/.config/kak/colors/four-colors-light.kak @@ -1,122 +1,119 @@ -# Four Colors Light +# Four colors light theme -declare-option str bg "faf8f5" -declare-option str bgmenu "f6ede0" -declare-option str fg "696257" -declare-option str gray "58666d" +evaluate-commands %sh{ + bg="rgb:faf8f5" + bgmenu="rgb:f6ede0" + fg="rgb:696257" + gray="rgb:58666d" -declare-option str yellow1 "dcb46e" -declare-option str yellow2 "af8842" -declare-option str yellow3 "845f10" + yellow1="rgb:dcb46e" + yellow2="rgb:af8842" + yellow3="rgb:845f10" -declare-option str green1 "73d0b1" -declare-option str green2 "44a386" -declare-option str green3 "04785d" + green1="rgb:73d0b1" + green2="rgb:44a386" + green3="rgb:04785d" -declare-option str blue1 "95bcfb" -declare-option str blue2 "6b90cc" -declare-option str blue3 "43669f" + blue1="rgb:95bcfb" + blue2="rgb:6b90cc" + blue3="rgb:43669f" -declare-option str pink1 "eca0c4" -declare-option str pink2 "bd7598" -declare-option str pink3 "904c6e" + pink1="rgb:eca0c4" + pink2="rgb:bd7598" + pink3="rgb:904c6e" -## CODE + echo " + ## CODE -set-face global value "rgb:%opt{pink1}" -set-face global type "rgb:%opt{green2}" -set-face global variable "rgb:%opt{yellow3}" -set-face global module "rgb:%opt{pink3}" -set-face global function "rgb:%opt{blue2}" -set-face global string "rgb:%opt{yellow2}" -set-face global keyword "rgb:%opt{blue1}" -set-face global operator "rgb:%opt{pink2}" -set-face global attribute "rgb:%opt{green1}" -set-face global comment "rgb:%opt{green3}" -set-face global documentation "rgb:%opt{green3}" -set-face global meta "rgb:%opt{blue3}" -set-face global builtin "rgb:%opt{green2}" + set-face global value $pink1 + set-face global type $green2 + set-face global variable $yellow3 + set-face global module $pink3 + set-face global function $blue2 + set-face global string $yellow2 + set-face global keyword $blue1 + set-face global operator $pink2 + set-face global attribute $green1 + set-face global comment $green3 + set-face global documentation $green3 + set-face global meta $blue3 + set-face global builtin $green2 -## MARKUP + ## MARKUP -set-face global title "rgb:%opt{pink3}" -set-face global header "rgb:%opt{pink2}" -set-face global mono "rgb:%opt{yellow2}" -set-face global block "rgb:%opt{blue2}" -set-face global link "rgb:%opt{blue1}" -set-face global bullet "rgb:%opt{pink1}" -set-face global list "rgb:%opt{pink1}" + set-face global title $pink3 + set-face global header $pink2 + set-face global mono $yellow2 + set-face global block $blue2 + set-face global link $blue1 + set-face global bullet $pink1 + set-face global list $pink1 -## BUILTIN + ## BUILTIN -set-face global Default "rgb:%opt{fg},rgb:%opt{bg}" -set-face global PrimarySelection "rgb:%opt{bg},rgb:%opt{green3}" -set-face global SecondarySelection "rgb:%opt{bg},rgb:%opt{blue3}" -set-face global PrimaryCursor "rgb:%opt{bg},rgb:%opt{green1}" -set-face global SecondaryCursor "rgb:%opt{bg},rgb:%opt{blue1}" -set-face global PrimaryCursorEol "rgb:%opt{bg},rgb:%opt{pink1}" -set-face global SecondaryCursorEol "rgb:%opt{bg},rgb:%opt{yellow1}" -set-face global MenuForeground "rgb:%opt{green1},rgb:%opt{green3}" -set-face global MenuBackground "rgb:%opt{fg},rgb:%opt{bgmenu}" -set-face global MenuInfo "rgb:%opt{green2}" -set-face global Information "rgb:%opt{fg},rgb:%opt{bgmenu}" -set-face global InlineInformation "rgb:%opt{blue2},rgb:%opt{bgmenu}" -set-face global Error "rgb:%opt{pink2}" -set-face global DiagnosticError "default,default,rgb:%opt{pink2}+c" -set-face global DiagnosticWarning "default,default,rgb:%opt{yellow2}+c" -set-face global StatusLine "rgb:%opt{fg},rgb:%opt{bgmenu}" -#}" -set-face global StatusLineMode "rgb:%opt{green2}" -set-face global StatusLineInfo "rgb:%opt{yellow2}" -set-face global StatusLineValue "rgb:%opt{blue2}" -set-face global StatusCursor "rgb:%opt{bg},rgb:%opt{green1}" -set-face global Prompt "rgb:%opt{blue3}" -set-face global BufferPadding "rgb:%opt{bg},rgb:%opt{bg}" + set-face global Default $fg,$bg + set-face global PrimarySelection $bg,$green3 + set-face global SecondarySelection $bg,$blue3 + set-face global PrimaryCursor $bg,$green1 + set-face global SecondaryCursor $bg,$blue1 + set-face global PrimaryCursorEol $bg,$pink1 + set-face global SecondaryCursorEol $bg,$yellow1 + set-face global MenuForeground $green1,$green3 + set-face global MenuBackground $fg,$bgmenu + set-face global MenuInfo $green2 + set-face global Information $fg,$bgmenu + set-face global InlineInformation $blue2,$bgmenu + set-face global Error $pink2 + set-face global DiagnosticError default,default,$pink2+c + set-face global DiagnosticWarning default,default,$yellow2+c + set-face global StatusLine $fg,$bgmenu + set-face global StatusLineMode $green2 + set-face global StatusLineInfo $yellow2 + set-face global StatusLineValue $blue2 + set-face global StatusCursor $bg,$green1 + set-face global Prompt $blue3 + set-face global BufferPadding $bg,$bg -# Built-in highlighter faces + # Built-in highlighter faces -set-face global LineNumbers "rgb:%opt{blue3}" -set-face global LineNumberCursor "rgb:%opt{blue3}" -set-face global LineNumbersWrapped "rgb:%opt{bg},rgb:%opt{bg}" -set-face global MatchingChar "rgb:%opt{yellow1}" -set-face global Whitespace "rgb:%opt{gray}" -set-face global WhitespaceIndent "rgb:%opt{gray}" -set-face global WrapMarker "rgb:%opt{yellow1}" + set-face global LineNumbers $blue3 + set-face global LineNumberCursor $blue3 + set-face global LineNumbersWrapped $bg,$bg + set-face global MatchingChar $yellow1 + set-face global Whitespace $gray + set-face global WhitespaceIndent $gray + set-face global WrapMarker $yellow1 -# PLUGINS + # PLUGINS -# kak-lsp + # kak-lsp -set-face global InfoDefault "default" -set-face global InfoBlock "rgb:%opt{green2}" -set-face global InfoBlockQuote "rgb:%opt{yellow2}" -set-face global InfoBullet "rgb:%opt{pink1}" -set-face global InfoHeader "rgb:%opt{pink3}" -set-face global InfoLink "rgb:%opt{blue1}" -set-face global InfoLinkMono "rgb:%opt{blue2}" + set-face global InfoDefault default + set-face global InfoBlock $green2 + set-face global InfoBlockQuote $yellow2 + set-face global InfoBullet $pink1 + set-face global InfoHeader $pink3 + set-face global InfoLink $blue1 + set-face global InfoLinkMono $blue2 -set-face global InfoMono "rgb:%opt{blue2}" -set-face global InfoRule "rgb:%opt{yellow2}" -set-face global InfoDiagnosticError "rgb:%opt{pink2}" -set-face global InfoDiagnosticHint "rgb:%opt{blue2}" -set-face global InfoDiagnosticInformation "rgb:%opt{green2}" -set-face global InfoDiagnosticWarning "rgb:%opt{yellow2}" + set-face global InfoMono $blue2 + set-face global InfoRule $yellow2 + set-face global InfoDiagnosticError $pink2 + set-face global InfoDiagnosticHint $blue2 + set-face global InfoDiagnosticInformation $green2 + set-face global InfoDiagnosticWarning $yellow2 -set-face global LineFlagError "rgb:%opt{pink2}" -set-face global LineFlagHint "rgb:%opt{blue2}" -set-face global LineFlagInfo "rgb:%opt{green2}" -set-face global LineFlagWarning "rgb:%opt{yellow2}" + set-face global LineFlagError $pink2 + set-face global LineFlagHint $blue2 + set-face global LineFlagInfo $green2 + set-face global LineFlagWarning $yellow2 -set-face global InlayDiagnosticError "rgb:%opt{pink2}" -set-face global InlayDiagnosticHint "rgb:%opt{blue2}" -set-face global InlayDiagnosticInfo "rgb:%opt{green2}" -set-face global InlayDiagnosticWarning "rgb:%opt{yellow2}" + set-face global InlayDiagnosticError $pink2 + set-face global InlayDiagnosticHint $blue2 + set-face global InlayDiagnosticInfo $green2 + set-face global InlayDiagnosticWarning $yellow2 -set-face global LineFlagError "rgb:%opt{pink2}" -set-face global LineFlagHint "rgb:%opt{blue2}" -set-face global LineFlagInfo "rgb:%opt{green2}" -set-face global LineFlagWarning "rgb:%opt{yellow2}" - - -set-face global SnippetsNextPlaceholders "rgb:%opt{bg},rgb:%opt{green2}" -set-face global SnippetsOtherPlaceholders "rgb:%opt{bg},rgb:%opt{yellow2}" + set-face global SnippetsNextPlaceholders $bg,$green2 + set-face global SnippetsOtherPlaceholders $bg,$yellow2 + " +}