]> git.madduck.net Git - etc/vim.git/blobdiff - templates/_common.colortemplate

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / vim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Enhance transparency to SignColumn and FoldColumn
[etc/vim.git] / templates / _common.colortemplate
diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate
index 0cc207c0dda2d23f11949f5e163e2ef6ece8e8be..7823b86ac20f6db48a4b0874bc113203e6a9ac2d 100644 (file)
--- a/templates/_common.colortemplate
+++ b/templates/_common.colortemplate
@@ -1,12 +1,25 @@
-# vim: ft=colortemplate fdm=marker
+; vim: ft=colortemplate fdm=marker
 
 
-# Default highlight groups {{{
+; Default highlight groups {{{
 #if !has('gui_running') && get(g:, '@optionprefix_dimmed', 0)
 #if !has('gui_running') && get(g:, '@optionprefix_dimmed', 0)
-  # dimmed colours
+  ; 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
   Conceal                          darkblue     none
   Constant                         darkgreen    none
-  Directory                        darkblue     none    bold
-  Error                            darkred      none    t=reverse,bold g=standout,bold
+  Directory                        darkblue     none     bold
+  Error                            darkred      none     t=reverse,bold g=standout,bold
   Function                         darkcyan     none
   Identifier                       darkblue     none
   ModeMsg                          darkblue     none
   Function                         darkcyan     none
   Identifier                       darkblue     none
   ModeMsg                          darkblue     none
@@ -14,15 +27,20 @@
   PreProc                          darkcyan     none
   Statement                        darkred      none
   Special                          darkyellow   none
   PreProc                          darkcyan     none
   Statement                        darkred      none
   Special                          darkyellow   none
-  Todo                             darkcyan     none    reverse
+  Todo                             darkcyan     none     reverse
   WarningMsg                       darkred      none
   WarningMsg                       darkred      none
-  WildMenu                         darkblue     bg2     bold
+  WildMenu                         darkblue     bg2      bold
 #else
 #else
-  # default colours
+  ; 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
   Conceal                          blue         none
   Constant                         green        none
-  Directory                        blue         none    bold
-  Error                            red          none    t=reverse,bold g=standout,bold
+  Directory                        blue         none     bold
+  Error                            red          none     t=reverse,bold g=standout,bold
   Function                         cyan         none
   Identifier                       blue         none
   ModeMsg                          blue         none
   Function                         cyan         none
   Identifier                       blue         none
   ModeMsg                          blue         none
@@ -30,67 +48,70 @@
   PreProc                          cyan         none
   Statement                        red          none
   Special                          yellow       none
   PreProc                          cyan         none
   Statement                        red          none
   Special                          yellow       none
-  Todo                             cyan         none    reverse
+  Todo                             cyan         none     reverse
   WarningMsg                       red          none
   WarningMsg                       red          none
-  WildMenu                         blue         bg2     bold
+  WildMenu                         blue         bg2      bold
 #endif
 #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)
 #endif
 #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)
-  # transparent background
-  Normal                           fg1          none
+  ; transparent background
+  LineNr                           bg2          none
   CursorLineNr                     yellow       none
   FoldColumn                       darkgray     none
   CursorLineNr                     yellow       none
   FoldColumn                       darkgray     none
-  SignColumn                       fg2          none
+  SignColumn                       none         none
   VertSplit                        bg3          none
   VertSplit                        bg3          none
+  Pmenu                            fg1          none
+  PmenuSbar                        fg2          none
+  PmenuSel                         fg2          none        reverse
+  PmenuThumb                       none         fg2
 #else
 #else
-  # opaque background
-  Normal                           fg1          bg0
+  ; opaque background
+  LineNr                           bg2          bg1
   CursorLineNr                     yellow       bg1
   FoldColumn                       darkgray     bg1
   CursorLineNr                     yellow       bg1
   FoldColumn                       darkgray     bg1
-  SignColumn                       fg2          bg1
+  SignColumn                       none          bg1
   VertSplit                        bg3          bg0
   VertSplit                        bg3          bg0
+  Pmenu                            fg1          bg2
+  PmenuSbar                        none         bg2
+  PmenuSel                         bg1          fg2        bold
+  PmenuThumb                       none         bg4
 #endif
 
 #endif
 
-# Group                          Fg           Bg      Attributes
-ColorColumn                      none         bg1     bold
-Cursor                           none         none    reverse,bold
-CursorColumn                     none         none    italic,bold
-CursorLine                       none         none    italic,bold
-DiffAdd                          brightgreen  black   reverse
-DiffAdded                        brightgreen  black   reverse
-DiffChange                       brightblue   black   reverse
-DiffDelete                       brightred    black   reverse
-DiffRemoved                      brightred    black   reverse
-DiffText                         brightgreen  black   reverse
+; Group                          Fg           Bg         Attributes
+ColorColumn                      none         bg1        bold
+Cursor                           none         none       reverse,bold
+CursorColumn                     none         bg1
+CursorLine                       none         bg1       bold
+DiffAdd                          none         diffgreen
+DiffAdded                        none         diffgreen
+DiffChange                       none         diffblue
+DiffDelete                       none         diffred
+DiffRemoved                      none         diffred
+DiffText                         none         diffgreen
 EndOfBuffer                      bg0          none
 ErrorMsg                      -> Error
 EndOfBuffer                      bg0          none
 ErrorMsg                      -> Error
-Folded                           bg3          bg1     g=italic
-IncSearch                        yellow       black   reverse
-LineNr                           bg3          bg1
-MatchParen                       none         bg2     bold
+Folded                           bg3          bg1        g=italic
+IncSearch                        yellow       black      reverse
+MatchParen                       none         bg2        bold
 NonText                          bg4          none
 NonText                          bg4          none
-Pmenu                            fg1          bg2
-PmenuSbar                        none         bg2
-PmenuSel                         bg1          fg2    bold
-PmenuThumb                       none         bg4
 Question                         darkyellow   none
 QuickFixLine                  -> Search
 Question                         darkyellow   none
 QuickFixLine                  -> Search
-Search                           brightyellow black   reverse
+Search                           brightyellow black      reverse
 SpecialKey                       bg4          none
 SpecialKey                       bg4          none
-SpellBad                         red          none    t=underline g=italic,undercurl s=red
-SpellCap                         blue         none    t=underline g=italic,undercurl s=blue
-SpellLocal                       cyan         none    t=underline g=italic,undercurl s=cyan
-SpellRare                        magenta      none    t=underline g=italic,undercurl s=magenta
-StatusLine                       bg2          fg1     reverse
-StatusLineNC                     bg1          fg2     reverse
+SpellBad                         red          none       t=underline g=italic,undercurl
+SpellCap                         blue         none       t=underline g=italic,undercurl
+SpellLocal                       cyan         none       t=underline g=italic,undercurl
+SpellRare                        magenta      none       t=underline g=italic,undercurl
+StatusLine                       fg1          bg2
+StatusLineNC                     fg2          bg1
 StatusLineTerm                -> StatusLine
 StatusLineTermNC              -> StatusLineNC
 TabLine                       -> TabLineFill
 TabLineFill                      fg2          bg3
 TabLineSel                       fg1          bg1
 StatusLineTerm                -> StatusLine
 StatusLineTermNC              -> StatusLineNC
 TabLine                       -> TabLineFill
 TabLineFill                      fg2          bg3
 TabLineSel                       fg1          bg1
-Title                            fg0          none    bold
+Title                            red          none       bold
 Visual                           none         bg1
 VisualNOS                     -> Visual
 Visual                           none         bg1
 VisualNOS                     -> Visual
-# Other conventional group names (see `:help group-name`)
+; Other conventional group names (see `:help group-name`)
 Boolean                       -> Constant
 Character                     -> Constant
 Comment                          fg3          none
 Boolean                       -> Constant
 Character                     -> Constant
 Comment                          fg3          none
@@ -117,33 +138,51 @@ Structure                     -> Type
 Tag                           -> Special
 Type                             darkcyan     none
 Typedef                       -> Type
 Tag                           -> Special
 Type                             darkcyan     none
 Typedef                       -> Type
-Underlined                       none         none    underline
-# Language mapping cursor
+Underlined                       none         none       underline
+; Language mapping cursor
 lCursor                       -> Cursor
 lCursor                       -> Cursor
-# See `:help CursorIM`
-CursorIM                         none         none    reverse
-# See `:help window-toolbar`
+; See `:help CursorIM`
+CursorIM                         none         none       reverse
+; See `:help window-toolbar`
 ToolbarLine                      none         bg3
 ToolbarLine                      none         bg3
-ToolbarButton                    fg0          bg3     bold
-# }}}
+ToolbarButton                    fg0          bg3        bold
+; }}}
 
 
-# Additional highlight groups {{{
-# Input mode cursor
+; Additional highlight groups {{{
+; Input mode cursor
 iCursor                       -> Cursor
 iCursor                       -> Cursor
-# Visual mode cursor, selection
+; Visual mode cursor, selection
 vCursor                       -> Cursor
 
 vCursor                       -> Cursor
 
-# Useful for custom status lines
-NormalMode                       fg2          bg0     reverse
-InsertMode                       blue         bg0     reverse
-ReplaceMode                      cyan         bg0     reverse
-VisualMode                       yellow       bg0     reverse
-CommandMode                      magenta      bg0     reverse
-Warnings                         yellow       bg0     reverse
-# }}}
+; Useful for custom status lines
+NormalMode                       fg2          bg0        reverse
+InsertMode                       blue         bg0        reverse
+ReplaceMode                      cyan         bg0        reverse
+VisualMode                       yellow       bg0        reverse
+CommandMode                      magenta      bg0        reverse
+Warnings                         red          bg0        reverse
+; }}}
 
 
-# Terminal colors {{{
+; Plugin support {{{
+; GitSigns
+#if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)
+  ; transparent background
+  GitSignsAdd                      green    none
+  GitSignsChange                   blue     none
+  GitSignsDelete                   red      none
+#else
+  ; opaque background
+  GitSignsAdd                      green    bg1
+  GitSignsChange                   blue     bg1
+  GitSignsDelete                   red      bg1
+#endif
+GitSignsAddNr                 -> GitSignsAdd
+GitSignsChangeNr              -> GitSignsChange
+GitSignsDeleteNr              -> GitSignsDelete
+; }}}
+
+; Terminal colors {{{
 TermCursor                    -> Cursor
 TermCursorNC                     bg1          fg1
 TermCursor                    -> Cursor
 TermCursorNC                     bg1          fg1
-# }}}
+; }}}
 
 
vim configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.