X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/4b0466cec34845915c7fd060c79e3e466a0a9420..cda2b98a58049d2cb8dd14c361fc473cc3b79cc5:/templates/_common.colortemplate diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate index c8df60b..f9d1f16 100644 --- a/templates/_common.colortemplate +++ b/templates/_common.colortemplate @@ -1,54 +1,50 @@ # 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_transp_bg', 0) + # Transparent background + Normal fg1 none + CursorLineNr yellow none + FoldColumn darkgray none + SignColumn fg2 none + VertSplit bg3 none +#else + # Opaque background + Normal fg1 bg0 + 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 -CursorColumn -> CursorLine -CursorLine none bg1 bold,italic -DiffAdd fg4 brightgreen -DiffChange fg4 brightblue -DiffDelete fg4 brightred -DiffText fg4 brightyellow +CursorColumn -> ColorColumn +CursorLine -> ColorColumn +DiffAdd brightgreen black reverse +DiffAdded brightgreen black reverse +DiffChange brightblue black reverse +DiffDelete brightred black reverse +DiffRemoved brightred black reverse +DiffText brightgreen black reverse Directory blue none bold EndOfBuffer bg0 none -Error red bg0 bold,reverse -ErrorMsg bg0 red bold -Folded brightblack bg1 g=italic -IncSearch brightyellow black reverse -LineNr bg2 bg1 +Error red none t=reverse,bold g=standout,bold +ErrorMsg -> Error +Folded bg3 bg1 g=italic +IncSearch -> Search +LineNr bg3 bg1 MatchParen none bg2 bold -ModeMsg yellow none bold -MoreMsg yellow none 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 yellow none bold +Question darkyellow none QuickFixLine -> Search Search brightyellow black reverse SpecialKey bg4 none @@ -66,44 +62,43 @@ TabLineSel fg1 bg1 Title fg0 none bold Visual none bg1 VisualNOS -> Visual -WarningMsg red none bold +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 -Error red bg0 bold,reverse -Exception red none -Float magenta none -Function blue none bold -Identifier cyan none +Boolean -> Constant +Character -> Constant +Comment fg3 none +Conditional -> Statement +Constant green none +Define -> PreProc +Debug -> Special +Delimiter -> Special +Exception -> Statement +Float -> Constant +Function cyan none +Identifier blue none 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 +Macro -> PreProc +Number -> Constant +Operator -> Statement +PreCondit -> PreProc PreProc cyan none -Repeat red none -SpecialChar red none -SpecialComment red none +Repeat -> Statement +SpecialChar -> Special +SpecialComment -> Special Statement red none -StorageClass green none +StorageClass -> Type Special yellow none -String green none -Structure cyan none +String -> Constant +Structure -> Type Tag -> Special -Todo fg bg0 t=bold g=bold,italic -Type cyan none -Typedef cyan none -Underlined blue none underline +Todo cyan none reverse +Type darkcyan none +Typedef -> Type +Underlined none none underline # Language mapping cursor lCursor -> Cursor # See `:help CursorIM` @@ -113,20 +108,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 @@ -143,6 +124,7 @@ Warnings yellow bg0 reverse # }}} # Terminal colors {{{ -Include: _terminal.colortemplate +TermCursor -> Cursor +TermCursorNC bg1 fg1 # }}}