Improve the theme a bunch

This commit is contained in:
Kevin MacMartin 2023-05-30 15:03:45 -04:00
parent 03d0b64c2a
commit 92ccaa8325
3 changed files with 63 additions and 58 deletions

View file

@ -48,15 +48,15 @@ endfun
"SYNTAX COLORS:
"SPELL CHECKING UNDERLINE: (blue, yellow, none, none) {{{
call s:C("SpellBad",g:cRed,"","italic,underline")
call s:C("SpellCap",g:cYellow,"","italic,underline")
"SPELL CHECKING UNDERLINE: {{{
call s:C("SpellBad","","","italic,underline")
call s:C("SpellCap","","","italic,underline")
call s:C("SpellRare","","","")
call s:C("SpellLocal","","","")
"}}}
"CORE: {{{
call s:C("Normal",g:cNormalText,g:cDarkGrayBg,"")
call s:C("Normal",g:cLightText,g:cDarkGrayBg,"")
hi Normal ctermfg=254 ctermbg=235
hi! link Conceal Normal
@ -71,13 +71,13 @@ endfun
hi LineNr ctermfg=239
call s:C("Visual","",g:cDarkGrayBg,"standout")
call s:C("VertSplit",g:cDarkText,"","")
call s:C("VertSplit",g:cGray,"","")
call s:C("MatchParen","",g:cLightGrayBg,"bold")
"whitespace
call s:C("TabLine","",g:cBlack,"")
call s:C("TabLineFill","",g:cBlack,"")
call s:C("TabLineSel",g:cBlack,g:cDarkText,"")
call s:C("TabLineSel",g:cBlack,g:cGray,"")
call s:C("ExtraWhiteSpace",g:cDarkRed,g:cDarkGrayBg,"")
"menu call
@ -95,23 +95,23 @@ endfun
"status line
call s:C("StatusLine","",g:cLightGrayBg,"")
hi! link StatusLineNC StatusLine
call s:C("WildMenu",g:cDarkText,g:cLightGrayBg,"")
call s:C("WildMenu",g:cGray,g:cLightGrayBg,"")
"folding
call s:C("Folded",g:cBlue,g:cLightGrayBg,"bold")
call s:C("FoldColumn",g:cNormalText,"","bold")
call s:C("FoldColumn",g:cLightText,"","bold")
call s:C("SignColumn",g:cRed,"","bold")
hi! link ColorColumn SignColumn
"syntax style
call s:C("Boolean",g:cBlue,"","bold")
call s:C("Boolean",g:cYellow,"","bold")
call s:C("Comment",g:cLightGrayFg,"","italic")
call s:C("Conditional",g:cYellow,"","")
call s:C("Constant",g:cBlue,"","bold")
call s:C("Constant",g:cYellow,"","bold")
call s:C("Delimiter",g:cWhite,"","")
call s:C("Directory",g:cBlue,"","")
call s:C("Function",g:cBlue,"","")
call s:C("Identifier",g:cBlue,"","bold")
call s:C("Identifier",g:cDarkText,"","bold")
call s:C("Keyword",g:cYellow,"","bold")
call s:C("Label",g:cRed,"","")
call s:C("NonText",g:cBlue,"","")
@ -124,10 +124,10 @@ endfun
call s:C("Statement",g:cYellow,"","")
call s:C("String",g:cWhite,"","bold")
call s:C("StringDelimiter",g:cDarkText,"","")
call s:C("Tag",g:cBlue,"","bold")
call s:C("Tag",g:cYellow,"","")
call s:C("Title",g:cRed,"","bold")
call s:C("Todo",g:cRed,"","bold")
call s:C("Type",g:cRed,"","bold")
call s:C("Type",g:cDarkText,"","bold")
call s:C("Typedef",g:cRed,"","bold")
hi! link Character String
hi! link Float Number
@ -146,10 +146,27 @@ endfun
call s:C("DiffAdd",g:cYellow,"","standout")
call s:C("DiffChange",g:cBlue,"","standout")
call s:C("DiffDelete",g:cRed,"","standout")
call s:C("DiffText",g:cLightText,"","standout")
call s:C("DiffText",g:cDarkText,"","standout")
"}}}
"SYNTAX: {{{
"LANGUAGE: {{{
"c
call s:C("cBraces",g:cYellow,"","")
hi! link cBlock String
hi! link cBlock cBraces
hi! link cNumbersCom Number
"coffeeScript
hi! link coffeeRegExp javaScriptRegexpString
"dosini
hi! link dosiniLabel Function
"gitcommit
call s:C("gitcommitSummary",g:cLightText,"","")
call s:C("gitcommitType",g:cBlue,"","")
call s:C("gitcommitFile",g:cRed,"","")
"html
call s:C("htmlArg",g:cRed,"","bold")
call s:C("htmlBold",g:cWhite,"","bold")
@ -163,16 +180,6 @@ endfun
call s:C("htmlSpecialChar","","","italic")
call s:C("htmlTagName",g:cYellow,"","bold")
"markdown
call s:C("mkdCode",g:cYellow,g:cLightGrayBg,"")
call s:C("mkdURL",g:cLightGrayFg,"","")
hi! link mkdIndentCode mkdCode
"php
hi! link phpArrayPair Operator
hi! link phpNull Constant
hi! link phpSuperglobal Identifier
"javaScript
hi! link javaScriptBraces Delimiter
hi! link javaScriptParens Delimiter
@ -186,17 +193,10 @@ endfun
autocmd BufEnter,FileType json hi! link Number Todo
autocmd BufEnter,FileType json hi! link String Statement
"coffeeScript
hi! link coffeeRegExp javaScriptRegexpString
"c
call s:C("cBraces",g:cYellow,"","")
hi! link cBlock String
hi! link cBlock cBraces
hi! link cNumbersCom Number
"dosini
hi! link dosiniLabel Function
"markdown
call s:C("mkdCode",g:cYellow,g:cLightGrayBg,"")
call s:C("mkdURL",g:cLightGrayFg,"","")
hi! link mkdIndentCode mkdCode
"objective-c/cocoa
hi! link cocoaClass objcClass
@ -210,6 +210,11 @@ endfun
hi! link objcSubclass objcClass
hi! link objcSuperclass objcClass
"php
hi! link phpArrayPair Operator
hi! link phpNull Constant
hi! link phpSuperglobal Identifier
"ruby
call s:C("rubyGlobalVariable","","","bold")
hi! link rubyClass Type

View file

@ -1,14 +1,15 @@
if has("gui_running")
let g:cBlack = "#000000"
let g:cWhite = "#ffffff"
let g:cGray = "#dadada"
let g:cBlue = "#87d7ff"
let g:cRed = "#d75f5f"
let g:cYellow = "#ffd787"
let g:cDarkBlue = "#5fafd7"
let g:cDarkRed = "#af5f5f"
let g:cDarkYellow = "#d7af5f"
let g:cDarkBlue = "#6caccc"
let g:cDarkRed = "#a34848"
let g:cDarkYellow = "#ccac6c"
let g:cDarkGrayBg = "#262626"
let g:cLightGrayBg = "#303030"
@ -16,12 +17,12 @@ if has("gui_running")
let g:cDarkGrayFg = "#4e4e4e"
let g:cLightGrayFg = "#6c6c6c"
let g:cLightText = "#c6c6c6"
let g:cNormalText = "#eeeeee"
let g:cDarkText = "#d0d0d0"
let g:cDarkText = "#c6c6c6"
let g:cLightText = "#eeeeee"
elseif &t_Co >= 256
let g:cBlack = '0' "#000000
let g:cWhite = '15' "#ffffff
let g:cGray = '253' "#dadada
let g:cBlue = '117' "#87d7ff
let g:cRed = '167' "#d75f5f
@ -37,12 +38,12 @@ elseif &t_Co >= 256
let g:cDarkGrayFg = '239' "#4e4e4e
let g:cLightGrayFg = '242' "#6c6c6c
let g:cLightText = '251' "#c6c6c6
let g:cNormalText = '255' "#eeeeee
let g:cDarkText = '252' "#d0d0d0
let g:cDarkText = '251' "#c6c6c6
let g:cLightText = '255' "#eeeeee
else
let g:cBlack = '0' "#000000
let g:cWhite = '15' "#ffffff
let g:cGray = '15' "#ffffff
let g:cBlue = '12' "#0000ff
let g:cRed = '9' "#ff0000
@ -58,7 +59,6 @@ else
let g:cDarkGrayFg = '15' "#ffffff
let g:cLightGrayFg = '15' "#ffffff
let g:cLightText = '15' "#ffffff
let g:cNormalText = '15' "#ffffff
let g:cDarkText = '15' "#ffffff
let g:cLightText = '15' "#ffffff
endif

View file

@ -117,19 +117,19 @@ endif
"ligtline theme {{{
let s:p = { 'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {} }
let s:p.normal.left = [[ g:cBlue, g:cDarkGrayBg ], [ g:cNormalText, g:cLightGrayBg ]]
let s:p.inactive.left = [[ g:cBlue, g:cDarkGrayBg ], [ g:cNormalText, g:cLightGrayBg ]]
let s:p.normal.right = [[ g:cDarkText, g:cDarkGrayBg ], [ g:cNormalText, g:cLightGrayBg ], [ g:cDarkText, g:cDarkGrayBg ]]
let s:p.inactive.right = [[ g:cDarkText, g:cDarkGrayBg ], [ g:cNormalText, g:cLightGrayBg ], [ g:cDarkText, g:cDarkGrayBg ]]
let s:p.normal.left = [[ g:cBlue, g:cDarkGrayBg ], [ g:cLightText, g:cLightGrayBg ]]
let s:p.inactive.left = [[ g:cBlue, g:cDarkGrayBg ], [ g:cLightText, g:cLightGrayBg ]]
let s:p.normal.right = [[ g:cGray, g:cDarkGrayBg ], [ g:cLightText, g:cLightGrayBg ], [ g:cGray, g:cDarkGrayBg ]]
let s:p.inactive.right = [[ g:cGray, g:cDarkGrayBg ], [ g:cLightText, g:cLightGrayBg ], [ g:cGray, g:cDarkGrayBg ]]
let s:p.insert.left = [[ g:cRed, g:cLightGrayBg ], [ g:cDarkText, g:cDarkGrayBg ]]
let s:p.replace.left = [[ g:cLightGrayBg, g:cRed ], [ g:cDarkText, g:cDarkGrayBg ]]
let s:p.visual.left = [[ g:cYellow, g:cLightGrayBg ], [ g:cDarkText, g:cDarkGrayBg ]]
let s:p.insert.left = [[ g:cRed, g:cLightGrayBg ], [ g:cGray, g:cDarkGrayBg ]]
let s:p.replace.left = [[ g:cLightGrayBg, g:cRed ], [ g:cGray, g:cDarkGrayBg ]]
let s:p.visual.left = [[ g:cYellow, g:cLightGrayBg ], [ g:cGray, g:cDarkGrayBg ]]
let s:p.normal.middle = [[ g:cNormalText, g:cLightGrayBg ]]
let s:p.tabline.left = [[ g:cDarkText, g:cDarkGrayBg ]]
let s:p.tabline.tabsel = [[ g:cDarkText, g:cLightGrayBg ]]
let s:p.tabline.middle = [[ g:cDarkGrayBg, g:cDarkText ]]
let s:p.normal.middle = [[ g:cLightText, g:cLightGrayBg ]]
let s:p.tabline.left = [[ g:cGray, g:cDarkGrayBg ]]
let s:p.tabline.tabsel = [[ g:cGray, g:cLightGrayBg ]]
let s:p.tabline.middle = [[ g:cDarkGrayBg, g:cGray ]]
let s:p.tabline.right = copy(s:p.normal.right)
let s:p.normal.error = [[ g:cRed, g:cLightGrayBg ]]
let s:p.normal.warning = [[ g:cYellow, g:cLightGrayBg ]]