mirror of
https://github.com/prurigro/darkcloud-nvimconfig.git
synced 2024-11-22 11:44:10 -05:00
Rebuild the theme so all the colors are declared and imported, to make it easier to update, and use conditionals when declaring the colors rather than trying to compute equivalent hex codes
This commit is contained in:
Kevin MacMartin
parent
485e5a8ef7
commit
4cd340b552
4 changed files with 236 additions and 451 deletions
|
|
@ -8,404 +8,183 @@
|
||||||
" License: MIT "
|
" License: MIT "
|
||||||
" "
|
" "
|
||||||
"============================================================"
|
"============================================================"
|
||||||
"
|
|
||||||
" Acknowledgements:
|
|
||||||
"
|
|
||||||
" I found the jellybeans theme part way through creating
|
|
||||||
" this one and liked how it scripted compatibility between
|
|
||||||
" cterm and gui, so I stripped its colours and ported
|
|
||||||
" my own in, using jellybeans as a functional template.
|
|
||||||
"
|
|
||||||
" As referenced in the original jellybean theme, the set
|
|
||||||
" of color approximation functions were created by Henry
|
|
||||||
" So, Jr. and David Liang
|
|
||||||
"
|
|
||||||
|
|
||||||
"remove all the colours before writing our own
|
"remove all the colours before writing our own
|
||||||
hi clear
|
hi clear
|
||||||
|
|
||||||
if exists("syntax_on")
|
if exists("syntax_on")
|
||||||
syntax reset
|
syntax reset
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if has("gui_running") || &t_Co == 88 || &t_Co == 256
|
"declare the name of our theme
|
||||||
let s:low_color = 0
|
|
||||||
else
|
|
||||||
let s:low_color = 1
|
|
||||||
endif
|
|
||||||
|
|
||||||
let colors_name = "darkcloud"
|
let colors_name = "darkcloud"
|
||||||
|
|
||||||
"color approximation functionality {{{
|
"sets the highlighting for the given group | format: s:C('Name','Foreground','Background','Style')
|
||||||
"approximate the grey index from a given grey level
|
fun! s:C(group, fg, bg, attr)
|
||||||
fun! s:grey_number(x)
|
if has("gui_running")
|
||||||
if &t_Co == 88
|
let l:term = "gui"
|
||||||
if a:x < 23
|
else
|
||||||
return 0
|
let l:term = "cterm"
|
||||||
elseif a:x < 69
|
endif
|
||||||
return 1
|
|
||||||
elseif a:x < 103
|
|
||||||
return 2
|
|
||||||
elseif a:x < 127
|
|
||||||
return 3
|
|
||||||
elseif a:x < 150
|
|
||||||
return 4
|
|
||||||
elseif a:x < 173
|
|
||||||
return 5
|
|
||||||
elseif a:x < 196
|
|
||||||
return 6
|
|
||||||
elseif a:x < 219
|
|
||||||
return 7
|
|
||||||
elseif a:x < 243
|
|
||||||
return 8
|
|
||||||
else
|
|
||||||
return 9
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
if a:x < 14
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
let l:n = (a:x - 8) / 10
|
|
||||||
let l:m = (a:x - 8) % 10
|
|
||||||
if l:m < 5
|
|
||||||
return l:n
|
|
||||||
else
|
|
||||||
return l:n + 1
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endfun
|
|
||||||
|
|
||||||
"find the grey level for a given grey index
|
if a:fg != ""
|
||||||
fun! s:grey_level(n)
|
exec "hi " . a:group . " " . l:term . "fg=" . a:fg
|
||||||
if &t_Co == 88
|
else
|
||||||
if a:n == 0
|
exec "hi " . a:group . " " . l:term . "fg=NONE"
|
||||||
return 0
|
endif
|
||||||
elseif a:n == 1
|
|
||||||
return 46
|
|
||||||
elseif a:n == 2
|
|
||||||
return 92
|
|
||||||
elseif a:n == 3
|
|
||||||
return 115
|
|
||||||
elseif a:n == 4
|
|
||||||
return 139
|
|
||||||
elseif a:n == 5
|
|
||||||
return 162
|
|
||||||
elseif a:n == 6
|
|
||||||
return 185
|
|
||||||
elseif a:n == 7
|
|
||||||
return 208
|
|
||||||
elseif a:n == 8
|
|
||||||
return 231
|
|
||||||
else
|
|
||||||
return 255
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
if a:n == 0
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return 8 + (a:n * 10)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endfun
|
|
||||||
|
|
||||||
"find the palette index for a given grey index
|
if a:bg != ""
|
||||||
fun! s:grey_color(n)
|
exec "hi " . a:group . " " . l:term . "bg=" . a:bg
|
||||||
if &t_Co == 88
|
else
|
||||||
if a:n == 0
|
exec "hi " . a:group . " " . l:term . "bg=NONE"
|
||||||
return 16
|
endif
|
||||||
elseif a:n == 9
|
|
||||||
return 79
|
|
||||||
else
|
|
||||||
return 79 + a:n
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
if a:n == 0
|
|
||||||
return 16
|
|
||||||
elseif a:n == 25
|
|
||||||
return 231
|
|
||||||
else
|
|
||||||
return 231 + a:n
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endfun
|
|
||||||
|
|
||||||
"approximate the color index from a given color level
|
if a:attr != ""
|
||||||
fun! s:rgb_number(x)
|
exec "hi " . a:group . " " . l:term . "=" . a:attr
|
||||||
if &t_Co == 88
|
else
|
||||||
if a:x < 69
|
exec "hi " . a:group . " " . l:term . "=NONE"
|
||||||
return 0
|
endif
|
||||||
elseif a:x < 172
|
endfun
|
||||||
return 1
|
|
||||||
elseif a:x < 230
|
|
||||||
return 2
|
|
||||||
else
|
|
||||||
return 3
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
if a:x < 75
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
let l:n = (a:x - 55) / 40
|
|
||||||
let l:m = (a:x - 55) % 40
|
|
||||||
if l:m < 20
|
|
||||||
return l:n
|
|
||||||
else
|
|
||||||
return l:n + 1
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endfun
|
|
||||||
|
|
||||||
"find the color level for a given color index
|
|
||||||
fun! s:rgb_level(n)
|
|
||||||
if &t_Co == 88
|
|
||||||
if a:n == 0
|
|
||||||
return 0
|
|
||||||
elseif a:n == 1
|
|
||||||
return 139
|
|
||||||
elseif a:n == 2
|
|
||||||
return 205
|
|
||||||
else
|
|
||||||
return 255
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
if a:n == 0
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return 55 + (a:n * 40)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endfun
|
|
||||||
|
|
||||||
"find the palette index for a set of RGB color indices
|
|
||||||
fun! s:rgb_color(x, y, z)
|
|
||||||
if &t_Co == 88
|
|
||||||
return 16 + (a:x * 16) + (a:y * 4) + a:z
|
|
||||||
else
|
|
||||||
return 16 + (a:x * 36) + (a:y * 6) + a:z
|
|
||||||
endif
|
|
||||||
endfun
|
|
||||||
|
|
||||||
"find the palette index to approximate a set of RGB color levels
|
|
||||||
fun! s:color(r, g, b)
|
|
||||||
"get the closest grey
|
|
||||||
let l:gx = s:grey_number(a:r)
|
|
||||||
let l:gy = s:grey_number(a:g)
|
|
||||||
let l:gz = s:grey_number(a:b)
|
|
||||||
|
|
||||||
"get the closest color
|
|
||||||
let l:x = s:rgb_number(a:r)
|
|
||||||
let l:y = s:rgb_number(a:g)
|
|
||||||
let l:z = s:rgb_number(a:b)
|
|
||||||
|
|
||||||
if l:gx == l:gy && l:gy == l:gz
|
|
||||||
let l:dgr = s:grey_level(l:gx) - a:r
|
|
||||||
let l:dgg = s:grey_level(l:gy) - a:g
|
|
||||||
let l:dgb = s:grey_level(l:gz) - a:b
|
|
||||||
let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
|
|
||||||
let l:dr = s:rgb_level(l:gx) - a:r
|
|
||||||
let l:dg = s:rgb_level(l:gy) - a:g
|
|
||||||
let l:db = s:rgb_level(l:gz) - a:b
|
|
||||||
let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
|
|
||||||
if l:dgrey < l:drgb
|
|
||||||
return s:grey_color(l:gx)
|
|
||||||
else
|
|
||||||
return s:rgb_color(l:x, l:y, l:z)
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
return s:rgb_color(l:x, l:y, l:z)
|
|
||||||
endif
|
|
||||||
endfun
|
|
||||||
|
|
||||||
"find the palette index to approximate the 'rrggbb' hex string
|
|
||||||
fun! s:rgb(rgb)
|
|
||||||
let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
|
|
||||||
let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
|
|
||||||
let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
|
|
||||||
return s:color(l:r, l:g, l:b)
|
|
||||||
endfun
|
|
||||||
|
|
||||||
"sets the highlighting for the given group
|
|
||||||
fun! s:X(group, fg, bg, attr, lcfg, lcbg)
|
|
||||||
if s:low_color
|
|
||||||
let l:fge = empty(a:lcfg)
|
|
||||||
let l:bge = empty(a:lcbg)
|
|
||||||
|
|
||||||
if !l:fge && !l:bge
|
|
||||||
exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=".a:lcbg
|
|
||||||
elseif !l:fge && l:bge
|
|
||||||
exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=NONE"
|
|
||||||
elseif l:fge && !l:bge
|
|
||||||
exec "hi ".a:group." ctermfg=NONE ctermbg=".a:lcbg
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
let l:fgs = substitute(a:fg, '^#', '', '')
|
|
||||||
let l:bgs = substitute(a:bg, '^#', '', '')
|
|
||||||
let l:fge = empty(l:fgs)
|
|
||||||
let l:bge = empty(l:bgs)
|
|
||||||
|
|
||||||
if !l:fge && !l:bge
|
|
||||||
exec "hi ".a:group." guifg=#".l:fgs." guibg=#".l:bgs." ctermfg=".s:rgb(l:fgs)." ctermbg=".s:rgb(l:bgs)
|
|
||||||
elseif !l:fge && l:bge
|
|
||||||
exec "hi ".a:group." guifg=#".l:fgs." guibg=NONE ctermfg=".s:rgb(l:fgs)." ctermbg=NONE"
|
|
||||||
elseif l:fge && !l:bge
|
|
||||||
exec "hi ".a:group." guifg=NONE guibg=#".l:bgs." ctermfg=NONE ctermbg=".s:rgb(l:bgs)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
if a:attr == ""
|
|
||||||
exec "hi ".a:group." gui=none cterm=none"
|
|
||||||
else
|
|
||||||
let noitalic = join(filter(split(a:attr, ","), "v:val !=? 'italic'"), ",")
|
|
||||||
if empty(noitalic)
|
|
||||||
let noitalic = "none"
|
|
||||||
endif
|
|
||||||
exec "hi ".a:group." gui=".a:attr." cterm=".noitalic
|
|
||||||
endif
|
|
||||||
endfun
|
|
||||||
"}}}
|
|
||||||
|
|
||||||
if !exists("g:colorscheme_use_lowcolor_black") || g:colorscheme_use_lowcolor_black
|
|
||||||
let s:termBlack = "Black"
|
|
||||||
else
|
|
||||||
let s:termBlack = "Grey"
|
|
||||||
endif
|
|
||||||
|
|
||||||
"SPELL CHECKING UNDERLINE: (blue, yellow, none, none)
|
|
||||||
hi SpellBad guisp=#87d7ff gui=undercurl guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE term=bold,underline cterm=bold,underline
|
|
||||||
hi SpellCap guisp=#ffd787 gui=undercurl guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE term=underline cterm=underline
|
|
||||||
hi SpellRare guisp=NONE gui=NONE guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE term=NONE cterm=NONE
|
|
||||||
hi SpellLocal guisp=NONE gui=NONE guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE term=NONE cterm=NONE
|
|
||||||
|
|
||||||
"SYNTAX COLORS:
|
"SYNTAX COLORS:
|
||||||
|
|
||||||
"format:
|
"SPELL CHECKING UNDERLINE: (blue, yellow, none, none) {{{
|
||||||
"format: ('name','fg ','bg ','style ',s:lowcolor-fg,'lowcolor-bg')
|
call s:C("SpellBad",g:cBlue,"","bold,underline")
|
||||||
"example:('Line','000000','f0f0f0','italic,bold',s:termBlack ,'White')
|
call s:C("SpellCap",g:cYellow,"","underline")
|
||||||
|
call s:C("SpellRare","","","")
|
||||||
|
call s:C("SpellLocal","","","")
|
||||||
|
"}}}
|
||||||
|
|
||||||
"CORE: {{{
|
"CORE: {{{
|
||||||
call s:X("Normal","#eaeaea","#262626","","White",s:termBlack)
|
call s:C("Normal",g:cNormalText,g:cDarkGrayBg,"")
|
||||||
hi Normal ctermfg=254 ctermbg=235
|
hi Normal ctermfg=254 ctermbg=235
|
||||||
hi! link Conceal Normal
|
hi! link Conceal Normal
|
||||||
|
|
||||||
call s:X("Cursor","","#262626","standout,underline,bold",s:termBlack,"White")
|
call s:C("Cursor","",g:cDarkGrayBg,"standout")
|
||||||
call s:X("CursorColumn","","#303030","","",s:termBlack)
|
call s:C("CursorColumn","",g:cLightGrayBg,"")
|
||||||
hi CursorColumn ctermbg=236
|
hi CursorColumn ctermbg=236
|
||||||
call s:X("CursorLine","","#303030","","",s:termBlack)
|
call s:C("CursorLine","",g:cLightGrayBg,"")
|
||||||
hi CursorLine ctermbg=236
|
hi CursorLine ctermbg=236
|
||||||
call s:X("CursorLineNr","#87d7ff","#303030","bold","Blue",s:termBlack)
|
call s:C("CursorLineNr",g:cBlue,g:cLightGrayBg,"bold")
|
||||||
hi CursorLineNr ctermbg=236
|
hi CursorLineNr ctermbg=236
|
||||||
call s:X("LineNr","#4e4e4e","","bold","White",s:termBlack)
|
call s:C("LineNr",g:cDarkGrayFg,"","bold")
|
||||||
hi LineNr ctermfg=239
|
hi LineNr ctermfg=239
|
||||||
|
|
||||||
call s:X("Visual","","#262626","standout","",s:termBlack)
|
call s:C("Visual","",g:cDarkGrayBg,"standout")
|
||||||
call s:X("MatchParen","","#303030","bold,underline","","")
|
call s:C("MatchParen","",g:cLightGrayBg,"bold")
|
||||||
|
|
||||||
"whitespace
|
"whitespace
|
||||||
call s:X("TabLine","","#000000","","",s:termBlack)
|
call s:C("TabLine","",g:cBlack,"")
|
||||||
call s:X("TabLineFill","","#000000","","",s:termBlack)
|
call s:C("TabLineFill","",g:cBlack,"")
|
||||||
call s:X("TabLineSel","#000000","#d0d0d0","",s:termBlack,"White")
|
call s:C("TabLineSel",g:cBlack,g:cDarkText,"")
|
||||||
call s:X("ExtraWhiteSpace","FF0000","#262626","","Red",s:termBlack)
|
call s:C("ExtraWhiteSpace",g:cDarkRed,g:cDarkGrayBg,"")
|
||||||
|
|
||||||
"menu call
|
"menu call
|
||||||
call s:X("Pmenu","#87d7ff","#303030","","Grey","Blue")
|
call s:C("Pmenu",g:cBlue,g:cLightGrayBg,"")
|
||||||
call s:X("PmenuSel","#87d7ff","#4e4e4e","bold","White","Black")
|
call s:C("PmenuSel",g:cBlue,g:cLightGrayBg,"bold")
|
||||||
|
|
||||||
"search
|
"search
|
||||||
call s:X("Search","","#262626","standout","",s:termBlack)
|
call s:C("Search","",g:cDarkGrayBg,"standout")
|
||||||
hi! link IncSearchMatch Search
|
hi! link IncSearchMatch Search
|
||||||
hi! link IncSearchMatchReverse Search
|
hi! link IncSearchMatchReverse Search
|
||||||
call s:X("IncSearch","","#262626","standout,bold,underline","",s:termBlack)
|
call s:C("IncSearch","",g:cDarkGrayBg,"standout")
|
||||||
hi! link IncSearchOnCursor IncSearch
|
hi! link IncSearchOnCursor IncSearch
|
||||||
hi! link IncSearchCursor IncSearchOnCursor
|
hi! link IncSearchCursor IncSearchOnCursor
|
||||||
|
|
||||||
"status line
|
"status line
|
||||||
call s:X("StatusLine","","#303030","","",s:termBlack)
|
call s:C("StatusLine","",g:cLightGrayBg,"")
|
||||||
hi! link StatusLineNC StatusLine
|
hi! link StatusLineNC StatusLine
|
||||||
call s:X("VertSplit","#626262","#626262","",s:termBlack,s:termBlack)
|
call s:C("WildMenu",g:cDarkText,g:cLightGrayBg,"")
|
||||||
call s:X("WildMenu","#808080","#303030","","White",s:termBlack)
|
|
||||||
|
|
||||||
"folding
|
"folding
|
||||||
call s:X("Folded","#87d7ff","#4e4e4e","bold","Blue",s:termBlack)
|
call s:C("Folded",g:cBlue,g:cLightGrayBg,"bold")
|
||||||
call s:X("FoldColumn","#eaeaea","","bold","White","")
|
call s:C("FoldColumn",g:cNormalText,"","bold")
|
||||||
call s:X("SignColumn","#d75f5f","","bold","Red","")
|
call s:C("SignColumn",g:cRed,"","bold")
|
||||||
hi! link ColorColumn SignColumn
|
hi! link ColorColumn SignColumn
|
||||||
|
|
||||||
"syntax style
|
"syntax style
|
||||||
call s:X("Title","#d75f5f","","bold","Red","")
|
call s:C("Boolean",g:cBlue,"","bold")
|
||||||
call s:X("Comment","#6c6c6c","","italic","Grey","")
|
call s:C("Comment",g:cLightGrayFg,"","italic")
|
||||||
call s:X("Constant","#87d7ff","","bold","Blue","")
|
call s:C("Conditional",g:cRed,"","bold")
|
||||||
call s:X("Special","#ffd787","","bold","Yellow","")
|
call s:C("Constant",g:cBlue,"","bold")
|
||||||
call s:X("Delimiter","#ffffff","","","White","")
|
call s:C("Delimiter",g:cWhite,"","")
|
||||||
call s:X("String","#ffffff","","bold","White","")
|
call s:C("Directory",g:cBlue,"","")
|
||||||
call s:X("StringDelimiter","#d0d0d0","","","White","")
|
call s:C("Function",g:cBlue,"","")
|
||||||
call s:X("Identifier","#87d7ff","","bold","Blue","")
|
call s:C("Identifier",g:cBlue,"","bold")
|
||||||
call s:X("Type","#d75f5f","","bold","Red","")
|
call s:C("Keyword",g:cYellow,"","bold")
|
||||||
call s:X("Function","#87d7ff","","","Blue","")
|
call s:C("Label",g:cRed,"","")
|
||||||
call s:X("Label","#d75f5f","","","Red","")
|
call s:C("NonText",g:cBlue,"","")
|
||||||
call s:X("Statement","#ffd787","","","Yellow","")
|
call s:C("Number",g:cYellow,"","bold")
|
||||||
call s:X("PreProc","#ffd787","","","Yellow","")
|
call s:C("Operator",g:cRed,"","")
|
||||||
call s:X("Keyword","#ffd787","","bold","Yellow","")
|
call s:C("PreProc",g:cYellow,"","")
|
||||||
call s:X("Operator","#d75f5f","","","Red","")
|
call s:C("Question",g:cBlue,"","")
|
||||||
call s:X("NonText","#87d7ff","","","Blue","")
|
call s:C("Special",g:cYellow,"","bold")
|
||||||
call s:X("SpecialKey","#626262","","",s:termBlack,"")
|
call s:C("SpecialKey",g:cLightGrayFg,"","")
|
||||||
call s:X("Directory","#87d7ff","","","Blue","")
|
call s:C("Statement",g:cYellow,"","")
|
||||||
call s:X("Question","#87d7ff","","","Blue","")
|
call s:C("String",g:cWhite,"","bold")
|
||||||
call s:X("Todo","#d75f5f","","bold","Red","")
|
call s:C("StringDelimiter",g:cDarkText,"","")
|
||||||
|
call s:C("Tag",g:cBlue,"","bold")
|
||||||
|
call s:C("Title",g:cRed,"","bold")
|
||||||
|
call s:C("Todo",g:cRed,"","bold")
|
||||||
|
call s:C("Type",g:cRed,"","bold")
|
||||||
|
call s:C("Typedef",g:cRed,"","bold")
|
||||||
|
hi! link Character String
|
||||||
|
hi! link Float Number
|
||||||
|
hi! link Include Keyword
|
||||||
|
hi! link MoreMsg Special
|
||||||
|
hi! link SpecialChar Special
|
||||||
|
hi! link StorageClass Type
|
||||||
|
hi! link Structure PreProc
|
||||||
|
|
||||||
"errors
|
"errors
|
||||||
call s:X("Error","#d75f5f","#000000","standout","Red",s:termBlack)
|
call s:C("Error",g:cRed,g:cBlack,"standout")
|
||||||
hi! link WarningMsg Error
|
hi! link WarningMsg Error
|
||||||
hi! link ErrorMsg Error
|
hi! link ErrorMsg Error
|
||||||
hi! link MoreMsg Special
|
|
||||||
hi! link Structure PreProc
|
|
||||||
hi! link Number Type
|
|
||||||
|
|
||||||
"vimdiff
|
"vimdiff
|
||||||
call s:X("DiffAdd","#ffd787","","standout","Yellow","")
|
call s:C("DiffAdd",g:cYellow,"","standout")
|
||||||
call s:X("DiffDelete","#d75f5f","","standout","Red","")
|
call s:C("DiffChange",g:cBlue,"","standout")
|
||||||
call s:X("DiffChange","#87d7ff","","standout","Blue","")
|
call s:C("DiffDelete",g:cRed,"","standout")
|
||||||
call s:X("DiffText","#c6c6c6","","standout","White","")
|
call s:C("DiffText",g:cLightText,"","standout")
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
"SYNTAX: {{{
|
"SYNTAX: {{{
|
||||||
"html
|
"html
|
||||||
|
call s:C("htmlArg",g:cRed,"","bold")
|
||||||
|
call s:C("htmlBold",g:cWhite,"","bold")
|
||||||
|
call s:C("htmlH1",g:cRed,"","bold")
|
||||||
|
call s:C("htmlH2",g:cBlue,"","bold")
|
||||||
|
call s:C("htmlH3",g:cYellow,"","bold")
|
||||||
|
call s:C("htmlH4",g:cRed,"","italic")
|
||||||
|
call s:C("htmlH5",g:cBlue,"","italic")
|
||||||
|
call s:C("htmlH6",g:cYellow,"","italic")
|
||||||
|
call s:C("htmlLink",g:cRed,"","")
|
||||||
|
call s:C("htmlSpecialChar","","","italic")
|
||||||
|
call s:C("htmlTagName",g:cYellow,"","bold")
|
||||||
|
hi! link htmlTag Tag
|
||||||
hi! link htmlTitle Title
|
hi! link htmlTitle Title
|
||||||
call s:X("htmlH1","#d75f5f","","bold","Red","")
|
|
||||||
call s:X("htmlH2","#87d7ff","","bold","Blue","")
|
|
||||||
call s:X("htmlH3","#ffd787","","bold","Yellow","")
|
|
||||||
call s:X("htmlH4","#d75f5f","","italic","Red","")
|
|
||||||
call s:X("htmlH5","#87d7ff","","italic","Blue","")
|
|
||||||
call s:X("htmlH6","#ffd787","","italic","Yellow","")
|
|
||||||
call s:X("htmlSpecialChar","","","italic","","")
|
|
||||||
call s:X("htmlArg","#d75f5f","","bold","Red","")
|
|
||||||
call s:X("htmlTagName","#ffd787","","bold","Yellow","")
|
|
||||||
call s:X("htmlTag","#87d7ff","","bold","Blue","")
|
|
||||||
call s:X("htmlLink","#d75f5f","","","Red","")
|
|
||||||
call s:X("htmlBold","#ffffff","","bold","White","")
|
|
||||||
|
|
||||||
"markdown
|
"markdown
|
||||||
call s:X("mkdURL","#6c6c6c","","","Grey","")
|
call s:C("mkdCode",g:cYellow,g:cLightGrayBg,"")
|
||||||
call s:X("mkdCode","#ffd787","#444444","","Yellow","Grey")
|
call s:C("mkdURL",g:cLightGrayFg,"","")
|
||||||
hi! link mkdIndentCode mkdCode
|
hi! link mkdIndentCode mkdCode
|
||||||
|
|
||||||
"php
|
"php
|
||||||
hi! link phpFunctions Function
|
|
||||||
hi! link phpSuperglobal Identifier
|
|
||||||
hi! link phpQuoteSingle StringDelimiter
|
|
||||||
hi! link phpQuoteDouble StringDelimiter
|
|
||||||
hi! link phpBoolean Constant
|
|
||||||
hi! link phpNull Constant
|
|
||||||
hi! link phpArrayPair Operator
|
hi! link phpArrayPair Operator
|
||||||
hi! link StorageClass Type
|
hi! link phpBoolean Constant
|
||||||
|
hi! link phpFunctions Function
|
||||||
|
hi! link phpNull Constant
|
||||||
|
hi! link phpQuoteDouble StringDelimiter
|
||||||
|
hi! link phpQuoteSingle StringDelimiter
|
||||||
|
hi! link phpSuperglobal Identifier
|
||||||
|
|
||||||
"javaScript
|
"javaScript
|
||||||
hi! link javaScriptParens Delimiter
|
|
||||||
hi! link javaScriptBraces Delimiter
|
hi! link javaScriptBraces Delimiter
|
||||||
|
hi! link javaScriptParens Delimiter
|
||||||
hi! link javaScriptValue Constant
|
hi! link javaScriptValue Constant
|
||||||
hi! link javascriptHtmlEvents javaScriptSpecial
|
|
||||||
hi! link javascriptDomElemAttrs javaScriptSpecial
|
hi! link javascriptDomElemAttrs javaScriptSpecial
|
||||||
hi! link javascriptDomElemFuncs javaScriptFunction
|
hi! link javascriptDomElemFuncs javaScriptFunction
|
||||||
|
hi! link javascriptHtmlEvents javaScriptSpecial
|
||||||
|
|
||||||
"json
|
"json
|
||||||
autocmd BufEnter,FileType json hi! link Label Constant
|
autocmd BufEnter,FileType json hi! link Label Constant
|
||||||
|
|
@ -416,68 +195,68 @@ hi SpellLocal guisp=NONE gui=NONE guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NON
|
||||||
hi! link coffeeRegExp javaScriptRegexpString
|
hi! link coffeeRegExp javaScriptRegexpString
|
||||||
|
|
||||||
"c
|
"c
|
||||||
call s:X("cBraces","#ffd787","","","Yellow","")
|
call s:C("cBraces",g:cYellow,"","")
|
||||||
hi! link cBlock cBraces
|
|
||||||
hi! link cOperator cBraces
|
|
||||||
hi! link cCharacter String
|
|
||||||
hi! link cBlock String
|
hi! link cBlock String
|
||||||
|
hi! link cBlock cBraces
|
||||||
|
hi! link cCharacter String
|
||||||
hi! link cNumbersCom Number
|
hi! link cNumbersCom Number
|
||||||
|
hi! link cOperator cBraces
|
||||||
|
|
||||||
"dosini
|
"dosini
|
||||||
hi! link dosiniLabel Function
|
hi! link dosiniLabel Function
|
||||||
|
|
||||||
"objective-c/cocoa
|
"objective-c/cocoa
|
||||||
hi! link objcClass Type
|
|
||||||
hi! link cocoaClass objcClass
|
hi! link cocoaClass objcClass
|
||||||
|
hi! link cocoaFunction Function
|
||||||
|
hi! link objcClass Type
|
||||||
|
hi! link objcDirective Type
|
||||||
|
hi! link objcMessageName Identifier
|
||||||
|
hi! link objcMethodArg Normal
|
||||||
|
hi! link objcMethodName Identifier
|
||||||
|
hi! link objcStatement Constant
|
||||||
hi! link objcSubclass objcClass
|
hi! link objcSubclass objcClass
|
||||||
hi! link objcSuperclass objcClass
|
hi! link objcSuperclass objcClass
|
||||||
hi! link objcDirective Type
|
|
||||||
hi! link objcStatement Constant
|
|
||||||
hi! link cocoaFunction Function
|
|
||||||
hi! link objcMethodName Identifier
|
|
||||||
hi! link objcMethodArg Normal
|
|
||||||
hi! link objcMessageName Identifier
|
|
||||||
|
|
||||||
"ruby
|
"ruby
|
||||||
hi! link rubySharpBang Comment
|
call s:C("rubyGlobalVariable","","","bold")
|
||||||
|
hi! link rubyClass Type
|
||||||
hi! link rubyConstant Type
|
hi! link rubyConstant Type
|
||||||
hi! link rubyFunction Function
|
hi! link rubyFunction Function
|
||||||
hi! link rubyGlobalVariable rubyInstanceVariable
|
hi! link rubyGlobalVariable rubyInstanceVariable
|
||||||
|
hi! link rubyIdentifier Identifier
|
||||||
|
hi! link rubyInterpolationDelimiter Identifier
|
||||||
hi! link rubyModule rubyClass
|
hi! link rubyModule rubyClass
|
||||||
|
hi! link rubyPredefinedIdentifier PreProc
|
||||||
|
hi! link rubySharpBang Comment
|
||||||
hi! link rubyString String
|
hi! link rubyString String
|
||||||
hi! link rubyStringDelimiter StringDelimiter
|
hi! link rubyStringDelimiter StringDelimiter
|
||||||
hi! link rubyInterpolationDelimiter Identifier
|
|
||||||
hi! link rubyClass Type
|
|
||||||
hi! link rubyIdentifier Identifier
|
|
||||||
hi! link rubyPredefinedIdentifier PreProc
|
|
||||||
call s:X("rubyGlobalVariable","","","bold","","")
|
|
||||||
|
|
||||||
"lua
|
"lua
|
||||||
hi! link luaOperator Conditional
|
hi! link luaOperator Conditional
|
||||||
|
|
||||||
"systemd unit files
|
"systemd unit files
|
||||||
hi! link sdKey Identifier
|
|
||||||
hi! link sdFilename String
|
|
||||||
hi! link sdFileList sdFilename
|
|
||||||
hi! link sdExecFile sdFilename
|
|
||||||
hi! link sdExecArgs sdExecFile
|
|
||||||
hi! link sdDocURI sdFilename
|
|
||||||
hi! link sdValue PreProc
|
|
||||||
hi! link sdServiceBlock sdValue
|
|
||||||
hi! link sdSocketBlock Operator
|
|
||||||
hi! link sdUnitBlock Comment
|
|
||||||
hi! link sdBindIPv6 sdValue
|
hi! link sdBindIPv6 sdValue
|
||||||
hi! link sdIPTOS Label
|
hi! link sdBool sdValue
|
||||||
hi! link sdTCPCongest Label
|
hi! link sdCPUSchedPol sdValue
|
||||||
|
hi! link sdCapability sdDevAllow
|
||||||
|
hi! link sdDatasize sdValue
|
||||||
|
hi! link sdDevAllow Keyword
|
||||||
|
hi! link sdDocURI sdFilename
|
||||||
|
hi! link sdExecArgs sdExecFile
|
||||||
|
hi! link sdExecFile sdFilename
|
||||||
|
hi! link sdFileList sdFilename
|
||||||
|
hi! link sdFilename String
|
||||||
hi! link sdIOSchedClass sdValue
|
hi! link sdIOSchedClass sdValue
|
||||||
hi! link sdIOSchedPrio sdValue
|
hi! link sdIOSchedPrio sdValue
|
||||||
hi! link sdCPUSchedPol sdValue
|
hi! link sdIPTOS Label
|
||||||
hi! link sdBool sdValue
|
hi! link sdKey Identifier
|
||||||
hi! link sdDatasize sdValue
|
|
||||||
hi! link sdSymbol sdValue
|
|
||||||
hi! link sdOtherSignal sdValue
|
hi! link sdOtherSignal sdValue
|
||||||
hi! link sdDevAllow Keyword
|
hi! link sdServiceBlock sdValue
|
||||||
hi! link sdCapability sdDevAllow
|
hi! link sdSocketBlock Operator
|
||||||
|
hi! link sdSymbol sdValue
|
||||||
|
hi! link sdTCPCongest Label
|
||||||
|
hi! link sdUnitBlock Comment
|
||||||
|
hi! link sdValue PreProc
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
"MISC: {{{
|
"MISC: {{{
|
||||||
|
|
@ -485,76 +264,25 @@ hi SpellLocal guisp=NONE gui=NONE guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NON
|
||||||
hi! link mailHeaderKey Identifier
|
hi! link mailHeaderKey Identifier
|
||||||
|
|
||||||
"git
|
"git
|
||||||
hi! link gitconfigAssignment Label
|
|
||||||
hi! link ExtraditeLogName Type
|
hi! link ExtraditeLogName Type
|
||||||
|
hi! link gitconfigAssignment Label
|
||||||
"gitv
|
|
||||||
hi! link gitvSubject String
|
|
||||||
hi! link gitvLocalUncommit Special
|
|
||||||
hi! link gitvLocalCommited Identifier
|
|
||||||
hi! link gitvSeperatorMarks Delimiter
|
|
||||||
|
|
||||||
"notes
|
|
||||||
call s:X("notesRule","","","bold","","")
|
|
||||||
call s:X("WarningMsg","#ffd787","#2c2c2c","standout,bold","Yellow",s:termBlack)
|
|
||||||
call s:X("notesTitle","#d75f5f","","underline,bold","Red","")
|
|
||||||
call s:X("notesName","#ffd787","","underline,bold","Yellow","")
|
|
||||||
call s:X("notesShortHeading","#ffd787","#262626","standout,underline,bold","Yellow","")
|
|
||||||
call s:X("Underlined","#87d7ff","","underline,bold","Blue","")
|
|
||||||
call s:X("notesInProgress","#87d7ff","#262626","standout,underline,bold","Blue","")
|
|
||||||
call s:X("notesRealURL","#d75f5f","","underline,bold","Red","")
|
|
||||||
hi! link notesTextURL notesRealURL
|
|
||||||
hi! link notesSubtleURL notesRealURL
|
|
||||||
hi! link notesListBullet FoldColumn
|
|
||||||
hi! link notesListNumber notesListBullet
|
|
||||||
hi! link notesVimCmd Function
|
|
||||||
hi! link notesSingleQuoted String
|
|
||||||
hi! link notesBlockQuote Pmenu
|
|
||||||
hi! link notesModeLine Comment
|
|
||||||
hi! link notesCodeStart Delimiter
|
|
||||||
hi! link notesCodeEnd notesCodeStart
|
|
||||||
hi! link notesLastEdited Statement
|
|
||||||
hi! link notesAtxHeading Comment
|
|
||||||
|
|
||||||
"quicktask
|
|
||||||
hi! link quicktaskDatestamp Identifier
|
|
||||||
hi! link quicktaskTimestamp Identifier
|
|
||||||
hi! link quicktaskSection Todo
|
|
||||||
call s:X("quicktaskTimeNote","#ffd787","","bold","Yellow","")
|
|
||||||
call s:X("quicktaskTask","#ffffff","","bold","White","")
|
|
||||||
|
|
||||||
"signify
|
"signify
|
||||||
call s:X("SignifySignAdd","#ffd787","","bold","","Yellow")
|
call s:C("SignifySignAdd",g:cYellow,"","bold")
|
||||||
call s:X("SignifySignDelete","#d75f5f","","bold","","Red")
|
call s:C("SignifySignChange",g:cYellow,"","bold")
|
||||||
call s:X("SignifySignChange","#ffd787","","bold","","Yellow")
|
call s:C("SignifySignDelete",g:cRed,"","bold")
|
||||||
hi! link SignifyLineAdd DiffAdd
|
hi! link SignifyLineAdd DiffAdd
|
||||||
hi! link SignifyLineDelete DiffDelete
|
|
||||||
hi! link SignifyLineChange DiffChange
|
hi! link SignifyLineChange DiffChange
|
||||||
|
hi! link SignifyLineDelete DiffDelete
|
||||||
|
|
||||||
"ale
|
"ale
|
||||||
call s:X("ALEErrorSign","#d75f5f","","standout,bold","Red","")
|
call s:C("ALEErrorSign",g:cRed,"","standout")
|
||||||
call s:X("ALEWarningSign","#ffd787","","standout,bold","Yellow","")
|
call s:C("ALEWarningSign",g:cYellow,"","standout")
|
||||||
|
|
||||||
"taglist
|
"taglist
|
||||||
hi! link TagListFileName Directory
|
hi! link TagListFileName Directory
|
||||||
|
|
||||||
"taskwarrior
|
|
||||||
call s:X("taskwarrior_tablehead","#d0d0d0","","standout,bold",s:termBlack,"White")
|
|
||||||
call s:X("taskwarrior_field","","","standout,bold","","")
|
|
||||||
hi! link taskwarrior_id Comment
|
|
||||||
hi! link taskwarrior_project Keyword
|
|
||||||
hi! link taskwarrior_entry Identifier
|
|
||||||
hi! link taskwarrior_description String
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
"delete functions {{{
|
"cleanup {{{
|
||||||
delf s:X
|
delf s:C
|
||||||
delf s:rgb
|
|
||||||
delf s:color
|
|
||||||
delf s:rgb_color
|
|
||||||
delf s:rgb_level
|
|
||||||
delf s:rgb_number
|
|
||||||
delf s:grey_color
|
|
||||||
delf s:grey_level
|
|
||||||
delf s:grey_number
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
|
||||||
64
vim/colors/palette.vim
Normal file
64
vim/colors/palette.vim
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
if has("gui_running")
|
||||||
|
let g:cBlack = "#000000"
|
||||||
|
let g:cWhite = "#ffffff"
|
||||||
|
|
||||||
|
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:cDarkGrayBg = "#262626"
|
||||||
|
let g:cLightGrayBg = "#303030"
|
||||||
|
|
||||||
|
let g:cDarkGrayFg = "#4e4e4e"
|
||||||
|
let g:cLightGrayFg = "#6c6c6c"
|
||||||
|
|
||||||
|
let g:cLightText = "#c6c6c6"
|
||||||
|
let g:cNormalText = "#eeeeee"
|
||||||
|
let g:cDarkText = "#d0d0d0"
|
||||||
|
elseif &t_Co >= 256
|
||||||
|
let g:cBlack = '0' "#000000
|
||||||
|
let g:cWhite = '15' "#ffffff
|
||||||
|
|
||||||
|
let g:cBlue = '117' "#87d7ff
|
||||||
|
let g:cRed = '167' "#d75f5f
|
||||||
|
let g:cYellow = '222' "#ffd787
|
||||||
|
|
||||||
|
let g:cDarkBlue = '74' "#5fafd7
|
||||||
|
let g:cDarkRed = '131' "#af5f5f
|
||||||
|
let g:cDarkYellow = '179' "#d7af5f
|
||||||
|
|
||||||
|
let g:cDarkGrayBg = '235' "#262626
|
||||||
|
let g:cLightGrayBg = '236' "#303030
|
||||||
|
|
||||||
|
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
|
||||||
|
else
|
||||||
|
let g:cBlack = '0' "#000000
|
||||||
|
let g:cWhite = '15' "#ffffff
|
||||||
|
|
||||||
|
let g:cBlue = '12' "#0000ff
|
||||||
|
let g:cRed = '9' "#ff0000
|
||||||
|
let g:cYellow = '11' "#ffff00
|
||||||
|
|
||||||
|
let g:cDarkBlue = '4' "#000080
|
||||||
|
let g:cDarkRed = '1' "#800000
|
||||||
|
let g:cDarkYellow = '3' "#808000
|
||||||
|
|
||||||
|
let g:cDarkGrayBg = '0' "#000000
|
||||||
|
let g:cLightGrayBg = '7' "#c0c0c0
|
||||||
|
|
||||||
|
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
|
||||||
|
endif
|
||||||
|
|
@ -115,34 +115,24 @@ else
|
||||||
endif
|
endif
|
||||||
|
|
||||||
"ligtline theme {{{
|
"ligtline theme {{{
|
||||||
let s:base0 = '#262626'
|
|
||||||
let s:base1 = '#303030'
|
|
||||||
let s:base2 = '#767676'
|
|
||||||
let s:base3 = '#949494'
|
|
||||||
let s:base4 = '#b2b2b2'
|
|
||||||
let s:base5 = '#c6c6c6'
|
|
||||||
let s:base6 = '#eaeaea'
|
|
||||||
|
|
||||||
let s:rcol = '#d75f5f'
|
|
||||||
let s:ycol = '#ffd787'
|
|
||||||
let s:bcol = '#87d7ff'
|
|
||||||
|
|
||||||
let s:p = { 'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {} }
|
let s:p = { 'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {} }
|
||||||
|
|
||||||
let s:p.normal.right = [[ s:base5, s:base0 ], [ s:base6, s:base1 ], [ s:base5, s:base0 ]]
|
let s:p.normal.left = [[ g:cBlue, g:cDarkGrayBg ], [ g:cNormalText, g:cLightGrayBg ]]
|
||||||
let s:p.normal.left = [[ s:bcol, s:base0 ], [ s:base6, s:base1 ]]
|
let s:p.inactive.left = [[ g:cBlue, g:cDarkGrayBg ], [ g:cNormalText, g:cLightGrayBg ]]
|
||||||
let s:p.insert.left = [[ s:rcol, s:base1 ], [ s:base5, s:base0 ]]
|
let s:p.normal.right = [[ g:cDarkText, g:cDarkGrayBg ], [ g:cNormalText, g:cLightGrayBg ], [ g:cDarkText, g:cDarkGrayBg ]]
|
||||||
let s:p.replace.left = [[ s:base1, s:rcol ], [ s:base5, s:base0 ]]
|
let s:p.inactive.right = [[ g:cDarkText, g:cDarkGrayBg ], [ g:cNormalText, g:cLightGrayBg ], [ g:cDarkText, g:cDarkGrayBg ]]
|
||||||
let s:p.visual.left = [[ s:ycol, s:base1 ], [ s:base5, s:base0 ]]
|
|
||||||
|
|
||||||
let s:p.normal.middle = [[ s:base6, s:base1 ]]
|
let s:p.insert.left = [[ g:cRed, g:cLightGrayBg ], [ g:cDarkText, g:cDarkGrayBg ]]
|
||||||
let s:p.inactive.abmiddle = [[ s:base3, s:base1 ]]
|
let s:p.replace.left = [[ g:cLightGrayBg, g:cRed ], [ g:cDarkText, g:cDarkGrayBg ]]
|
||||||
let s:p.tabline.left = [[ s:base5, s:base0 ]]
|
let s:p.visual.left = [[ g:cYellow, g:cLightGrayBg ], [ g:cDarkText, g:cDarkGrayBg ]]
|
||||||
let s:p.tabline.tabsel = [[ s:base5, s:base1 ]]
|
|
||||||
let s:p.tabline.middle = [[ s:base0, s:base5 ]]
|
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.tabline.right = copy(s:p.normal.right)
|
let s:p.tabline.right = copy(s:p.normal.right)
|
||||||
let s:p.normal.error = [[ s:rcol, s:base1 ]]
|
let s:p.normal.error = [[ g:cRed, g:cLightGrayBg ]]
|
||||||
let s:p.normal.warning = [[ s:ycol, s:base1 ]]
|
let s:p.normal.warning = [[ g:cYellow, g:cLightGrayBg ]]
|
||||||
|
|
||||||
let g:lightline#colorscheme#darkcloud#palette = lightline#colorscheme#fill(s:p)
|
let g:lightline#colorscheme#darkcloud#palette = lightline#colorscheme#fill(s:p)
|
||||||
"}}}
|
"}}}
|
||||||
|
|
|
||||||
3
vimrc
3
vimrc
|
|
@ -28,6 +28,9 @@
|
||||||
"Add Config Directory: (distro-agnostic system-wide)
|
"Add Config Directory: (distro-agnostic system-wide)
|
||||||
let &runtimepath = printf('%s,%s/vim,%s/vim/after',&runtimepath,g:darkcloudpath,g:darkcloudpath)
|
let &runtimepath = printf('%s,%s/vim,%s/vim/after',&runtimepath,g:darkcloudpath,g:darkcloudpath)
|
||||||
|
|
||||||
|
"Load Colours
|
||||||
|
runtime colors/palette.vim
|
||||||
|
|
||||||
"Load Colour Scheme:
|
"Load Colour Scheme:
|
||||||
colorscheme default "hack to fix vimrc colorschemes in some versions of vim
|
colorscheme default "hack to fix vimrc colorschemes in some versions of vim
|
||||||
colorscheme darkcloud
|
colorscheme darkcloud
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue