From 6093761d497e7c27d7fb3134a5771a38f3cb69b0 Mon Sep 17 00:00:00 2001 From: Chris Kempson Date: Sat, 23 Mar 2013 18:47:40 +0000 Subject: Updated with base16-builder --- colors/base16-chalk.vim | 51 ++++++++++++++++++++++++------------------- colors/base16-default.vim | 51 ++++++++++++++++++++++++------------------- colors/base16-eighties.vim | 51 ++++++++++++++++++++++++------------------- colors/base16-greenscreen.vim | 51 ++++++++++++++++++++++++------------------- colors/base16-mocha.vim | 51 ++++++++++++++++++++++++------------------- colors/base16-monokai.vim | 51 ++++++++++++++++++++++++------------------- colors/base16-ocean.vim | 51 ++++++++++++++++++++++++------------------- colors/base16-railscasts.vim | 51 ++++++++++++++++++++++++------------------- colors/base16-solarized.vim | 51 ++++++++++++++++++++++++------------------- colors/base16-tomorrow.vim | 51 ++++++++++++++++++++++++------------------- 10 files changed, 290 insertions(+), 220 deletions(-) diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim index 9b9c03a..3e565dd 100644 --- a/colors/base16-chalk.vim +++ b/colors/base16-chalk.vim @@ -70,9 +70,6 @@ fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) endif endfun -" Clear highlighting -highlight clear SignColumn - " Vim Editor Colors call hi("Bold", "", "", "", "", "bold") call hi("Debug", s:gui08, "", s:cterm08, "", "") @@ -90,19 +87,20 @@ call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") call hi("Question", s:gui0A, "", s:cterm0A, "", "") call hi("Search", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "reverse") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("Title", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") call hi("TooLong", s:gui08, "", s:cterm08, "", "") call hi("Underlined", s:gui08, "", s:cterm08, "", "") call hi("Visual", "", s:gui02, "", s:cterm02, "") call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") call hi("WildMenu", s:gui08, "", s:cterm08, "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none") if &background == "dark" call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") call hi("NonText", s:gui03, "", s:cterm03, "", "") call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") + call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") @@ -113,14 +111,15 @@ if &background == "dark" call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") call hi("PMenuSel", s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "none") - call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") + call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") else call hi("Cursor", s:gui00, s:gui02, s:cterm00, s:cterm02, "") call hi("NonText", s:gui05, "", s:cterm05, "", "") call hi("Normal", s:gui02, s:gui07, s:cterm02, s:cterm05, "") call hi("LineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") + call hi("SignColumn", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("SpecialKey", s:gui05, "", s:cterm05, "", "") call hi("StatusLine", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") call hi("StatusLineNC", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") @@ -130,9 +129,9 @@ else call hi("CursorLineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("PMenu", s:gui05, s:gui03, s:cterm05, s:cterm03, "none") call hi("PMenuSel", s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") + call hi("TabLine", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "reverse") endif " Standard Syntax Highlighting @@ -160,7 +159,6 @@ call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") call hi("String", s:gui0B, "", s:cterm0B, "", "") call hi("Structure", s:gui0E, "", s:cterm0E, "", "") call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Title", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "none") call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") call hi("Type", s:gui09, "", s:cterm09, "", "none") call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") @@ -172,15 +170,15 @@ call hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm0D, "") "call hi("SpellRare", s:gui00, s:gui08, s:cterm00, s:cterm08, "") " Additional Diff Highlighting -call hi("DiffAdd", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffChange", s:gui05, "", s:cterm05, "", "") -call hi("DiffDelete", s:gui08, "", s:cterm08, "", "") -call hi("DiffText", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffAdded", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffFile", s:gui08, "", s:cterm08, "", "") -call hi("DiffNewFile", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffLine", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffRemoved", s:gui08, "", s:cterm08, "", "") +call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") " Ruby Highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") @@ -227,9 +225,18 @@ call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") " Git Highlighting call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" Remove Highlighting Function -delf hi + +" GitGutter Highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") + +" GitGutter Highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") + +" remove highlighting function +delf hi " Remove Colour Variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-default.vim b/colors/base16-default.vim index ca832d0..6f37850 100644 --- a/colors/base16-default.vim +++ b/colors/base16-default.vim @@ -70,9 +70,6 @@ fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) endif endfun -" Clear highlighting -highlight clear SignColumn - " Vim Editor Colors call hi("Bold", "", "", "", "", "bold") call hi("Debug", s:gui08, "", s:cterm08, "", "") @@ -90,19 +87,20 @@ call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") call hi("Question", s:gui0A, "", s:cterm0A, "", "") call hi("Search", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "reverse") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("Title", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") call hi("TooLong", s:gui08, "", s:cterm08, "", "") call hi("Underlined", s:gui08, "", s:cterm08, "", "") call hi("Visual", "", s:gui02, "", s:cterm02, "") call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") call hi("WildMenu", s:gui08, "", s:cterm08, "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none") if &background == "dark" call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") call hi("NonText", s:gui03, "", s:cterm03, "", "") call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") + call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") @@ -113,14 +111,15 @@ if &background == "dark" call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") call hi("PMenuSel", s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "none") - call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") + call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") else call hi("Cursor", s:gui00, s:gui02, s:cterm00, s:cterm02, "") call hi("NonText", s:gui05, "", s:cterm05, "", "") call hi("Normal", s:gui02, s:gui07, s:cterm02, s:cterm05, "") call hi("LineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") + call hi("SignColumn", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("SpecialKey", s:gui05, "", s:cterm05, "", "") call hi("StatusLine", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") call hi("StatusLineNC", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") @@ -130,9 +129,9 @@ else call hi("CursorLineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("PMenu", s:gui05, s:gui03, s:cterm05, s:cterm03, "none") call hi("PMenuSel", s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") + call hi("TabLine", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "reverse") endif " Standard Syntax Highlighting @@ -160,7 +159,6 @@ call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") call hi("String", s:gui0B, "", s:cterm0B, "", "") call hi("Structure", s:gui0E, "", s:cterm0E, "", "") call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Title", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "none") call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") call hi("Type", s:gui09, "", s:cterm09, "", "none") call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") @@ -172,15 +170,15 @@ call hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm0D, "") "call hi("SpellRare", s:gui00, s:gui08, s:cterm00, s:cterm08, "") " Additional Diff Highlighting -call hi("DiffAdd", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffChange", s:gui05, "", s:cterm05, "", "") -call hi("DiffDelete", s:gui08, "", s:cterm08, "", "") -call hi("DiffText", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffAdded", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffFile", s:gui08, "", s:cterm08, "", "") -call hi("DiffNewFile", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffLine", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffRemoved", s:gui08, "", s:cterm08, "", "") +call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") " Ruby Highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") @@ -227,9 +225,18 @@ call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") " Git Highlighting call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" Remove Highlighting Function -delf hi + +" GitGutter Highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") + +" GitGutter Highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") + +" remove highlighting function +delf hi " Remove Colour Variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim index dc411e0..464a846 100644 --- a/colors/base16-eighties.vim +++ b/colors/base16-eighties.vim @@ -70,9 +70,6 @@ fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) endif endfun -" Clear highlighting -highlight clear SignColumn - " Vim Editor Colors call hi("Bold", "", "", "", "", "bold") call hi("Debug", s:gui08, "", s:cterm08, "", "") @@ -90,19 +87,20 @@ call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") call hi("Question", s:gui0A, "", s:cterm0A, "", "") call hi("Search", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "reverse") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("Title", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") call hi("TooLong", s:gui08, "", s:cterm08, "", "") call hi("Underlined", s:gui08, "", s:cterm08, "", "") call hi("Visual", "", s:gui02, "", s:cterm02, "") call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") call hi("WildMenu", s:gui08, "", s:cterm08, "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none") if &background == "dark" call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") call hi("NonText", s:gui03, "", s:cterm03, "", "") call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") + call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") @@ -113,14 +111,15 @@ if &background == "dark" call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") call hi("PMenuSel", s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "none") - call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") + call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") else call hi("Cursor", s:gui00, s:gui02, s:cterm00, s:cterm02, "") call hi("NonText", s:gui05, "", s:cterm05, "", "") call hi("Normal", s:gui02, s:gui07, s:cterm02, s:cterm05, "") call hi("LineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") + call hi("SignColumn", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("SpecialKey", s:gui05, "", s:cterm05, "", "") call hi("StatusLine", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") call hi("StatusLineNC", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") @@ -130,9 +129,9 @@ else call hi("CursorLineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("PMenu", s:gui05, s:gui03, s:cterm05, s:cterm03, "none") call hi("PMenuSel", s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") + call hi("TabLine", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "reverse") endif " Standard Syntax Highlighting @@ -160,7 +159,6 @@ call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") call hi("String", s:gui0B, "", s:cterm0B, "", "") call hi("Structure", s:gui0E, "", s:cterm0E, "", "") call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Title", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "none") call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") call hi("Type", s:gui09, "", s:cterm09, "", "none") call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") @@ -172,15 +170,15 @@ call hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm0D, "") "call hi("SpellRare", s:gui00, s:gui08, s:cterm00, s:cterm08, "") " Additional Diff Highlighting -call hi("DiffAdd", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffChange", s:gui05, "", s:cterm05, "", "") -call hi("DiffDelete", s:gui08, "", s:cterm08, "", "") -call hi("DiffText", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffAdded", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffFile", s:gui08, "", s:cterm08, "", "") -call hi("DiffNewFile", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffLine", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffRemoved", s:gui08, "", s:cterm08, "", "") +call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") " Ruby Highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") @@ -227,9 +225,18 @@ call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") " Git Highlighting call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" Remove Highlighting Function -delf hi + +" GitGutter Highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") + +" GitGutter Highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") + +" remove highlighting function +delf hi " Remove Colour Variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim index 3e63d7e..55609fe 100644 --- a/colors/base16-greenscreen.vim +++ b/colors/base16-greenscreen.vim @@ -70,9 +70,6 @@ fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) endif endfun -" Clear highlighting -highlight clear SignColumn - " Vim Editor Colors call hi("Bold", "", "", "", "", "bold") call hi("Debug", s:gui08, "", s:cterm08, "", "") @@ -90,19 +87,20 @@ call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") call hi("Question", s:gui0A, "", s:cterm0A, "", "") call hi("Search", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "reverse") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("Title", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") call hi("TooLong", s:gui08, "", s:cterm08, "", "") call hi("Underlined", s:gui08, "", s:cterm08, "", "") call hi("Visual", "", s:gui02, "", s:cterm02, "") call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") call hi("WildMenu", s:gui08, "", s:cterm08, "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none") if &background == "dark" call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") call hi("NonText", s:gui03, "", s:cterm03, "", "") call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") + call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") @@ -113,14 +111,15 @@ if &background == "dark" call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") call hi("PMenuSel", s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "none") - call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") + call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") else call hi("Cursor", s:gui00, s:gui02, s:cterm00, s:cterm02, "") call hi("NonText", s:gui05, "", s:cterm05, "", "") call hi("Normal", s:gui02, s:gui07, s:cterm02, s:cterm05, "") call hi("LineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") + call hi("SignColumn", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("SpecialKey", s:gui05, "", s:cterm05, "", "") call hi("StatusLine", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") call hi("StatusLineNC", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") @@ -130,9 +129,9 @@ else call hi("CursorLineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("PMenu", s:gui05, s:gui03, s:cterm05, s:cterm03, "none") call hi("PMenuSel", s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") + call hi("TabLine", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "reverse") endif " Standard Syntax Highlighting @@ -160,7 +159,6 @@ call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") call hi("String", s:gui0B, "", s:cterm0B, "", "") call hi("Structure", s:gui0E, "", s:cterm0E, "", "") call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Title", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "none") call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") call hi("Type", s:gui09, "", s:cterm09, "", "none") call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") @@ -172,15 +170,15 @@ call hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm0D, "") "call hi("SpellRare", s:gui00, s:gui08, s:cterm00, s:cterm08, "") " Additional Diff Highlighting -call hi("DiffAdd", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffChange", s:gui05, "", s:cterm05, "", "") -call hi("DiffDelete", s:gui08, "", s:cterm08, "", "") -call hi("DiffText", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffAdded", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffFile", s:gui08, "", s:cterm08, "", "") -call hi("DiffNewFile", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffLine", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffRemoved", s:gui08, "", s:cterm08, "", "") +call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") " Ruby Highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") @@ -227,9 +225,18 @@ call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") " Git Highlighting call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" Remove Highlighting Function -delf hi + +" GitGutter Highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") + +" GitGutter Highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") + +" remove highlighting function +delf hi " Remove Colour Variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim index 838cb54..73a1cba 100644 --- a/colors/base16-mocha.vim +++ b/colors/base16-mocha.vim @@ -70,9 +70,6 @@ fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) endif endfun -" Clear highlighting -highlight clear SignColumn - " Vim Editor Colors call hi("Bold", "", "", "", "", "bold") call hi("Debug", s:gui08, "", s:cterm08, "", "") @@ -90,19 +87,20 @@ call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") call hi("Question", s:gui0A, "", s:cterm0A, "", "") call hi("Search", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "reverse") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("Title", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") call hi("TooLong", s:gui08, "", s:cterm08, "", "") call hi("Underlined", s:gui08, "", s:cterm08, "", "") call hi("Visual", "", s:gui02, "", s:cterm02, "") call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") call hi("WildMenu", s:gui08, "", s:cterm08, "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none") if &background == "dark" call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") call hi("NonText", s:gui03, "", s:cterm03, "", "") call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") + call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") @@ -113,14 +111,15 @@ if &background == "dark" call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") call hi("PMenuSel", s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "none") - call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") + call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") else call hi("Cursor", s:gui00, s:gui02, s:cterm00, s:cterm02, "") call hi("NonText", s:gui05, "", s:cterm05, "", "") call hi("Normal", s:gui02, s:gui07, s:cterm02, s:cterm05, "") call hi("LineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") + call hi("SignColumn", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("SpecialKey", s:gui05, "", s:cterm05, "", "") call hi("StatusLine", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") call hi("StatusLineNC", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") @@ -130,9 +129,9 @@ else call hi("CursorLineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("PMenu", s:gui05, s:gui03, s:cterm05, s:cterm03, "none") call hi("PMenuSel", s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") + call hi("TabLine", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "reverse") endif " Standard Syntax Highlighting @@ -160,7 +159,6 @@ call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") call hi("String", s:gui0B, "", s:cterm0B, "", "") call hi("Structure", s:gui0E, "", s:cterm0E, "", "") call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Title", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "none") call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") call hi("Type", s:gui09, "", s:cterm09, "", "none") call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") @@ -172,15 +170,15 @@ call hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm0D, "") "call hi("SpellRare", s:gui00, s:gui08, s:cterm00, s:cterm08, "") " Additional Diff Highlighting -call hi("DiffAdd", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffChange", s:gui05, "", s:cterm05, "", "") -call hi("DiffDelete", s:gui08, "", s:cterm08, "", "") -call hi("DiffText", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffAdded", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffFile", s:gui08, "", s:cterm08, "", "") -call hi("DiffNewFile", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffLine", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffRemoved", s:gui08, "", s:cterm08, "", "") +call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") " Ruby Highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") @@ -227,9 +225,18 @@ call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") " Git Highlighting call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" Remove Highlighting Function -delf hi + +" GitGutter Highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") + +" GitGutter Highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") + +" remove highlighting function +delf hi " Remove Colour Variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim index 1f150cf..d743358 100644 --- a/colors/base16-monokai.vim +++ b/colors/base16-monokai.vim @@ -70,9 +70,6 @@ fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) endif endfun -" Clear highlighting -highlight clear SignColumn - " Vim Editor Colors call hi("Bold", "", "", "", "", "bold") call hi("Debug", s:gui08, "", s:cterm08, "", "") @@ -90,19 +87,20 @@ call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") call hi("Question", s:gui0A, "", s:cterm0A, "", "") call hi("Search", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "reverse") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("Title", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") call hi("TooLong", s:gui08, "", s:cterm08, "", "") call hi("Underlined", s:gui08, "", s:cterm08, "", "") call hi("Visual", "", s:gui02, "", s:cterm02, "") call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") call hi("WildMenu", s:gui08, "", s:cterm08, "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none") if &background == "dark" call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") call hi("NonText", s:gui03, "", s:cterm03, "", "") call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") + call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") @@ -113,14 +111,15 @@ if &background == "dark" call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") call hi("PMenuSel", s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "none") - call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") + call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") else call hi("Cursor", s:gui00, s:gui02, s:cterm00, s:cterm02, "") call hi("NonText", s:gui05, "", s:cterm05, "", "") call hi("Normal", s:gui02, s:gui07, s:cterm02, s:cterm05, "") call hi("LineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") + call hi("SignColumn", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("SpecialKey", s:gui05, "", s:cterm05, "", "") call hi("StatusLine", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") call hi("StatusLineNC", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") @@ -130,9 +129,9 @@ else call hi("CursorLineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("PMenu", s:gui05, s:gui03, s:cterm05, s:cterm03, "none") call hi("PMenuSel", s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") + call hi("TabLine", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "reverse") endif " Standard Syntax Highlighting @@ -160,7 +159,6 @@ call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") call hi("String", s:gui0B, "", s:cterm0B, "", "") call hi("Structure", s:gui0E, "", s:cterm0E, "", "") call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Title", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "none") call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") call hi("Type", s:gui09, "", s:cterm09, "", "none") call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") @@ -172,15 +170,15 @@ call hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm0D, "") "call hi("SpellRare", s:gui00, s:gui08, s:cterm00, s:cterm08, "") " Additional Diff Highlighting -call hi("DiffAdd", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffChange", s:gui05, "", s:cterm05, "", "") -call hi("DiffDelete", s:gui08, "", s:cterm08, "", "") -call hi("DiffText", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffAdded", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffFile", s:gui08, "", s:cterm08, "", "") -call hi("DiffNewFile", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffLine", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffRemoved", s:gui08, "", s:cterm08, "", "") +call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") " Ruby Highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") @@ -227,9 +225,18 @@ call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") " Git Highlighting call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" Remove Highlighting Function -delf hi + +" GitGutter Highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") + +" GitGutter Highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") + +" remove highlighting function +delf hi " Remove Colour Variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim index bf76078..9d30de5 100644 --- a/colors/base16-ocean.vim +++ b/colors/base16-ocean.vim @@ -70,9 +70,6 @@ fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) endif endfun -" Clear highlighting -highlight clear SignColumn - " Vim Editor Colors call hi("Bold", "", "", "", "", "bold") call hi("Debug", s:gui08, "", s:cterm08, "", "") @@ -90,19 +87,20 @@ call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") call hi("Question", s:gui0A, "", s:cterm0A, "", "") call hi("Search", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "reverse") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("Title", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") call hi("TooLong", s:gui08, "", s:cterm08, "", "") call hi("Underlined", s:gui08, "", s:cterm08, "", "") call hi("Visual", "", s:gui02, "", s:cterm02, "") call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") call hi("WildMenu", s:gui08, "", s:cterm08, "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none") if &background == "dark" call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") call hi("NonText", s:gui03, "", s:cterm03, "", "") call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") + call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") @@ -113,14 +111,15 @@ if &background == "dark" call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") call hi("PMenuSel", s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "none") - call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") + call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") else call hi("Cursor", s:gui00, s:gui02, s:cterm00, s:cterm02, "") call hi("NonText", s:gui05, "", s:cterm05, "", "") call hi("Normal", s:gui02, s:gui07, s:cterm02, s:cterm05, "") call hi("LineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") + call hi("SignColumn", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("SpecialKey", s:gui05, "", s:cterm05, "", "") call hi("StatusLine", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") call hi("StatusLineNC", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") @@ -130,9 +129,9 @@ else call hi("CursorLineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("PMenu", s:gui05, s:gui03, s:cterm05, s:cterm03, "none") call hi("PMenuSel", s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") + call hi("TabLine", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "reverse") endif " Standard Syntax Highlighting @@ -160,7 +159,6 @@ call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") call hi("String", s:gui0B, "", s:cterm0B, "", "") call hi("Structure", s:gui0E, "", s:cterm0E, "", "") call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Title", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "none") call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") call hi("Type", s:gui09, "", s:cterm09, "", "none") call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") @@ -172,15 +170,15 @@ call hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm0D, "") "call hi("SpellRare", s:gui00, s:gui08, s:cterm00, s:cterm08, "") " Additional Diff Highlighting -call hi("DiffAdd", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffChange", s:gui05, "", s:cterm05, "", "") -call hi("DiffDelete", s:gui08, "", s:cterm08, "", "") -call hi("DiffText", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffAdded", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffFile", s:gui08, "", s:cterm08, "", "") -call hi("DiffNewFile", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffLine", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffRemoved", s:gui08, "", s:cterm08, "", "") +call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") " Ruby Highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") @@ -227,9 +225,18 @@ call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") " Git Highlighting call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" Remove Highlighting Function -delf hi + +" GitGutter Highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") + +" GitGutter Highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") + +" remove highlighting function +delf hi " Remove Colour Variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim index c29ffab..fc3134b 100644 --- a/colors/base16-railscasts.vim +++ b/colors/base16-railscasts.vim @@ -70,9 +70,6 @@ fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) endif endfun -" Clear highlighting -highlight clear SignColumn - " Vim Editor Colors call hi("Bold", "", "", "", "", "bold") call hi("Debug", s:gui08, "", s:cterm08, "", "") @@ -90,19 +87,20 @@ call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") call hi("Question", s:gui0A, "", s:cterm0A, "", "") call hi("Search", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "reverse") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("Title", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") call hi("TooLong", s:gui08, "", s:cterm08, "", "") call hi("Underlined", s:gui08, "", s:cterm08, "", "") call hi("Visual", "", s:gui02, "", s:cterm02, "") call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") call hi("WildMenu", s:gui08, "", s:cterm08, "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none") if &background == "dark" call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") call hi("NonText", s:gui03, "", s:cterm03, "", "") call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") + call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") @@ -113,14 +111,15 @@ if &background == "dark" call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") call hi("PMenuSel", s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "none") - call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") + call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") else call hi("Cursor", s:gui00, s:gui02, s:cterm00, s:cterm02, "") call hi("NonText", s:gui05, "", s:cterm05, "", "") call hi("Normal", s:gui02, s:gui07, s:cterm02, s:cterm05, "") call hi("LineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") + call hi("SignColumn", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("SpecialKey", s:gui05, "", s:cterm05, "", "") call hi("StatusLine", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") call hi("StatusLineNC", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") @@ -130,9 +129,9 @@ else call hi("CursorLineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("PMenu", s:gui05, s:gui03, s:cterm05, s:cterm03, "none") call hi("PMenuSel", s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") + call hi("TabLine", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "reverse") endif " Standard Syntax Highlighting @@ -160,7 +159,6 @@ call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") call hi("String", s:gui0B, "", s:cterm0B, "", "") call hi("Structure", s:gui0E, "", s:cterm0E, "", "") call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Title", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "none") call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") call hi("Type", s:gui09, "", s:cterm09, "", "none") call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") @@ -172,15 +170,15 @@ call hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm0D, "") "call hi("SpellRare", s:gui00, s:gui08, s:cterm00, s:cterm08, "") " Additional Diff Highlighting -call hi("DiffAdd", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffChange", s:gui05, "", s:cterm05, "", "") -call hi("DiffDelete", s:gui08, "", s:cterm08, "", "") -call hi("DiffText", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffAdded", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffFile", s:gui08, "", s:cterm08, "", "") -call hi("DiffNewFile", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffLine", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffRemoved", s:gui08, "", s:cterm08, "", "") +call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") " Ruby Highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") @@ -227,9 +225,18 @@ call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") " Git Highlighting call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" Remove Highlighting Function -delf hi + +" GitGutter Highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") + +" GitGutter Highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") + +" remove highlighting function +delf hi " Remove Colour Variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-solarized.vim b/colors/base16-solarized.vim index 57dcd82..a53d1fc 100644 --- a/colors/base16-solarized.vim +++ b/colors/base16-solarized.vim @@ -70,9 +70,6 @@ fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) endif endfun -" Clear highlighting -highlight clear SignColumn - " Vim Editor Colors call hi("Bold", "", "", "", "", "bold") call hi("Debug", s:gui08, "", s:cterm08, "", "") @@ -90,19 +87,20 @@ call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") call hi("Question", s:gui0A, "", s:cterm0A, "", "") call hi("Search", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "reverse") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("Title", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") call hi("TooLong", s:gui08, "", s:cterm08, "", "") call hi("Underlined", s:gui08, "", s:cterm08, "", "") call hi("Visual", "", s:gui02, "", s:cterm02, "") call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") call hi("WildMenu", s:gui08, "", s:cterm08, "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none") if &background == "dark" call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") call hi("NonText", s:gui03, "", s:cterm03, "", "") call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") + call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") @@ -113,14 +111,15 @@ if &background == "dark" call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") call hi("PMenuSel", s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "none") - call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") + call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") else call hi("Cursor", s:gui00, s:gui02, s:cterm00, s:cterm02, "") call hi("NonText", s:gui05, "", s:cterm05, "", "") call hi("Normal", s:gui02, s:gui07, s:cterm02, s:cterm05, "") call hi("LineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") + call hi("SignColumn", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("SpecialKey", s:gui05, "", s:cterm05, "", "") call hi("StatusLine", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") call hi("StatusLineNC", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") @@ -130,9 +129,9 @@ else call hi("CursorLineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("PMenu", s:gui05, s:gui03, s:cterm05, s:cterm03, "none") call hi("PMenuSel", s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") + call hi("TabLine", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "reverse") endif " Standard Syntax Highlighting @@ -160,7 +159,6 @@ call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") call hi("String", s:gui0B, "", s:cterm0B, "", "") call hi("Structure", s:gui0E, "", s:cterm0E, "", "") call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Title", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "none") call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") call hi("Type", s:gui09, "", s:cterm09, "", "none") call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") @@ -172,15 +170,15 @@ call hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm0D, "") "call hi("SpellRare", s:gui00, s:gui08, s:cterm00, s:cterm08, "") " Additional Diff Highlighting -call hi("DiffAdd", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffChange", s:gui05, "", s:cterm05, "", "") -call hi("DiffDelete", s:gui08, "", s:cterm08, "", "") -call hi("DiffText", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffAdded", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffFile", s:gui08, "", s:cterm08, "", "") -call hi("DiffNewFile", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffLine", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffRemoved", s:gui08, "", s:cterm08, "", "") +call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") " Ruby Highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") @@ -227,9 +225,18 @@ call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") " Git Highlighting call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" Remove Highlighting Function -delf hi + +" GitGutter Highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") + +" GitGutter Highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") + +" remove highlighting function +delf hi " Remove Colour Variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim index 0c34775..7e949ce 100644 --- a/colors/base16-tomorrow.vim +++ b/colors/base16-tomorrow.vim @@ -70,9 +70,6 @@ fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) endif endfun -" Clear highlighting -highlight clear SignColumn - " Vim Editor Colors call hi("Bold", "", "", "", "", "bold") call hi("Debug", s:gui08, "", s:cterm08, "", "") @@ -90,19 +87,20 @@ call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") call hi("Question", s:gui0A, "", s:cterm0A, "", "") call hi("Search", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "reverse") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("Title", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") call hi("TooLong", s:gui08, "", s:cterm08, "", "") call hi("Underlined", s:gui08, "", s:cterm08, "", "") call hi("Visual", "", s:gui02, "", s:cterm02, "") call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") call hi("WildMenu", s:gui08, "", s:cterm08, "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none") if &background == "dark" call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") call hi("NonText", s:gui03, "", s:cterm03, "", "") call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") + call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") @@ -113,14 +111,15 @@ if &background == "dark" call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") call hi("PMenuSel", s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "none") - call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "none") + call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") else call hi("Cursor", s:gui00, s:gui02, s:cterm00, s:cterm02, "") call hi("NonText", s:gui05, "", s:cterm05, "", "") call hi("Normal", s:gui02, s:gui07, s:cterm02, s:cterm05, "") call hi("LineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") + call hi("SignColumn", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("SpecialKey", s:gui05, "", s:cterm05, "", "") call hi("StatusLine", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") call hi("StatusLineNC", s:gui04, s:gui06, s:cterm04, s:cterm06, "none") @@ -130,9 +129,9 @@ else call hi("CursorLineNr", s:gui04, s:gui06, s:cterm04, s:cterm06, "") call hi("PMenu", s:gui05, s:gui03, s:cterm05, s:cterm03, "none") call hi("PMenuSel", s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse") - call hi("TabLine", s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse") + call hi("TabLine", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") call hi("TabLineFill", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") - call hi("TabLineSel", s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse") + call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "reverse") endif " Standard Syntax Highlighting @@ -160,7 +159,6 @@ call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") call hi("String", s:gui0B, "", s:cterm0B, "", "") call hi("Structure", s:gui0E, "", s:cterm0E, "", "") call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Title", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "none") call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") call hi("Type", s:gui09, "", s:cterm09, "", "none") call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") @@ -172,15 +170,15 @@ call hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm0D, "") "call hi("SpellRare", s:gui00, s:gui08, s:cterm00, s:cterm08, "") " Additional Diff Highlighting -call hi("DiffAdd", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffChange", s:gui05, "", s:cterm05, "", "") -call hi("DiffDelete", s:gui08, "", s:cterm08, "", "") -call hi("DiffText", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffAdded", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffFile", s:gui08, "", s:cterm08, "", "") -call hi("DiffNewFile", s:gui0B, "", s:cterm0B, "", "") -call hi("DiffLine", s:gui0D, "", s:cterm0D, "", "") -call hi("DiffRemoved", s:gui08, "", s:cterm08, "", "") +call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") " Ruby Highlighting call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") @@ -227,9 +225,18 @@ call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") " Git Highlighting call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") - -" Remove Highlighting Function -delf hi + +" GitGutter Highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") + +" GitGutter Highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") + +" remove highlighting function +delf hi " Remove Colour Variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F -- cgit v1.2.3