From db589eae826cf56bf243cc70d469635c8e9cdc06 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 12 Feb 2024 17:44:03 +0800 Subject: [PATCH] users/foo-dogsquared/programs/nixvim: refactor lush.nvim template --- .../modules/programs/nixvim/colorschemes.nix | 503 +++++++++--------- 1 file changed, 255 insertions(+), 248 deletions(-) diff --git a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/colorschemes.nix b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/colorschemes.nix index 18273345..147ff0df 100644 --- a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/colorschemes.nix +++ b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/colorschemes.nix @@ -1,13 +1,20 @@ -{ config, lib, ... }: +{ config, lib, helpers, ... }: let + inherit (helpers) mkRaw; + initLushBase16 = acc: index: color: acc + '' local ${index} = hsluv('#${color}') ''; + + sym = query: ''sym("${query}")''; in { - colorscheme = "bark-on-a-tree"; + colorscheme = + if config.tinted-theming.schemes?"bark-on-a-tree" + then (lib.mkForce "bark-on-a-tree") + else (lib.mkDefault "default"); colorschemes.lush = { enable = true; @@ -43,242 +50,242 @@ in highlights = lib.mkMerge [ rec { - Normal = { fg.__raw = "base05"; bg.__raw = "base00"; }; + Normal = { fg = mkRaw "base05"; bg = mkRaw "base00"; }; NormalFloat = { - fg.__raw = "Normal.fg.saturate(15).lighten(5)"; - bg.__raw = "Normal.bg.saturate(15).lighten(5)"; + fg = mkRaw "Normal.fg.saturate(15).lighten(5)"; + bg = mkRaw "Normal.bg.saturate(15).lighten(5)"; }; Bold.gui = "bold"; - Debug.fg.__raw = "base08"; - Directory.fg.__raw = "base0D"; - Error = { fg.__raw = "base01"; bg.__raw = "base08"; }; - ErrorMsg.fg.__raw = "base08"; - Exception.fg.__raw = "base08"; - FoldColumn.fg.__raw = "base03"; + Debug.fg = mkRaw "base08"; + Directory.fg = mkRaw "base0D"; + Error = { fg = mkRaw "base01"; bg = mkRaw "base08"; }; + ErrorMsg.fg = mkRaw "base08"; + Exception.fg = mkRaw "base08"; + FoldColumn.fg = mkRaw "base03"; Folded = { - fg.__raw = "base03"; - bg.__raw = "base01"; + fg = mkRaw "base03"; + bg = mkRaw "base01"; }; Italic.gui = "italic"; - Macro.fg.__raw = "base08"; - ModeMsg.fg.__raw = "base0B"; - MoreMsg.fg.__raw = "base0B"; - Question.fg.__raw = "base0D"; + Macro.fg = mkRaw "base08"; + ModeMsg.fg = mkRaw "base0B"; + MoreMsg.fg = mkRaw "base0B"; + Question.fg = mkRaw "base0D"; Search = { - fg.__raw = "base00"; - bg.__raw = "base04"; + fg = mkRaw "base00"; + bg = mkRaw "base04"; }; IncSearch = { - fg.__raw = "base00"; - bg.__raw = "base09"; + fg = mkRaw "base00"; + bg = mkRaw "base09"; }; Substitute = { - fg.__raw = "base01"; - bg.__raw = "base0A"; + fg = mkRaw "base01"; + bg = mkRaw "base0A"; }; - TooLong.fg.__raw = "base08"; - Underlined = { fg.__raw = "base08"; }; - WarningMsg = { fg.__raw = "base08"; }; - WildMenu = { fg.__raw = "base08"; bg.__raw = "base0A"; }; - Title.fg.__raw = "base0D"; - Conceal.fg.__raw = "base0D"; - Cursor = { fg.__raw = "base00"; bg.__raw = "base05"; }; - NonText = { fg.__raw = "base03"; }; - LineNr = { fg.__raw = "base02.lighten(25)"; bg.__raw = "base00"; }; - LineNrNC = { fg.__raw = "base02.lighten(25)"; bg.__raw = "base01"; }; - SignColumn = { fg.__raw = "base01.lighten(40)"; }; - StatusLine = { fg.__raw = "base02"; bg.__raw = "base01.darken(60)"; }; - StatusLineNC = { fg.__raw = "base02"; bg.__raw = "base01.darken(30)"; }; - VertSplit = { fg.__raw = "base02"; bg.__raw = "base00"; }; - ColorColumn = { fg.__raw = "base01.lighten(25)"; bg.__raw = "base01.darken(25)"; }; - CursorLine = { bg.__raw = "base01.saturate(-5).darken(15)"; }; + TooLong.fg = mkRaw "base08"; + Underlined = { fg = mkRaw "base08"; }; + WarningMsg = { fg = mkRaw "base08"; }; + WildMenu = { fg = mkRaw "base08"; bg = mkRaw "base0A"; }; + Title.fg = mkRaw "base0D"; + Conceal.fg = mkRaw "base0D"; + Cursor = { fg = mkRaw "base00"; bg = mkRaw "base05"; }; + NonText = { fg = mkRaw "base03"; }; + LineNr = { fg = mkRaw "base02.lighten(25)"; bg = mkRaw "base00"; }; + LineNrNC = { fg = mkRaw "base02.lighten(25)"; bg = mkRaw "base01"; }; + SignColumn = { fg = mkRaw "base01.lighten(40)"; }; + StatusLine = { fg = mkRaw "base02"; bg = mkRaw "base01.darken(60)"; }; + StatusLineNC = { fg = mkRaw "base02"; bg = mkRaw "base01.darken(30)"; }; + VertSplit = { fg = mkRaw "base02"; bg = mkRaw "base00"; }; + ColorColumn = { fg = mkRaw "base01.lighten(25)"; bg = mkRaw "base01.darken(25)"; }; + CursorLine = { bg = mkRaw "base01.saturate(-5).darken(15)"; }; CursorColumn = CursorLine; - CursorLineNr.fg.__raw = "base0A"; - Visual = lib.mkMerge [ - CursorColumn - { fg.__raw = lib.mkForce "base03.lighten(15)"; } - ]; - VisualNOS = { fg.__raw = "base08"; }; - QuickFixLine = { bg.__raw = "base00"; }; - QFFileName = { fg.__raw = "base0A"; }; - QFLineNr = { fg.__raw = "base04"; }; - PMenu = { fg.__raw = "base05"; bg.__raw = "base01"; }; - PMenuSel = { fg.__raw = "base01"; bg.__raw = "base05"; }; - TabLineSel = { fg.__raw = "base00"; bg.__raw = "base0A"; }; - TabLine = { fg.__raw = "base03"; bg.__raw = "base00.darken(15)"; }; - TabLineFill = { fg.__raw = "base03"; bg.__raw = "base00.darken(25)"; }; - EndOfBuffer = { fg.__raw = "base01.lighten(20)"; bg.__raw = "base01.darken(20)"; }; + CursorLineNr.fg = mkRaw "base0A"; + Visual = { + __unkeyed = "CursorColumn"; + fg = mkRaw (lib.mkForce "base03.lighten(15)"); + }; + VisualNOS = { fg = mkRaw "base08"; }; + QuickFixLine = { bg = mkRaw "base00"; }; + QFFileName = { fg = mkRaw "base0A"; }; + QFLineNr = { fg = mkRaw "base04"; }; + PMenu = { fg = mkRaw "base05"; bg = mkRaw "base01"; }; + PMenuSel = { fg = mkRaw "base01"; bg = mkRaw "base05"; }; + TabLineSel = { fg = mkRaw "base00"; bg = mkRaw "base0A"; }; + TabLine = { fg = mkRaw "base03"; bg = mkRaw "base00.darken(15)"; }; + TabLineFill = { fg = mkRaw "base03"; bg = mkRaw "base00.darken(25)"; }; + EndOfBuffer = { fg = mkRaw "base01.lighten(20)"; bg = mkRaw "base01.darken(20)"; }; # Standard syntax highlighting - Boolean = { fg.__raw = "base09"; }; - Character = { fg.__raw = "base08"; }; - Comment = { fg.__raw = "base03"; gui = "italic"; }; - Conditional = { fg.__raw = "base0E"; }; - Constant = { fg.__raw = "base09"; }; - Define = { fg.__raw = "base0E"; }; - Delimiter = { fg.__raw = "base0F.lighten(10)"; }; - Float = { fg.__raw = "base09"; }; - Function = { fg.__raw = "base0D"; }; - Identifier = { fg.__raw = "base0A"; }; - Include = { fg.__raw = "base0D"; }; - Keyword = { fg.__raw = "base0E"; }; - Label = { fg.__raw = "base0A"; }; - Number = { fg.__raw = "base03"; }; - Operator = { fg.__raw = "base03"; }; - PreProc = { fg.__raw = "base0A"; }; - Repeat = { fg.__raw = "base0A"; }; - Special = { fg.__raw = "base0C"; }; - SpecialChar = { fg.__raw = "base0F.lighten(15).saturate(10)"; }; - Statement = { fg.__raw = "base08"; }; - StorageClass = { fg.__raw = "base0A"; }; - String = { fg.__raw = "base0B"; }; - Structure = { fg.__raw = "base0E"; }; - Tag = { fg.__raw = "base0A"; }; - Todo = { fg.__raw = "base0A"; bg.__raw = "base01"; }; - Type = { fg.__raw = "base0A"; }; - Typedef = { fg.__raw = "base0A"; }; + Boolean = { fg = mkRaw "base09"; }; + Character = { fg = mkRaw "base08"; }; + Comment = { fg = mkRaw "base03"; gui = "italic"; }; + Conditional = { fg = mkRaw "base0E"; }; + Constant = { fg = mkRaw "base09"; }; + Define = { fg = mkRaw "base0E"; }; + Delimiter = { fg = mkRaw "base0F.lighten(10)"; }; + Float = { fg = mkRaw "base09"; }; + Function = { fg = mkRaw "base0D"; }; + Identifier = { fg = mkRaw "base0A"; }; + Include = { fg = mkRaw "base0D"; }; + Keyword = { fg = mkRaw "base0E"; }; + Label = { fg = mkRaw "base0A"; }; + Number = { fg = mkRaw "base03"; }; + Operator = { fg = mkRaw "base03"; }; + PreProc = { fg = mkRaw "base0A"; }; + Repeat = { fg = mkRaw "base0A"; }; + Special = { fg = mkRaw "base0C"; }; + SpecialChar = { fg = mkRaw "base0F.lighten(15).saturate(10)"; }; + Statement = { fg = mkRaw "base08"; }; + StorageClass = { fg = mkRaw "base0A"; }; + String = { fg = mkRaw "base0B"; }; + Structure = { fg = mkRaw "base0E"; }; + Tag = { fg = mkRaw "base0A"; }; + Todo = { fg = mkRaw "base0A"; bg = mkRaw "base01"; }; + Type = { fg = mkRaw "base0A"; }; + Typedef = { fg = mkRaw "base0A"; }; # Help - HelpDoc = { fg.__raw = "base05"; bg.__raw = "base0D"; gui = "bold;italic"; }; - HelpIgnore = { fg.__raw = "base0B"; gui = "bold;italic"; }; + HelpDoc = { fg = mkRaw "base05"; bg = mkRaw "base0D"; gui = "bold;italic"; }; + HelpIgnore = { fg = mkRaw "base0B"; gui = "bold;italic"; }; # C highlighting - cOperator = { fg.__raw = "base0C"; }; - cPreCondit = { fg.__raw = "base0E"; }; + cOperator = { fg = mkRaw "base0C"; }; + cPreCondit = { fg = mkRaw "base0E"; }; # C# highlighting - csClass = { fg.__raw = "base0A"; }; - csAttribute = { fg.__raw = "base0A"; }; - csModifier = { fg.__raw = "base0E"; }; - csType = { fg.__raw = "base08"; }; - csUnspecifiedStatement = { fg.__raw = "base0D"; }; - csContextualStatement = { fg.__raw = "base0E"; }; - csNewDecleration = { fg.__raw = "base08"; }; + csClass = { fg = mkRaw "base0A"; }; + csAttribute = { fg = mkRaw "base0A"; }; + csModifier = { fg = mkRaw "base0E"; }; + csType = { fg = mkRaw "base08"; }; + csUnspecifiedStatement = { fg = mkRaw "base0D"; }; + csContextualStatement = { fg = mkRaw "base0E"; }; + csNewDecleration = { fg = mkRaw "base08"; }; # CSS highlighting - cssBraces = { fg.__raw = "base05"; }; - cssClassName = { fg.__raw = "base0E"; }; - cssColor = { fg.__raw = "base0C"; }; + cssBraces = { fg = mkRaw "base05"; }; + cssClassName = { fg = mkRaw "base0E"; }; + cssColor = { fg = mkRaw "base0C"; }; # Diff highlighting - DiffAdd = { fg.__raw = "base0B"; bg.__raw = "base0B.darken(80)"; }; - DiffAdded = { fg.__raw = "base0B"; bg.__raw = "base0B.darken(80)"; }; - DiffNewFile = { fg.__raw = "base0B"; bg.__raw = "base0B.darken(80)"; }; + DiffAdd = { fg = mkRaw "base0B"; bg = mkRaw "base0B.darken(80)"; }; + DiffAdded = { fg = mkRaw "base0B"; bg = mkRaw "base0B.darken(80)"; }; + DiffNewFile = { fg = mkRaw "base0B"; bg = mkRaw "base0B.darken(80)"; }; - DiffDelete = { fg.__raw = "base08"; bg.__raw = "base08.darken(80)"; }; - DiffRemoved = { fg.__raw = "base08"; bg.__raw = "base08.darken(80)"; }; + DiffDelete = { fg = mkRaw "base08"; bg = mkRaw "base08.darken(80)"; }; + DiffRemoved = { fg = mkRaw "base08"; bg = mkRaw "base08.darken(80)"; }; - DiffChange = { fg.__raw = "base03"; bg.__raw = "base03.darken(60)"; }; - DiffFile = { fg.__raw = "base03"; bg.__raw = "base03.darken(60)"; }; - DiffLine = { fg.__raw = "base03"; bg.__raw = "base03.darken(60)"; }; - DiffText = { fg.__raw = "base03"; bg.__raw = "base03.darken(60)"; }; + DiffChange = { fg = mkRaw "base03"; bg = mkRaw "base03.darken(60)"; }; + DiffFile = { fg = mkRaw "base03"; bg = mkRaw "base03.darken(60)"; }; + DiffLine = { fg = mkRaw "base03"; bg = mkRaw "base03.darken(60)"; }; + DiffText = { fg = mkRaw "base03"; bg = mkRaw "base03.darken(60)"; }; # Git highlighting - gitcommitOverflow = { fg.__raw = "base08"; }; - gitcommitSummary = { fg.__raw = "base0B"; }; - gitcommitComment = { fg.__raw = "base03"; }; - gitcommitUntracked = { fg.__raw = "base03"; }; - gitcommitDiscarded = { fg.__raw = "base03"; }; - gitcommitSelected = { fg.__raw = "base03"; }; - gitcommitHeader = { fg.__raw = "base0E"; }; - gitcommitSelectedType = { fg.__raw = "base0D"; }; - gitcommitUnmergedType = { fg.__raw = "base0D"; }; - gitcommitDiscardedType = { fg.__raw = "base0D"; }; - gitcommitBranch = { fg.__raw = "base09"; gui = "bold"; }; - gitcommitUntrackedFile = { fg.__raw = "base0A"; }; - gitcommitUnmergedFile = { fg.__raw = "base08"; gui = "bold"; }; - gitcommitDiscardedFile = { fg.__raw = "base08"; gui = "bold"; }; - gitcommitSelectedFile = { fg.__raw = "base0B"; gui = "bold"; }; + gitcommitOverflow = { fg = mkRaw "base08"; }; + gitcommitSummary = { fg = mkRaw "base0B"; }; + gitcommitComment = { fg = mkRaw "base03"; }; + gitcommitUntracked = { fg = mkRaw "base03"; }; + gitcommitDiscarded = { fg = mkRaw "base03"; }; + gitcommitSelected = { fg = mkRaw "base03"; }; + gitcommitHeader = { fg = mkRaw "base0E"; }; + gitcommitSelectedType = { fg = mkRaw "base0D"; }; + gitcommitUnmergedType = { fg = mkRaw "base0D"; }; + gitcommitDiscardedType = { fg = mkRaw "base0D"; }; + gitcommitBranch = { fg = mkRaw "base09"; gui = "bold"; }; + gitcommitUntrackedFile = { fg = mkRaw "base0A"; }; + gitcommitUnmergedFile = { fg = mkRaw "base08"; gui = "bold"; }; + gitcommitDiscardedFile = { fg = mkRaw "base08"; gui = "bold"; }; + gitcommitSelectedFile = { fg = mkRaw "base0B"; gui = "bold"; }; # HTML highlighting - htmlBold = { fg.__raw = "base0A"; }; - htmlItalic = { fg.__raw = "base0E"; }; - htmlEndTag = { fg.__raw = "base05"; }; - htmlTag = { fg.__raw = "base05"; }; + htmlBold = { fg = mkRaw "base0A"; }; + htmlItalic = { fg = mkRaw "base0E"; }; + htmlEndTag = { fg = mkRaw "base05"; }; + htmlTag = { fg = mkRaw "base05"; }; # JavaScript highlighting - javaScript = { fg.__raw = "base05"; }; - javaScriptBraces = { fg.__raw = "base05"; }; - javaScriptNumber = { fg.__raw = "base09"; }; + javaScript = { fg = mkRaw "base05"; }; + javaScriptBraces = { fg = mkRaw "base05"; }; + javaScriptNumber = { fg = mkRaw "base09"; }; # pangloss/vim-javascript highlighting - jsOperator = { fg.__raw = "base0D"; }; - jsStatement = { fg.__raw = "base0E"; }; - jsReturn = { fg.__raw = "base0E"; }; - jsThis = { fg.__raw = "base08"; }; - jsClassDefinition = { fg.__raw = "base0A"; }; - jsFunction = { fg.__raw = "base0E"; }; - jsFuncName = { fg.__raw = "base0D"; }; - jsFuncCall = { fg.__raw = "base0D"; }; - jsClassFuncName = { fg.__raw = "base0D"; }; - jsClassMethodType = { fg.__raw = "base0E"; }; - jsRegexpString = { fg.__raw = "base0C"; }; - jsGlobalObjects = { fg.__raw = "base0A"; }; - jsGlobalNodeObjects = { fg.__raw = "base0A"; }; - jsExceptions = { fg.__raw = "base0A"; }; - jsBuiltins = { fg.__raw = "base0A"; }; + jsOperator = { fg = mkRaw "base0D"; }; + jsStatement = { fg = mkRaw "base0E"; }; + jsReturn = { fg = mkRaw "base0E"; }; + jsThis = { fg = mkRaw "base08"; }; + jsClassDefinition = { fg = mkRaw "base0A"; }; + jsFunction = { fg = mkRaw "base0E"; }; + jsFuncName = { fg = mkRaw "base0D"; }; + jsFuncCall = { fg = mkRaw "base0D"; }; + jsClassFuncName = { fg = mkRaw "base0D"; }; + jsClassMethodType = { fg = mkRaw "base0E"; }; + jsRegexpString = { fg = mkRaw "base0C"; }; + jsGlobalObjects = { fg = mkRaw "base0A"; }; + jsGlobalNodeObjects = { fg = mkRaw "base0A"; }; + jsExceptions = { fg = mkRaw "base0A"; }; + jsBuiltins = { fg = mkRaw "base0A"; }; # Mail highlighting - mailQuoted1 = { fg.__raw = "base0A"; }; - mailQuoted2 = { fg.__raw = "base0B"; }; - mailQuoted3 = { fg.__raw = "base0E"; }; - mailQuoted4 = { fg.__raw = "base0C"; }; - mailQuoted5 = { fg.__raw = "base0D"; }; - mailQuoted6 = { fg.__raw = "base0A"; }; - mailURL = { fg.__raw = "base0D"; }; - mailEmail = { fg.__raw = "base0D"; }; + mailQuoted1 = { fg = mkRaw "base0A"; }; + mailQuoted2 = { fg = mkRaw "base0B"; }; + mailQuoted3 = { fg = mkRaw "base0E"; }; + mailQuoted4 = { fg = mkRaw "base0C"; }; + mailQuoted5 = { fg = mkRaw "base0D"; }; + mailQuoted6 = { fg = mkRaw "base0A"; }; + mailURL = { fg = mkRaw "base0D"; }; + mailEmail = { fg = mkRaw "base0D"; }; # Markdown highlighting - markdownh1 = { fg.__raw = "base0D"; gui = "bold"; }; - markdownh2 = { fg.__raw = "base0D"; gui = "bold"; }; - markdownh3 = { fg.__raw = "base0D"; gui = "bold"; }; - markdownh4 = { fg.__raw = "base0D"; gui = "bold"; }; - markdownh5 = { fg.__raw = "base0D"; gui = "bold"; }; - markdownh6 = { fg.__raw = "base0A"; gui = "bold"; }; - markdownRule = { fg.__raw = "markdownh2.bg"; gui = "bold"; }; - markdownItalic = { fg.__raw = "base05"; gui = "italic"; }; - markdownBold = { fg.__raw = "base05"; gui = "bold"; }; - markdownBoldItalic = { fg.__raw = "base05"; gui = "bold;italic"; }; - markdownCodeDelimiter = { fg.__raw = "base0B"; gui = "bold"; }; - markdownCode = { fg.__raw = "base07"; bg.__raw = "base00"; }; - markdownCodeBlock = { fg.__raw = "base0B"; }; - markdownFootnoteDefinition = { fg.__raw = "base05"; gui = "italic"; }; - markdownListMarker = { fg.__raw = "base05"; gui = "bold"; }; - markdownLineBreak = { fg.__raw = "base08"; gui = "underline"; }; - markdownError = { fg.__raw = "base05"; bg.__raw = "base00"; }; - markdownHeadingDelimiter = { fg.__raw = "base0D"; }; - markdownUrl = { fg.__raw = "base09"; }; - markdownFootnote = { fg.__raw = "base0E"; gui = "italic"; }; - markdownBlockquote = { fg.__raw = "base0C"; gui = "bold"; }; - markdownLinkText = { fg.__raw = "base08"; gui = "italic"; }; + markdownh1 = { fg = mkRaw "base0D"; gui = "bold"; }; + markdownh2 = { fg = mkRaw "base0D"; gui = "bold"; }; + markdownh3 = { fg = mkRaw "base0D"; gui = "bold"; }; + markdownh4 = { fg = mkRaw "base0D"; gui = "bold"; }; + markdownh5 = { fg = mkRaw "base0D"; gui = "bold"; }; + markdownh6 = { fg = mkRaw "base0A"; gui = "bold"; }; + markdownRule = { fg = mkRaw "markdownh2.bg"; gui = "bold"; }; + markdownItalic = { fg = mkRaw "base05"; gui = "italic"; }; + markdownBold = { fg = mkRaw "base05"; gui = "bold"; }; + markdownBoldItalic = { fg = mkRaw "base05"; gui = "bold;italic"; }; + markdownCodeDelimiter = { fg = mkRaw "base0B"; gui = "bold"; }; + markdownCode = { fg = mkRaw "base07"; bg = mkRaw "base00"; }; + markdownCodeBlock = { fg = mkRaw "base0B"; }; + markdownFootnoteDefinition = { fg = mkRaw "base05"; gui = "italic"; }; + markdownListMarker = { fg = mkRaw "base05"; gui = "bold"; }; + markdownLineBreak = { fg = mkRaw "base08"; gui = "underline"; }; + markdownError = { fg = mkRaw "base05"; bg = mkRaw "base00"; }; + markdownHeadingDelimiter = { fg = mkRaw "base0D"; }; + markdownUrl = { fg = mkRaw "base09"; }; + markdownFootnote = { fg = mkRaw "base0E"; gui = "italic"; }; + markdownBlockquote = { fg = mkRaw "base0C"; gui = "bold"; }; + markdownLinkText = { fg = mkRaw "base08"; gui = "italic"; }; # PHP highlighting - phpMemberSelector = { fg.__raw = "base05"; }; - phpComparison = { fg.__raw = "base05"; }; - phpParent = { fg.__raw = "base05"; }; - phpMethodsVar = { fg.__raw = "base0C"; }; + phpMemberSelector = { fg = mkRaw "base05"; }; + phpComparison = { fg = mkRaw "base05"; }; + phpParent = { fg = mkRaw "base05"; }; + phpMethodsVar = { fg = mkRaw "base0C"; }; # Python highlighting - pythonOperator = { fg.__raw = "base0E"; }; - pythonRepeat = { fg.__raw = "base0E"; }; - pythonInclude = { fg.__raw = "base0E"; }; - pythonStatement = { fg.__raw = "base0E"; }; + pythonOperator = { fg = mkRaw "base0E"; }; + pythonRepeat = { fg = mkRaw "base0E"; }; + pythonInclude = { fg = mkRaw "base0E"; }; + pythonStatement = { fg = mkRaw "base0E"; }; # Ruby highlighting - rubyAttribute = { fg.__raw = "base0D"; }; - rubyConstant = { fg.__raw = "base0A"; }; - rubyInterpolationDelimiter = { fg.__raw = "base0F"; }; - rubyRegexp = { fg.__raw = "base0C"; }; - rubySymbol = { fg.__raw = "base0B"; }; - rubyStringDelimiter = { fg.__raw = "base0B"; }; + rubyAttribute = { fg = mkRaw "base0D"; }; + rubyConstant = { fg = mkRaw "base0A"; }; + rubyInterpolationDelimiter = { fg = mkRaw "base0F"; }; + rubyRegexp = { fg = mkRaw "base0C"; }; + rubySymbol = { fg = mkRaw "base0B"; }; + rubyStringDelimiter = { fg = mkRaw "base0B"; }; # SASS highlighting - sassidChar = { fg.__raw = "base08"; }; - sassClassChar = { fg.__raw = "base09"; }; - sassInclude = { fg.__raw = "base0E"; }; - sassMixing = { fg.__raw = "base0E"; }; - sassMixinName = { fg.__raw = "base0D"; }; + sassidChar = { fg = mkRaw "base08"; }; + sassClassChar = { fg = mkRaw "base09"; }; + sassInclude = { fg = mkRaw "base0E"; }; + sassMixing = { fg = mkRaw "base0E"; }; + sassMixinName = { fg = mkRaw "base0D"; }; # Spelling highlighting SpellBad = { gui = "undercurl"; }; @@ -287,82 +294,82 @@ in SpellRare = { gui = "undercurl"; }; # Java highlighting - javaOperator = { fg.__raw = "base0D"; }; + javaOperator = { fg = mkRaw "base0D"; }; # LSP highlighting - LspDiagnosticsDefaultError = { fg.__raw = "base08"; }; - LspDiagnosticsDefaultWarning = { fg.__raw = "base09"; }; - LspDiagnosticsDefaultHint = { fg.__raw = "base0A"; }; - LspDiagnosticsDefaultInformation = { fg.__raw = "base0B"; }; + LspDiagnosticsDefaultError = { fg = mkRaw "base08"; }; + LspDiagnosticsDefaultWarning = { fg = mkRaw "base09"; }; + LspDiagnosticsDefaultHint = { fg = mkRaw "base0A"; }; + LspDiagnosticsDefaultInformation = { fg = mkRaw "base0B"; }; # XML highlighting - xmlTagName = { fg.__raw = "base0D"; }; - xmlCdatastart = { fg.__raw = "base0A"; }; - xmlEndTag = { fg.__raw = "xmlTagName.bg"; }; - xmlCdataCdata = { fg.__raw = "xmlCdatastart.bg"; }; + xmlTagName = { fg = mkRaw "base0D"; }; + xmlCdatastart = { fg = mkRaw "base0A"; }; + xmlEndTag = { fg = mkRaw "xmlTagName.bg"; }; + xmlCdataCdata = { fg = mkRaw "xmlCdatastart.bg"; }; # MatchParen - MatchParen = { fg.__raw = "base07"; bg.__raw = "base08"; }; + MatchParen = { fg = mkRaw "base07"; bg = mkRaw "base08"; }; # CodeQL - CodeqlAstFocus = { fg.__raw = "base00"; bg.__raw = "base03"; }; + CodeqlAstFocus = { fg = mkRaw "base00"; bg = mkRaw "base03"; }; # Diff highlighting - GitSignsAdd = { fg.__raw = "base0B"; }; - GitSignsDelete = { fg.__raw = "base08"; }; - GitSignsChange = { fg.__raw = "base03"; }; + GitSignsAdd = { fg = mkRaw "base0B"; }; + GitSignsDelete = { fg = mkRaw "base08"; }; + GitSignsChange = { fg = mkRaw "base03"; }; # Indent-Blank-Lines - IndentGuide = { fg.__raw = "base01"; bg.__raw = "base05"; }; + IndentGuide = { fg = mkRaw "base01"; bg = mkRaw "base05"; }; } (lib.mkIf config.plugins.telescope.enable { - TelescopeNormal = { fg.__raw = "base05"; bg.__raw = "base01"; }; - TelescopeBorder = { fg.__raw = "base00"; bg.__raw = "base01"; }; - TelescopePromptPrefix = { fg.__raw = "base0A"; bg.__raw = "base01"; }; - TelescopeMatching = { fg.__raw = "base0D"; bg.__raw = "base01"; }; - TelescopeSelection = { fg.__raw = "base0A"; bg.__raw = "base01"; }; - TelescopeSelectionCaret = { fg.__raw = "base0A"; bg.__raw = "base01"; }; + TelescopeNormal = { fg = mkRaw "base05"; bg = mkRaw "base01"; }; + TelescopeBorder = { fg = mkRaw "base00"; bg = mkRaw "base01"; }; + TelescopePromptPrefix = { fg = mkRaw "base0A"; bg = mkRaw "base01"; }; + TelescopeMatching = { fg = mkRaw "base0D"; bg = mkRaw "base01"; }; + TelescopeSelection = { fg = mkRaw "base0A"; bg = mkRaw "base01"; }; + TelescopeSelectionCaret = { fg = mkRaw "base0A"; bg = mkRaw "base01"; }; }) (lib.mkIf config.plugins.treesitter.enable { - TSError = { fg.__raw = "Error.bg"; gui = "bold"; }; - TSPunctDelimiter = { fg.__raw = "base05"; }; - TSPunctBracket = { fg.__raw = "base05"; }; - TSConstant = { fg.__raw = "Constant.fg"; }; - TSConstBuiltin = { fg.__raw = "Constant.fg"; }; - TSConstMacro = { fg.__raw = "Constant.fg"; }; - TSString = { fg.__raw = "String.fg"; }; - TSStringRegex = { fg.__raw = "base03"; }; - TSStringEscape = { fg.__raw = "base03"; }; - TSCharacter = { fg.__raw = "Character.fg"; }; - TSNumber = { fg.__raw = "Number.fg"; }; - TSBoolean = { fg.__raw = "Boolean.fg"; }; - TSFloat = { fg.__raw = "Number.fg"; }; - TSFunction = { fg.__raw = "Function.fg"; }; - TSFuncBuiltin = { fg.__raw = "Function.fg"; }; - TSFuncMacro = { fg.__raw = "Function.fg"; }; - TSParameter = { fg.__raw = "base0D"; }; - TSConstructor = { fg.__raw = "base0E"; }; - TSKeywordFunction = { fg.__raw = "base0E"; }; - TSLiteral = { fg.__raw = "base04"; gui = "bold"; }; - TSVariable = { fg.__raw = "base03.lighten(25)"; }; - TSVariableBuiltin = { fg.__raw = "base0E"; }; - TSParameterReference = { fg.__raw = "TSParameter.fg"; }; - TSMethod = { fg.__raw = "Function.fg"; }; - TSConditional = { fg.__raw = "Conditional.fg"; }; - TSRepeat = { fg.__raw = "Repeat.fg"; }; - TSLabel = { fg.__raw = "Label.fg"; }; - TSOperator = { fg.__raw = "Operator.fg"; }; - TSKeyword = { fg.__raw = "Keyword.fg"; }; - TSException = { fg.__raw = "Exception.fg"; }; - TSType = { fg.__raw = "Type.fg"; }; - TSTypeBuiltin = { fg.__raw = "Type.fg"; }; - TSStructure = { fg.__raw = "Structure.fg"; }; - TSInclude = { fg.__raw = "Include.fg"; }; - TSAnnotation = { fg.__raw = "base03"; }; - TSStrong = { fg.__raw = "base05"; bg.__raw = "base00"; gui = "bold"; }; - TSTitle = { fg.__raw = "base0D"; }; + TSError = { fg = mkRaw "Error.bg"; gui = "bold"; }; + TSPunctDelimiter = { fg = mkRaw "base05"; }; + TSPunctBracket = { fg = mkRaw "base05"; }; + TSConstant = { fg = mkRaw "Constant.fg"; }; + TSConstBuiltin = { fg = mkRaw "Constant.fg"; }; + TSConstMacro = { fg = mkRaw "Constant.fg"; }; + TSString = { fg = mkRaw "String.fg"; }; + TSStringRegex = { fg = mkRaw "base03"; }; + TSStringEscape = { fg = mkRaw "base03"; }; + TSCharacter = { fg = mkRaw "Character.fg"; }; + TSNumber = { fg = mkRaw "Number.fg"; }; + TSBoolean = { fg = mkRaw "Boolean.fg"; }; + TSFloat = { fg = mkRaw "Number.fg"; }; + TSFunction = { fg = mkRaw "Function.fg"; }; + TSFuncBuiltin = { fg = mkRaw "Function.fg"; }; + TSFuncMacro = { fg = mkRaw "Function.fg"; }; + TSParameter = { fg = mkRaw "base0D"; }; + TSConstructor = { fg = mkRaw "base0E"; }; + TSKeywordFunction = { fg = mkRaw "base0E"; }; + TSLiteral = { fg = mkRaw "base04"; gui = "bold"; }; + TSVariable = { fg = mkRaw "base03.lighten(25)"; }; + TSVariableBuiltin = { fg = mkRaw "base0E"; }; + TSParameterReference = { fg = mkRaw "TSParameter.fg"; }; + TSMethod = { fg = mkRaw "Function.fg"; }; + TSConditional = { fg = mkRaw "Conditional.fg"; }; + TSRepeat = { fg = mkRaw "Repeat.fg"; }; + TSLabel = { fg = mkRaw "Label.fg"; }; + TSOperator = { fg = mkRaw "Operator.fg"; }; + TSKeyword = { fg = mkRaw "Keyword.fg"; }; + TSException = { fg = mkRaw "Exception.fg"; }; + TSType = { fg = mkRaw "Type.fg"; }; + TSTypeBuiltin = { fg = mkRaw "Type.fg"; }; + TSStructure = { fg = mkRaw "Structure.fg"; }; + TSInclude = { fg = mkRaw "Include.fg"; }; + TSAnnotation = { fg = mkRaw "base03"; }; + TSStrong = { fg = mkRaw "base05"; bg = mkRaw "base00"; gui = "bold"; }; + TSTitle = { fg = mkRaw "base0D"; }; }) ]; }) config.tinted-theming.schemes;