X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/cda2b98a58049d2cb8dd14c361fc473cc3b79cc5..a2bb8d1bc1e71a390a3a27997197f8a3a7ca7184:/templates/_common.colortemplate

diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate
index f9d1f16..52e5bba 100644
--- a/templates/_common.colortemplate
+++ b/templates/_common.colortemplate
@@ -1,44 +1,88 @@
 # vim: ft=colortemplate fdm=marker
 
 # Default highlight groups {{{
-#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
+#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
-  # Opaque background
-  Normal       fg1           bg0
-  CursorLineNr yellow        bg1
-  FoldColumn   darkgray      bg1
-  SignColumn   fg2           bg1
-  VertSplit    bg3           bg0
+  # 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
-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
+ColorColumn                      none         bg1     bold
+Cursor                           none         none    reverse,bold
+CursorColumn                  -> CursorLine
+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                            red          none    t=reverse,bold g=standout,bold
 ErrorMsg                      -> Error
 Folded                           bg3          bg1     g=italic
-IncSearch                     -> Search
+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
@@ -59,24 +103,19 @@ 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                       -> 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                       -> PreProc
 Keyword                       -> Statement
@@ -85,17 +124,13 @@ Macro                         -> PreProc
 Number                        -> Constant
 Operator                      -> Statement
 PreCondit                     -> PreProc
-PreProc                          cyan         none
 Repeat                        -> Statement
 SpecialChar                   -> Special
 SpecialComment                -> Special
-Statement                        red          none
 StorageClass                  -> Type
-Special                          yellow       none
 String                        -> Constant
 Structure                     -> Type
 Tag                           -> Special
-Todo                             cyan         none    reverse
 Type                             darkcyan     none
 Typedef                       -> Type
 Underlined                       none         none    underline