]> 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
- mark CursorLine & CursorColumn with different background - no more bold+italic
[etc/vim.git] / templates / _common.colortemplate
diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate
index 25b2df2a75422b22230f9615f4e41120aa0093ea..52e5bbaa8c9db29b34d2dfe2244f24f11c3a3ca0 100644 (file)
--- a/templates/_common.colortemplate
+++ b/templates/_common.colortemplate
@@ -1,44 +1,88 @@
 # vim: ft=colortemplate fdm=marker
 
 # Default highlight groups {{{
 # 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
 #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     bold
 #endif
 
 # Group                          Fg           Bg      Attributes
 ColorColumn                      none         bg1     bold
-Conceal                          blue         none
 Cursor                           none         none    reverse,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
-Directory                        blue         none    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
 EndOfBuffer                      bg0          none
-Error                            red          none    t=reverse,bold g=standout,bold
 ErrorMsg                      -> Error
 Folded                           bg3          bg1     g=italic
 IncSearch                        yellow       black   reverse
 LineNr                           bg3          bg1
 MatchParen                       none         bg2     bold
 ErrorMsg                      -> Error
 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
 NonText                          bg4          none
 Pmenu                            fg1          bg2
 PmenuSbar                        none         bg2
@@ -59,24 +103,19 @@ StatusLineTermNC              -> StatusLineNC
 TabLine                       -> TabLineFill
 TabLineFill                      fg2          bg3
 TabLineSel                       fg1          bg1
 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
-WarningMsg                       red          none
-WildMenu                         blue         bg2     bold
 # Other conventional group names (see `:help group-name`)
 Boolean                       -> Constant
 Character                     -> Constant
 Comment                          fg3          none
 Conditional                   -> Statement
 # 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
 Define                        -> PreProc
 Debug                         -> Special
 Delimiter                     -> Special
 Exception                     -> Statement
 Float                         -> Constant
-Function                         cyan         none
-Identifier                       blue         none
 Ignore                           fg           none
 Include                       -> PreProc
 Keyword                       -> Statement
 Ignore                           fg           none
 Include                       -> PreProc
 Keyword                       -> Statement
@@ -85,17 +124,13 @@ Macro                         -> PreProc
 Number                        -> Constant
 Operator                      -> Statement
 PreCondit                     -> PreProc
 Number                        -> Constant
 Operator                      -> Statement
 PreCondit                     -> PreProc
-PreProc                          cyan         none
 Repeat                        -> Statement
 SpecialChar                   -> Special
 SpecialComment                -> Special
 Repeat                        -> Statement
 SpecialChar                   -> Special
 SpecialComment                -> Special
-Statement                        red          none
 StorageClass                  -> Type
 StorageClass                  -> Type
-Special                          yellow       none
 String                        -> Constant
 Structure                     -> Type
 Tag                           -> Special
 String                        -> Constant
 Structure                     -> Type
 Tag                           -> Special
-Todo                             cyan         none    reverse
 Type                             darkcyan     none
 Typedef                       -> Type
 Underlined                       none         none    underline
 Type                             darkcyan     none
 Typedef                       -> Type
 Underlined                       none         none    underline
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.