assorted vim theme tweaks

3 files changed, 114 insertions, 125 deletions

diff --git a/stow/vim/.vim/autoload/airline/themes/mono.vim b/stow/vim/.vim/autoload/airline/themes/mono.vim
index 828a668..ad89276 100644
--- a/stow/vim/.vim/autoload/airline/themes/mono.vim
+++ b/stow/vim/.vim/autoload/airline/themes/mono.vim
@@ -1,55 +1,43 @@
 " Foreground colors
-let s:black           = { "gui": "#303030", "cterm": "236" }
-let s:light_black     = { "gui": "#585858", "cterm": "240" }
-let s:blue_fg         = { "gui": "#00005f", "cterm":  "17" }
-let s:green_fg        = { "gui": "#005f00", "cterm":  "22" }
-let s:cyan_fg         = { "gui": "#005f5f", "cterm":  "23" }
-let s:red_fg          = { "gui": "#5f0000", "cterm":  "52" }
-let s:purple_fg       = { "gui": "#5f005f", "cterm":  "53" }
-let s:yellow_fg       = { "gui": "#5f5f00", "cterm":  "58" }
+let b:black           = { "gui": "#303030", "cterm": "236" }
+let b:red_fg          = { "gui": "#5f0000", "cterm":  "52" }
 
 " Background colors
-let s:white           = { "gui": "#ffffff", "cterm": "231" }
-let s:light_gray      = { "gui": "#eeeeee", "cterm": "255" }
-let s:md_gray         = { "gui": "#dadada", "cterm": "253" }
-let s:blue_bg         = { 'gui': '#d7d7ff', 'cterm': '189' }
-let s:green_bg        = { 'gui': '#d7ffd7', 'cterm': '194' }
-let s:cyan_bg         = { 'gui': '#d7ffff', 'cterm': '195' }
-let s:red_bg          = { 'gui': '#ffd7d7', 'cterm': '224' }
-let s:purple_bg       = { 'gui': '#ffd7ff', 'cterm': '225' }
-let s:yellow_bg       = { 'gui': '#ffffd7', 'cterm': '230' }
+let b:light_gray      = { "gui": "#eeeeee", "cterm": "255" }
+let b:md_gray         = { "gui": "#dadada", "cterm": "253" }
+let b:dk_gray         = { "gui": "#c6c6c6", "cterm": "251" }
+let b:cyan_bg         = { 'gui': '#afd7d7', 'cterm': '152' }
+let b:red_bg          = { 'gui': '#ff8787', 'cterm': '210' }
+let b:gold_bg         = { 'gui': '#ffd787', 'cterm': '222' }
 
 " Color sets
-let s:dark    = [ s:black.gui , s:md_gray.gui    , s:black.cterm , s:md_gray.cterm    ]
-let s:light   = [ s:black.gui , s:light_gray.gui , s:black.cterm , s:light_gray.cterm ]
-let s:blue    = [ s:black.gui , s:blue_bg.gui    , s:black.cterm , s:blue_bg.cterm    ]
-let s:yellow  = [ s:black.gui , s:yellow_bg.gui  , s:black.cterm , s:yellow_bg.cterm  ]
-let s:red     = [ s:black.gui , s:red_bg.gui     , s:black.cterm , s:red_bg.cterm     ]
-let s:green   = [ s:black.gui , s:green_bg.gui   , s:black.cterm , s:green_bg.cterm   ]
+let b:darker  = [ b:black.gui , b:dk_gray.gui    , b:black.cterm , b:dk_gray.cterm    ]
+let b:dark    = [ b:black.gui , b:md_gray.gui    , b:black.cterm , b:md_gray.cterm    ]
+let b:light   = [ b:black.gui , b:light_gray.gui , b:black.cterm , b:light_gray.cterm ]
+let b:red     = [ b:black.gui , b:red_bg.gui     , b:black.cterm , b:red_bg.cterm     ]
+let b:gold    = [ b:black.gui , b:gold_bg.gui    , b:black.cterm , b:gold_bg.cterm    ]
+let b:cyan    = [ b:black.gui , b:cyan_bg.gui    , b:black.cterm , b:cyan_bg.cterm    ]
 
 let g:airline#themes#mono#palette = {}
 
 let g:airline#themes#mono#palette.accents = {
-      \ 'red': [ s:red_fg.gui , '' , s:red_fg.cterm , '' ],
+      \ 'red': [ b:red_fg.gui , '' , b:red_fg.cterm , '' ],
       \ }
 
 " Normal Mode
-let g:airline#themes#mono#palette.normal = airline#themes#generate_color_map(s:blue, s:dark, s:light)
+let g:airline#themes#mono#palette.normal = airline#themes#generate_color_map(b:darker, b:dark, b:light)
 
 " Insert Mode
 let g:airline#themes#mono#palette.insert = copy(g:airline#themes#mono#palette.normal)
-let g:airline#themes#mono#palette.insert.airline_a = s:yellow
-let g:airline#themes#mono#palette.insert.airline_z = s:yellow
+let g:airline#themes#mono#palette.insert.airline_a = b:gold
 
 " Replace Mode
 let g:airline#themes#mono#palette.replace = copy(g:airline#themes#mono#palette.normal)
-let g:airline#themes#mono#palette.replace.airline_a = s:red
-let g:airline#themes#mono#palette.replace.airline_z = s:red
+let g:airline#themes#mono#palette.replace.airline_a = b:red
 
 " Visual Mode
 let g:airline#themes#mono#palette.visual = copy(g:airline#themes#mono#palette.normal)
-let g:airline#themes#mono#palette.visual.airline_a = s:green
-let g:airline#themes#mono#palette.visual.airline_z = s:green
+let g:airline#themes#mono#palette.visual.airline_a = b:cyan
 
 " Inactive
-let g:airline#themes#mono#palette.inactive = airline#themes#generate_color_map(s:light, s:light, s:light)
+let g:airline#themes#mono#palette.inactive = airline#themes#generate_color_map(b:light, b:light, b:light)
diff --git a/stow/vim/.vim/colors/mono.vim b/stow/vim/.vim/colors/mono.vim
index ccae503..5313523 100644
--- a/stow/vim/.vim/colors/mono.vim
+++ b/stow/vim/.vim/colors/mono.vim
@@ -20,36 +20,36 @@ endif
 let g:colors_name='mono'
 
 " Foreground colors
-let s:black           = { "gui": "#303030", "cterm": "236" }
-let s:light_black     = { "gui": "#585858", "cterm": "240" }
-let s:blue_fg         = { "gui": "#00005f", "cterm":  "17" }
-let s:green_fg        = { "gui": "#005f00", "cterm":  "22" }
-let s:cyan_fg         = { "gui": "#005f5f", "cterm":  "23" }
-let s:red_fg          = { "gui": "#5f0000", "cterm":  "52" }
-let s:purple_fg       = { "gui": "#5f005f", "cterm":  "53" }
-let s:yellow_fg       = { "gui": "#5f5f00", "cterm":  "58" }
+let b:black           = { "gui": "#303030", "cterm": "236" }
+let b:light_black     = { "gui": "#585858", "cterm": "240" }
+let b:blue_fg         = { "gui": "#00005f", "cterm":  "17" }
+let b:green_fg        = { "gui": "#005f00", "cterm":  "22" }
+let b:cyan_fg         = { "gui": "#005f5f", "cterm":  "23" }
+let b:red_fg          = { "gui": "#5f0000", "cterm":  "52" }
+let b:purple_fg       = { "gui": "#5f005f", "cterm":  "53" }
+let b:yellow_fg       = { "gui": "#5f5f00", "cterm":  "58" }
 
 " background colors
-let s:white           = { "gui": "#ffffff", "cterm": "231" }
-let s:light_gray      = { "gui": "#eeeeee", "cterm": "255" }
-let s:blue_bg         = { 'gui': '#d7d7ff', 'cterm': '189' }
-let s:green_bg        = { 'gui': '#d7ffd7', 'cterm': '194' }
-let s:cyan_bg         = { 'gui': '#d7ffff', 'cterm': '195' }
-let s:red_bg          = { 'gui': '#ffd7d7', 'cterm': '224' }
-let s:purple_bg       = { 'gui': '#ffd7ff', 'cterm': '225' }
-let s:yellow_bg       = { 'gui': '#ffffd7', 'cterm': '230' }
-
-let s:bg              = s:white
-let s:bg_subtle       = s:light_gray
-let s:norm            = s:black
-
-let s:blue            = s:blue_fg
-let s:purple          = s:purple_fg
-let s:cyan            = s:cyan_fg
-let s:green           = s:green_fg
-let s:red             = s:red_fg
-let s:yellow          = s:yellow_fg
-let s:visual          = s:cyan_bg
+let b:white           = { "gui": "#ffffff", "cterm": "231" }
+let b:light_gray      = { "gui": "#eeeeee", "cterm": "255" }
+let b:blue_bg         = { 'gui': '#d7d7ff', 'cterm': '189' }
+let b:green_bg        = { 'gui': '#d7ffd7', 'cterm': '194' }
+let b:cyan_bg         = { 'gui': '#d7ffff', 'cterm': '195' }
+let b:red_bg          = { 'gui': '#ffd7d7', 'cterm': '224' }
+let b:purple_bg       = { 'gui': '#ffd7ff', 'cterm': '225' }
+let b:yellow_bg       = { 'gui': '#ffffd7', 'cterm': '230' }
+
+let b:bg              = b:white
+let b:bg_subtle       = b:light_gray
+let b:norm            = b:black
+
+let b:blue            = b:blue_fg
+let b:purple          = b:purple_fg
+let b:cyan            = b:cyan_fg
+let b:green           = b:green_fg
+let b:red             = b:red_fg
+let b:yellow          = b:yellow_fg
+let b:visual          = b:cyan_bg
 
 " https://github.com/noahfrederick/vim-hemisu/
 function! s:h(group, style)
@@ -63,10 +63,10 @@ function! s:h(group, style)
     \ "cterm="   (has_key(a:style, "cterm") ? a:style.cterm    : "NONE")
 endfunction
 
-call s:h("Normal",        {"bg": s:bg, "fg": s:norm})
-call s:h("Comment",       {"fg": s:light_black})
+call s:h("Normal",        {"bg": b:bg, "fg": b:norm})
+call s:h("Comment",       {"fg": b:light_black})
 
-call s:h("Constant",      {"fg": s:cyan})
+call s:h("Constant",      {"fg": b:cyan})
 "hi! link Constant         Normal
 hi! link Character        Constant
 hi! link Number           Constant
@@ -74,11 +74,11 @@ hi! link Boolean          Constant
 hi! link Float            Constant
 hi! link String           Constant
 
-"call s:h("Identifier",    {"fg": s:text_blue})
+"call s:h("Identifier",    {"fg": b:text_blue})
 hi! link Identifier       Normal
 hi! link Function         Identifier
 
-"call s:h("Statement",     {"fg": s:text_green})
+"call s:h("Statement",     {"fg": b:text_green})
 call s:h("Statement",     {"gui": "bold", "cterm": "bold"})
 "hi! link Statement        Normal
 hi! link Conditonal       Statement
@@ -88,7 +88,7 @@ hi! link Operator         Statement
 hi! link Keyword          Statement
 hi! link Exception        Statement
 
-"call s:h("PreProc",       {"fg": s:text_red})
+"call s:h("PreProc",       {"fg": b:text_red})
 call s:h("PreProc",       {"cterm": "bold"})
 "hi! link PreProc          Normal
 hi! link Include          PreProc
@@ -96,13 +96,13 @@ hi! link Define           PreProc
 hi! link Macro            PreProc
 hi! link PreCondit        PreProc
 
-"call s:h("Type",          {"fg": s:text_purple})
+"call s:h("Type",          {"fg": b:text_purple})
 hi! link Type             Normal
 hi! link StorageClass     Type
 hi! link Structure        Type
 hi! link Typedef          Type
 
-"call s:h("Special",       {"fg": s:text_red})
+"call s:h("Special",       {"fg": b:text_red})
 hi! link Special          Normal
 hi! link SpecialChar      Special
 hi! link Tag              Special
@@ -110,69 +110,69 @@ hi! link Delimiter        Special
 hi! link SpecialComment   Special
 hi! link Debug            Special
 
-call s:h("Underlined",    {"fg": s:norm, "gui": "underline", "cterm": "underline"})
-call s:h("Ignore",        {"fg": s:bg})
-call s:h("Error",         {"fg": s:white, "bg": s:red, "cterm": "bold"})
-call s:h("Todo",          {"fg": s:red_fg, "bg": s:red_bg, "gui": "bold,underline", "cterm": "bold,underline"})
-call s:h("SpecialKey",    {"fg": s:yellow})
-call s:h("NonText",       {"fg": s:light_black})
-call s:h("Directory",     {"fg": s:blue})
-call s:h("ErrorMsg",      {"fg": s:red})
-call s:h("IncSearch",     {"bg": s:yellow_bg, "gui": "bold,underline", "cterm": "bold,underline"})
-call s:h("Search",        {"bg": s:yellow_bg})
-call s:h("MoreMsg",       {"fg": s:light_black, "cterm": "bold", "gui": "bold"})
+call s:h("Underlined",    {"fg": b:norm, "gui": "underline", "cterm": "underline"})
+call s:h("Ignore",        {"fg": b:bg})
+call s:h("Error",         {"fg": b:white, "bg": b:red, "cterm": "bold"})
+call s:h("Todo",          {"fg": b:red_fg, "bg": b:red_bg, "gui": "bold,underline", "cterm": "bold,underline"})
+call s:h("SpecialKey",    {"fg": b:yellow})
+call s:h("NonText",       {"fg": b:light_black})
+call s:h("Directory",     {"fg": b:blue})
+call s:h("ErrorMsg",      {"fg": b:red})
+call s:h("IncSearch",     {"bg": b:yellow_bg, "gui": "bold,underline", "cterm": "bold,underline"})
+call s:h("Search",        {"bg": b:yellow_bg})
+call s:h("MoreMsg",       {"fg": b:light_black, "cterm": "bold", "gui": "bold"})
 hi! link ModeMsg MoreMsg
-call s:h("LineNr",        {"fg": s:bg_subtle})
-call s:h("CursorLineNr",  {"fg": s:blue, "bg": s:bg_subtle})
-call s:h("Question",      {"fg": s:red})
-call s:h("StatusLine",    {"bg": s:bg_subtle})
-call s:h("StatusLineNC",  {"bg": s:bg_subtle, "fg": s:light_black})
-call s:h("VertSplit",     {"bg": s:bg_subtle, "fg": s:bg_subtle})
-call s:h("Title",         {"fg": s:blue})
-call s:h("Visual",        {"bg": s:visual})
-call s:h("VisualNOS",     {"bg": s:bg_subtle})
-call s:h("WarningMsg",    {"fg": s:red})
-call s:h("WildMenu",      {"fg": s:bg, "bg": s:norm})
-call s:h("Folded",        {"fg": s:light_black})
-call s:h("FoldColumn",    {"fg": s:bg_subtle})
-call s:h("DiffAdd",       {"fg": s:green})
-call s:h("DiffDelete",    {"fg": s:red})
-call s:h("DiffChange",    {"fg": s:yellow})
-call s:h("DiffText",      {"fg": s:blue})
-call s:h("SignColumn",    {"fg": s:yellow})
+call s:h("LineNr",        {"fg": b:bg_subtle})
+call s:h("CursorLineNr",  {"fg": b:blue, "bg": b:bg_subtle})
+call s:h("Question",      {"fg": b:red})
+call s:h("StatusLine",    {"bg": b:bg_subtle})
+call s:h("StatusLineNC",  {"bg": b:bg_subtle, "fg": b:light_black})
+call s:h("VertSplit",     {"bg": b:bg_subtle, "fg": b:bg_subtle})
+call s:h("Title",         {"fg": b:blue})
+call s:h("Visual",        {"bg": b:visual})
+call s:h("VisualNOS",     {"bg": b:bg_subtle})
+call s:h("WarningMsg",    {"fg": b:red})
+call s:h("WildMenu",      {"fg": b:bg, "bg": b:norm})
+call s:h("Folded",        {"fg": b:light_black})
+call s:h("FoldColumn",    {"fg": b:bg_subtle})
+call s:h("DiffAdd",       {"fg": b:green})
+call s:h("DiffDelete",    {"fg": b:red})
+call s:h("DiffChange",    {"fg": b:yellow})
+call s:h("DiffText",      {"fg": b:blue})
+call s:h("SignColumn",    {"fg": b:yellow})
 
 if has("gui_running")
-  call s:h("SpellBad",    {"gui": "underline", "sp": s:red})
-  call s:h("SpellCap",    {"gui": "underline", "sp": s:yellow})
-  call s:h("SpellRare",   {"gui": "underline", "sp": s:purple})
-  call s:h("SpellLocal",  {"gui": "underline", "sp": s:green})
+  call s:h("SpellBad",    {"gui": "underline", "sp": b:red})
+  call s:h("SpellCap",    {"gui": "underline", "sp": b:yellow})
+  call s:h("SpellRare",   {"gui": "underline", "sp": b:purple})
+  call s:h("SpellLocal",  {"gui": "underline", "sp": b:green})
 else
-  call s:h("SpellBad",    {"cterm": "underline", "fg": s:red})
-  call s:h("SpellCap",    {"cterm": "underline", "fg": s:yellow})
-  call s:h("SpellRare",   {"cterm": "underline", "fg": s:purple})
-  call s:h("SpellLocal",  {"cterm": "underline", "fg": s:green})
+  call s:h("SpellBad",    {"cterm": "underline", "fg": b:red})
+  call s:h("SpellCap",    {"cterm": "underline", "fg": b:yellow})
+  call s:h("SpellRare",   {"cterm": "underline", "fg": b:purple})
+  call s:h("SpellLocal",  {"cterm": "underline", "fg": b:green})
 endif
 
-call s:h("Pmenu",         {"fg": s:norm, "bg": s:bg_subtle})
-call s:h("PmenuSel",      {"fg": s:white, "bg": s:blue})
-call s:h("PmenuSbar",     {"fg": s:norm, "bg": s:bg_subtle})
-call s:h("PmenuThumb",    {"fg": s:norm, "bg": s:bg_subtle})
-call s:h("TabLine",       {"fg": s:norm, "bg": s:bg_subtle})
-call s:h("TabLineSel",    {"fg": s:blue, "bg": s:bg_subtle, "gui": "bold", "cterm": "bold"})
-call s:h("TabLineFill",   {"fg": s:norm, "bg": s:bg_subtle})
-call s:h("CursorColumn",  {"bg": s:bg_subtle})
-call s:h("CursorLine",    {"fg": s:norm, "bg": s:bg_subtle})
-call s:h("ColorColumn",   {"bg": s:bg_subtle})
-
-call s:h("MatchParen",    {"bg": s:bg_subtle, "fg": s:norm})
-call s:h("qfLineNr",      {"fg": s:light_black})
-
-call s:h("htmlH1",        {"bg": s:bg, "fg": s:norm})
-call s:h("htmlH2",        {"bg": s:bg, "fg": s:norm})
-call s:h("htmlH3",        {"bg": s:bg, "fg": s:norm})
-call s:h("htmlH4",        {"bg": s:bg, "fg": s:norm})
-call s:h("htmlH5",        {"bg": s:bg, "fg": s:norm})
-call s:h("htmlH6",        {"bg": s:bg, "fg": s:norm})
+call s:h("Pmenu",         {"fg": b:norm, "bg": b:bg_subtle})
+call s:h("PmenuSel",      {"fg": b:white, "bg": b:blue})
+call s:h("PmenuSbar",     {"fg": b:norm, "bg": b:bg_subtle})
+call s:h("PmenuThumb",    {"fg": b:norm, "bg": b:bg_subtle})
+call s:h("TabLine",       {"fg": b:norm, "bg": b:bg_subtle})
+call s:h("TabLineSel",    {"fg": b:blue, "bg": b:bg_subtle, "gui": "bold", "cterm": "bold"})
+call s:h("TabLineFill",   {"fg": b:norm, "bg": b:bg_subtle})
+call s:h("CursorColumn",  {"bg": b:bg_subtle})
+call s:h("CursorLine",    {"fg": b:norm, "bg": b:bg_subtle})
+call s:h("ColorColumn",   {"bg": b:bg_subtle})
+
+call s:h("MatchParen",    {"bg": b:bg_subtle, "fg": b:norm})
+call s:h("qfLineNr",      {"fg": b:light_black})
+
+call s:h("htmlH1",        {"bg": b:bg, "fg": b:norm})
+call s:h("htmlH2",        {"bg": b:bg, "fg": b:norm})
+call s:h("htmlH3",        {"bg": b:bg, "fg": b:norm})
+call s:h("htmlH4",        {"bg": b:bg, "fg": b:norm})
+call s:h("htmlH5",        {"bg": b:bg, "fg": b:norm})
+call s:h("htmlH6",        {"bg": b:bg, "fg": b:norm})
 
 hi link diffRemoved       DiffDelete
 hi link diffAdded         DiffAdd
diff --git a/stow/vim/.vimrc b/stow/vim/.vimrc
index 2d32bbe..f8b8f23 100644
--- a/stow/vim/.vimrc
+++ b/stow/vim/.vimrc
@@ -102,6 +102,7 @@ hi clear SpecialKey
 hi link SpecialKey Error
 
 let g:airline_skip_empty_sections = 1
+let g:airline_symbols_ascii = 1
 
 "
 " local additions