X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/5b032742dcf34735bc2882549b63b15072654151..cda2b98a58049d2cb8dd14c361fc473cc3b79cc5:/templates/_common.colortemplate diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate index 984c590..f9d1f16 100644 --- a/templates/_common.colortemplate +++ b/templates/_common.colortemplate @@ -1,44 +1,40 @@ # vim: ft=colortemplate fdm=marker # Default highlight groups {{{ -verbatim -if !has('gui_running') && get(g:, '@optionprefix_transp_bg', 0) -endverbatim +#if !has('gui_running') && get(g:, '@optionprefix_transp_bg', 0) # Transparent background Normal fg1 none CursorLineNr yellow none - FoldColumn brightblack none + FoldColumn darkgray none SignColumn fg2 none VertSplit bg3 none -verbatim -else -endverbatim +#else # Opaque background Normal fg1 bg0 CursorLineNr yellow bg1 - FoldColumn brightblack bg1 + FoldColumn darkgray bg1 SignColumn fg2 bg1 VertSplit bg3 bg0 -verbatim -endif -endverbatim +#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 brightgreen +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 bg0 red +Error red none t=reverse,bold g=standout,bold ErrorMsg -> Error -Folded brightblack bg1 g=italic -IncSearch brightyellow black reverse +Folded bg3 bg1 g=italic +IncSearch -> Search LineNr bg3 bg1 MatchParen none bg2 bold ModeMsg blue none @@ -46,7 +42,7 @@ 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 @@ -69,40 +65,40 @@ 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 +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` @@ -112,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 @@ -142,6 +124,7 @@ Warnings yellow bg0 reverse # }}} # Terminal colors {{{ -Include: _terminal.colortemplate +TermCursor -> Cursor +TermCursorNC bg1 fg1 # }}}