X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/c2536df99682289346620e78dd00dbcb8413bcfb..a2bb8d1bc1e71a390a3a27997197f8a3a7ca7184:/templates/_common.colortemplate diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate index ec1c25b..52e5bba 100644 --- a/templates/_common.colortemplate +++ b/templates/_common.colortemplate @@ -1,52 +1,92 @@ # vim: ft=colortemplate fdm=marker # Default highlight groups {{{ -verbatim -if !has('gui_running') && get(g:, '@optionprefix_transp_bg', 0) -endverbatim - # Transparent background - Normal fg1 none - CursorLineNr yellow none - FoldColumn brightblack none - SignColumn fg2 none - VertSplit bg3 none -verbatim -else -endverbatim - # Opaque background - Normal fg1 bg0 - CursorLineNr yellow bg1 - FoldColumn brightblack bg1 - SignColumn fg2 bg1 - VertSplit bg3 bg0 -verbatim -endif -endverbatim +#if !has('gui_running') && get(g:, '@optionprefix_dimmed', 0) + # dimmed colours + #if !has('gui_running') && &background ==# 'light' + #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0) + Normal realblack none + #else + Normal realblack bg0 + #endif + #elseif !has('gui_running') && &background ==# 'dark' + #if get(g:, '@optionprefix_transparent', 0) + Normal brightwhite none + #else + Normal brightwhite bg0 + #endif + #endif + Conceal darkblue none + Constant darkgreen none + Directory darkblue none bold + Error darkred none t=reverse,bold g=standout,bold + Function darkcyan none + Identifier darkblue none + ModeMsg darkblue none + MoreMsg darkgreen none + PreProc darkcyan none + Statement darkred none + Special darkyellow none + Todo darkcyan none reverse + WarningMsg darkred none + WildMenu darkblue bg2 bold +#else + # default colours + #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0) + Normal fg1 none + #else + Normal fg1 bg0 + #endif + Conceal blue none + Constant green none + Directory blue none bold + Error red none t=reverse,bold g=standout,bold + Function cyan none + Identifier blue none + ModeMsg blue none + MoreMsg green none + PreProc cyan none + Statement red none + Special yellow none + Todo cyan none reverse + WarningMsg red none + WildMenu blue bg2 bold +#endif +#if !has('gui_running') && get(g:, '@optionprefix_transparent', 0) + # transparent background + CursorLineNr yellow none + FoldColumn darkgray none + SignColumn fg2 none + VertSplit bg3 none +#else + # opaque background + CursorLineNr yellow bg1 + FoldColumn darkgray bg1 + SignColumn fg2 bg1 + VertSplit bg3 bg0 +#endif # Group Fg Bg Attributes -ColorColumn none bg1 -Conceal blue none -Cursor none none reverse +ColorColumn none bg1 bold +Cursor none none reverse,bold CursorColumn -> CursorLine -CursorLine none bg1 bold,italic -DiffAdd fg4 brightgreen -DiffChange fg4 brightblue -DiffDelete fg4 brightred -DiffText fg4 brightyellow -Directory blue none bold +CursorLine none bg1 +DiffAdd none diffgreen +DiffAdded none diffgreen +DiffChange none diffblue +DiffDelete none diffred +DiffRemoved none diffred +DiffText none diffgreen EndOfBuffer bg0 none -Error bg0 red ErrorMsg -> Error -Folded brightblack bg1 g=italic -IncSearch brightyellow black reverse +Folded bg3 bg1 g=italic +IncSearch yellow black reverse LineNr bg3 bg1 MatchParen none bg2 bold -ModeMsg blue none -MoreMsg green none NonText bg4 none Pmenu fg1 bg2 PmenuSbar none bg2 -PmenuSel bg1 blue bold +PmenuSel bg1 fg2 bold PmenuThumb none bg4 Question darkyellow none QuickFixLine -> Search @@ -63,46 +103,37 @@ StatusLineTermNC -> StatusLineNC TabLine -> TabLineFill TabLineFill fg2 bg3 TabLineSel fg1 bg1 -Title fg0 none bold +Title red none bold Visual none bg1 VisualNOS -> Visual -WarningMsg red none -WildMenu blue bg2 bold # Other conventional group names (see `:help group-name`) -Boolean magenta none -Character magenta none -Comment brightblack none g=italic -Conditional red none -Constant magenta none -Define cyan none -Debug red none -Delimiter -> Statement -Exception red none -Float magenta none -Function blue none bold -Identifier cyan none +Boolean -> Constant +Character -> Constant +Comment fg3 none +Conditional -> Statement +Define -> PreProc +Debug -> Special +Delimiter -> Special +Exception -> Statement +Float -> Constant Ignore fg none -Include cyan none -Keyword red none +Include -> PreProc +Keyword -> Statement Label -> Statement -Macro cyan none -Number magenta none -Operator -> Normal -PreCondit cyan none -PreProc cyan none -Repeat red none -SpecialChar red none -SpecialComment red none -Statement red none -StorageClass green none -Special yellow none -String green none -Structure cyan none +Macro -> PreProc +Number -> Constant +Operator -> Statement +PreCondit -> PreProc +Repeat -> Statement +SpecialChar -> Special +SpecialComment -> Special +StorageClass -> Type +String -> Constant +Structure -> Type Tag -> Special -Todo fg bg0 t=bold g=bold,italic -Type cyan none -Typedef cyan none -Underlined blue none underline +Type darkcyan none +Typedef -> Type +Underlined none none underline # Language mapping cursor lCursor -> Cursor # See `:help CursorIM` @@ -112,20 +143,6 @@ ToolbarLine none bg3 ToolbarButton fg0 bg3 bold # }}} -# Italics {{{ -verbatim -if get(g:, "@optionprefix_italic", 0) - hi Comment cterm=italic - hi Folded cterm=italic - hi SpellBad cterm=italic,underline - hi SpellCap cterm=italic,underline - hi SpellLocal cterm=italic,underline - hi SpellRare cterm=italic,underline - hi Todo cterm=italic -endif -endverbatim -# }}} - # Additional highlight groups {{{ # Input mode cursor iCursor -> Cursor @@ -142,6 +159,7 @@ Warnings yellow bg0 reverse # }}} # Terminal colors {{{ -Include: _terminal.colortemplate +TermCursor -> Cursor +TermCursorNC bg1 fg1 # }}}