diff options
| -rw-r--r-- | .vim/colors/jellybeans.vim | 599 | ||||
| -rw-r--r-- | .vimrc | 4 |
2 files changed, 514 insertions, 89 deletions
diff --git a/.vim/colors/jellybeans.vim b/.vim/colors/jellybeans.vim index 9624cef..3485b99 100644 --- a/.vim/colors/jellybeans.vim +++ b/.vim/colors/jellybeans.vim @@ -1,130 +1,551 @@ +" Vim color file +" +" " __ _ _ _ " +" " \ \ ___| | |_ _| |__ ___ __ _ _ __ ___ " +" " \ \/ _ \ | | | | | _ \ / _ \/ _ | _ \/ __| " +" " /\_/ / __/ | | |_| | |_| | __/ |_| | | | \__ \ " +" " \___/ \___|_|_|\__ |____/ \___|\____|_| |_|___/ " +" " \___/ " +" +" "A colorful, dark color scheme for Vim." +" +" File: jellybeans.vim +" URL: github.com/nanotech/jellybeans.vim +" Scripts URL: vim.org/scripts/script.php?script_id=2555 +" Maintainer: NanoTech (nanotech.nanotechcorp.net) +" Version: 1.6~git +" Last Change: January 15th, 2012 +" License: MIT +" Contributors: Daniel Herbert (pocketninja) +" Henry So, Jr. <henryso@panix.com> +" David Liang <bmdavll at gmail dot com> +" Rich Healey (richo) +" Andrew Wong (w0ng) +" +" Copyright (c) 2009-2012 NanoTech +" +" Permission is hereby granted, free of charge, to any per‐ +" son obtaining a copy of this software and associated doc‐ +" umentation files (the “Software”), to deal in the Soft‐ +" ware without restriction, including without limitation +" the rights to use, copy, modify, merge, publish, distrib‐ +" ute, sublicense, and/or sell copies of the Software, and +" to permit persons to whom the Software is furnished to do +" so, subject to the following conditions: +" +" The above copyright notice and this permission notice +" shall be included in all copies or substantial portions +" of the Software. +" +" THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY +" KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO +" THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICU‐ +" LAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CON‐ +" TRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON‐ +" NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +" THE SOFTWARE. + set background=dark hi clear -if exists('syntax_on') +if exists("syntax_on") syntax reset endif -let colors_name = 'jellybeans' +let colors_name = "jellybeans" + +if has("gui_running") || &t_Co == 88 || &t_Co == 256 + let s:low_color = 0 +else + let s:low_color = 1 +endif + +" Color approximation functions by Henry So, Jr. and David Liang {{{ +" Added to jellybeans.vim by Daniel Herbert + +" returns an approximate grey index for the given grey level +fun! s:grey_number(x) + if &t_Co == 88 + if a:x < 23 + return 0 + elseif a:x < 69 + 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 + +" returns the actual grey level represented by the grey index +fun! s:grey_level(n) + if &t_Co == 88 + if a:n == 0 + return 0 + 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 + +" returns the palette index for the given grey index +fun! s:grey_color(n) + if &t_Co == 88 + if a:n == 0 + return 16 + 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 + +" returns an approximate color index for the given color level +fun! s:rgb_number(x) + if &t_Co == 88 + if a:x < 69 + return 0 + elseif a:x < 172 + 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 + +" returns the actual color level for the 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 + +" returns the palette index for the given R/G/B 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 + +" returns the palette index to approximate the given R/G/B 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 + " there are two possibilities + 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 + " use the grey + return s:grey_color(l:gx) + else + " use the color + return s:rgb_color(l:x, l:y, l:z) + endif + else + " only one possibility + return s:rgb_color(l:x, l:y, l:z) + endif +endfun + +" returns 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:fge = empty(a:fg) + let l:bge = empty(a:bg) + + if !l:fge && !l:bge + exec "hi ".a:group." guifg=#".a:fg." guibg=#".a:bg." ctermfg=".s:rgb(a:fg)." ctermbg=".s:rgb(a:bg) + elseif !l:fge && l:bge + exec "hi ".a:group." guifg=#".a:fg." guibg=NONE ctermfg=".s:rgb(a:fg)." ctermbg=NONE" + elseif l:fge && !l:bge + exec "hi ".a:group." guifg=NONE guibg=#".a:bg." ctermfg=NONE ctermbg=".s:rgb(a:bg) + endif + endif + + if a:attr == "" + exec "hi ".a:group." gui=none cterm=none" + else + let l:noitalic = join(filter(split(a:attr, ","), "v:val !=? 'italic'"), ",") + if empty(l:noitalic) + let l:noitalic = "none" + endif + exec "hi ".a:group." gui=".a:attr." cterm=".l:noitalic + endif +endfun +" }}} + +if !exists("g:jellybeans_background_color") + let g:jellybeans_background_color = "151515" +end + +call s:X("Normal","e8e8d3",g:jellybeans_background_color,"","White","") +set background=dark + +if !exists("g:jellybeans_use_lowcolor_black") || g:jellybeans_use_lowcolor_black + let s:termBlack = "Black" +else + let s:termBlack = "Grey" +endif if version >= 700 - hi CursorLine guibg=#1c1c1c ctermbg=236 cterm=none - hi CursorColumn guibg=#1c1c1c ctermbg=236 - hi MatchParen guifg=white guibg=#80a090 gui=bold ctermfg=255 ctermbg=29 cterm=bold - - "Tabpages - hi TabLine guifg=black guibg=#b0b8c0 gui=none ctermbg=232 ctermfg=250 cterm=italic - hi TabLineFill guifg=#9098a0 ctermfg=243 - hi TabLineSel guifg=black guibg=#f0f0f0 gui=bold ctermbg=232 ctermfg=254 cterm=italic,bold - - "P-Menu (auto-completion) - hi Pmenu guifg=white guibg=#000000 ctermfg=255 ctermbg=232 - hi PmenuSel guifg=#101010 guibg=#eeeeee ctermfg=233 ctermbg=254 - "PmenuSbar - "PmenuThumb + call s:X("CursorLine","","1c1c1c","","",s:termBlack) + call s:X("CursorColumn","","1c1c1c","","",s:termBlack) + call s:X("MatchParen","ffffff","80a090","bold","","DarkCyan") + + call s:X("TabLine","000000","b0b8c0","italic","",s:termBlack) + call s:X("TabLineFill","9098a0","","","",s:termBlack) + call s:X("TabLineSel","000000","f0f0f0","italic,bold",s:termBlack,"White") + + " Auto-completion + call s:X("Pmenu","ffffff","606060","","White",s:termBlack) + call s:X("PmenuSel","101010","eeeeee","",s:termBlack,"White") endif -hi Visual guibg=#404040 ctermbg=238 +call s:X("Visual","","404040","","",s:termBlack) +call s:X("Cursor","","b0d0f0","","","") -"hi Cursor guifg=NONE guibg=#586068 -hi Cursor guibg=#b0d0f0 ctermbg=250 +call s:X("LineNr","605958",g:jellybeans_background_color,"none",s:termBlack,"") +call s:X("CursorLineNr","ccc5c4","","none","White","") +call s:X("Comment","888888","","italic","Grey","") +call s:X("Todo","c7c7c7","","bold","White",s:termBlack) -"hi Normal guifg=#e8e8d3 guibg=#151515 ctermfg=254 ctermbg=235 -hi Normal guifg=#e8e8d3 guibg=#151515 ctermfg=254 ctermbg=none -"hi LineNr guifg=#808080 guibg=#e0e0e0 -hi LineNr guifg=#605958 guibg=#151515 ctermfg=242 ctermbg=234 -"hi Comment guifg=#5f5a60 gui=italic -hi Comment guifg=#888888 gui=none ctermfg=245 cterm=none -hi Todo guifg=#808080 gui=bold ctermfg=244 ctermbg=none cterm=none +call s:X("StatusLine","000000","dddddd","italic","","White") +call s:X("StatusLineNC","ffffff","403c41","italic","White","Black") +call s:X("VertSplit","777777","403c41","",s:termBlack,s:termBlack) +call s:X("WildMenu","f0a0c0","302028","","Magenta","") -hi StatusLine guifg=#f0f0f0 guibg=#101010 ctermfg=254 ctermbg=233 cterm=italic -hi StatusLineNC guifg=#a0a0a0 guibg=#18181c ctermfg=247 ctermbg=234 cterm=italic -hi VertSplit guifg=#181818 guibg=#18181c ctermfg=247 ctermbg=234 cterm=italic +call s:X("Folded","a0a8b0","384048","italic",s:termBlack,"") +call s:X("FoldColumn","535D66","1f1f1f","","",s:termBlack) +call s:X("SignColumn","777777","333333","","",s:termBlack) +call s:X("ColorColumn","","000000","","",s:termBlack) -hi Folded guibg=#384048 guifg=#a0a8bc ctermfg=248 ctermbg=238 -hi FoldColumn guibg=#384048 guifg=#a0a8b0 ctermfg=248 ctermbg=248 -hi SignColumn guibg=#384048 guifg=#a0a8b0 ctermfg=248 ctermbg=248 +call s:X("Title","70b950","","bold","Green","") -hi Title guifg=#70b950 gui=bold ctermfg=71 cterm=bold +call s:X("Constant","cf6a4c","","","Red","") +call s:X("Special","799d6a","","","Green","") +call s:X("Delimiter","668799","","","Grey","") -hi Constant guifg=#cf6a4c ctermfg=209 -hi String guifg=#799d6a ctermfg=71 -hi Delimiter guifg=#668799 ctermfg=24 -hi Special guifg=#99ad6a ctermfg=84 -"hi Number guifg=#ff00fc -"hi Float -"hi Identifier guifg=#7587a6 -hi Identifier guifg=#c6b6ee ctermfg=141 -" Type d: 'class' -"hi Structure guifg=#9B859D gui=underline -hi Structure guifg=#8fbfdc gui=none ctermfg=75 cterm=none -hi Function guifg=#fad07a ctermfg=221 -" dylan: method, library, ... d: if, return, ... -"hi Statement guifg=#7187a1 gui=NONE -hi Statement guifg=#8197bf gui=none ctermfg=67 cterm=none -" Keywords d: import, module... -hi PreProc guifg=#8fbfdc ctermfg=153 +call s:X("String","99ad6a","","","Green","") +call s:X("StringDelimiter","556633","","","DarkGreen","") -hi link Operator Normal +call s:X("Identifier","c6b6ee","","","LightCyan","") +call s:X("Structure","8fbfdc","","","LightCyan","") +call s:X("Function","fad07a","","","Yellow","") +call s:X("Statement","8197bf","","","DarkBlue","") +call s:X("PreProc","8fbfdc","","","LightBlue","") -hi Type guifg=#ffb964 gui=none ctermfg=215 cterm=none -"hi NonText guifg=#808080 guibg=#151515 ctermfg=244 ctermbg=234 -hi NonText guifg=#808080 guibg=#151515 ctermfg=244 ctermbg=none +hi! link Operator Structure -"hi Macro guifg=#a0b0c0 gui=underline +call s:X("Type","ffb964","","","Yellow","") +call s:X("NonText","606060",g:jellybeans_background_color,"",s:termBlack,"") -"Tabs, trailing spaces, etc (lcs) -hi SpecialKey guifg=#808080 ctermfg=244 ctermbg=none +call s:X("SpecialKey","444444","1c1c1c","",s:termBlack,"") -"hi TooLong guibg=#ff0000 guifg=#f8f8f8 +call s:X("Search","f0a0c0","302028","underline","Magenta","") -hi Search guifg=#f0a0c0 guibg=#302028 gui=underline ctermfg=213 ctermbg=235 cterm=underline +call s:X("Directory","dad085","","","Yellow","") +call s:X("ErrorMsg","","902020","","","DarkRed") +hi! link Error ErrorMsg +hi! link MoreMsg Special +call s:X("Question","65C254","","","Green","") -hi Directory guifg=#dad085 gui=none ctermfg=228 cterm=none -hi Error guibg=#602020 ctermbg=88 + +" Spell Checking + +call s:X("SpellBad","","902020","underline","","DarkRed") +call s:X("SpellCap","","0000df","underline","","Blue") +call s:X("SpellRare","","540063","underline","","DarkMagenta") +call s:X("SpellLocal","","2D7067","underline","","Green") " Diff -"hi link diffRemoved Constant -"hi link diffAdded String +hi! link diffRemoved Constant +hi! link diffAdded String " VimDiff -"hi DiffAdd guibg=#032218 ctermbg=233 -"hi DiffChange guibg=#100920 ctermbg=232 -"hi DiffDelete guibg=#220000 ctermbg=232 -"hi DiffText guibg=#000940 ctermbg=232 +call s:X("DiffAdd","D2EBBE","437019","","White","DarkGreen") +call s:X("DiffDelete","40000A","700009","","DarkRed","DarkRed") +call s:X("DiffChange","","2B5B77","","White","DarkBlue") +call s:X("DiffText","8fbfdc","000000","reverse","Yellow","") " PHP -"hi phpFunctions guifg=#c676be -hi link phpFunctions Function -hi StorageClass guifg=#c59f6f ctermfg=223 +hi! link phpFunctions Function +call s:X("StorageClass","c59f6f","","","Red","") +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 phpOperator Normal +hi! link phpRelation Normal +hi! link phpVarSelector Identifier + +" Python + +hi! link pythonOperator Statement " Ruby -hi link rubySharpBang Comment -hi rubyClass guifg=#447799 ctermfg=74 -hi rubyIdentifier guifg=#c6b6fe ctermfg=147 +hi! link rubySharpBang Comment +call s:X("rubyClass","447799","","","DarkBlue","") +call s:X("rubyIdentifier","c6b6fe","","","Cyan","") +hi! link rubyConstant Type +hi! link rubyFunction Function + +call s:X("rubyInstanceVariable","c6b6fe","","","Cyan","") +call s:X("rubySymbol","7697d6","","","Blue","") +hi! link rubyGlobalVariable rubyInstanceVariable +hi! link rubyModule rubyClass +call s:X("rubyControl","7597c6","","","Blue","") + +hi! link rubyString String +hi! link rubyStringDelimiter StringDelimiter +hi! link rubyInterpolationDelimiter Identifier + +call s:X("rubyRegexpDelimiter","540063","","","Magenta","") +call s:X("rubyRegexp","dd0093","","","DarkMagenta","") +call s:X("rubyRegexpSpecial","a40073","","","Magenta","") + +call s:X("rubyPredefinedIdentifier","de5577","","","Red","") + +" Erlang -hi rubyInstanceVariable guifg=#c6b6fe ctermfg=147 -"hi rubySymbol guifg=#6677ff -hi rubySymbol guifg=#7697d6 ctermfg=74 -hi link rubyGlobalVariable rubyInstanceVariable -hi link rubyClassVariable rubyInstanceVariable -hi link rubyModule rubyClass -hi rubyControl guifg=#7597c6 ctermfg=74 +hi! link erlangAtom rubySymbol +hi! link erlangBIF rubyPredefinedIdentifier +hi! link erlangFunction rubyPredefinedIdentifier +hi! link erlangDirective Statement +hi! link erlangNode Identifier -"hi link rubyString Special -hi rubyStringDelimiter guifg=#556633 ctermfg=64 -hi link rubyInterpolationDelimiter Identifier +" JavaScript -hi rubyRegexpDelimiter guifg=#540063 ctermfg=89 -hi rubyRegexp guifg=#dd0093 ctermfg=200 -hi rubyRegexpSpecial guifg=#a40073 ctermfg=126 +hi! link javaScriptValue Constant +hi! link javaScriptRegexpString rubyRegexp -hi rubyPredefinedIdentifier guifg=#de5577 ctermfg=204 +" CoffeeScript + +hi! link coffeeRegExp javaScriptRegexpString + +" Lua + +hi! link luaOperator Conditional + +" C + +hi! link cFormat Identifier +hi! link cOperator Constant + +" Objective-C/Cocoa + +hi! link objcClass Type +hi! link cocoaClass objcClass +hi! link objcSubclass objcClass +hi! link objcSuperclass objcClass +hi! link objcDirective rubyClass +hi! link objcStatement Constant +hi! link cocoaFunction Function +hi! link objcMethodName Identifier +hi! link objcMethodArg Normal +hi! link objcMessageName Identifier + +" Vimscript + +hi! link vimOper Normal + +" Debugger.vim + +call s:X("DbgCurrent","DEEBFE","345FA8","","White","DarkBlue") +call s:X("DbgBreakPt","","4F0037","","","DarkMagenta") + +" vim-indent-guides + +if !exists("g:indent_guides_auto_colors") + let g:indent_guides_auto_colors = 0 +endif +call s:X("IndentGuidesOdd","","232323","","","") +call s:X("IndentGuidesEven","","1b1b1b","","","") + +" Plugins, etc. + +hi! link TagListFileName Directory +call s:X("PreciseJumpTarget","B9ED67","405026","","White","Green") + +if !exists("g:jellybeans_background_color_256") + let g:jellybeans_background_color_256=233 +end +" Manual overrides for 256-color terminals. Dark colors auto-map badly. +if !s:low_color + hi StatusLineNC ctermbg=235 + hi Folded ctermbg=236 + hi FoldColumn ctermbg=234 + hi SignColumn ctermbg=236 + hi CursorColumn ctermbg=234 + hi CursorLine ctermbg=234 + hi SpecialKey ctermbg=234 + exec "hi NonText ctermbg=".g:jellybeans_background_color_256 + exec "hi LineNr ctermbg=".g:jellybeans_background_color_256 + hi DiffText ctermfg=81 + exec "hi Normal ctermbg=".g:jellybeans_background_color_256 + hi DbgBreakPt ctermbg=53 + hi IndentGuidesOdd ctermbg=235 + hi IndentGuidesEven ctermbg=234 +endif + +if exists("g:jellybeans_overrides") + fun! s:load_colors(defs) + for [l:group, l:v] in items(a:defs) + call s:X(l:group, get(l:v, 'guifg', ''), get(l:v, 'guibg', ''), + \ get(l:v, 'attr', ''), + \ get(l:v, 'ctermfg', ''), get(l:v, 'ctermbg', '')) + if !s:low_color + for l:prop in ['ctermfg', 'ctermbg'] + let l:override_key = '256'.l:prop + if has_key(l:v, l:override_key) + exec "hi ".l:group." ".l:prop."=".l:v[l:override_key] + endif + endfor + endif + unlet l:group + unlet l:v + endfor + endfun + call s:load_colors(g:jellybeans_overrides) + delf s:load_colors +endif -" Tag list -hi link TagListFileName Directory +" delete functions {{{ +delf s:X +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 +" }}} @@ -120,6 +120,10 @@ autocmd BufRead,BufNewFile PKGBUILD let is_bash=1 | set ft=sh "colorscheme gardener "colorscheme desert256 "colorscheme candycode +let g:jellybeans_background_color_256 = 'none' +let g:jellybeans_overrides = { +\ 'SpecialKey': { 'guifg': 'b0b0b0', 'guibg': 'none'} +\} colorscheme jellybeans "colorscheme inkpot "colorscheme mustang |