From 7d4ccd42110be448f9562c8226a89fe3881e22ee Mon Sep 17 00:00:00 2001 From: Matthew Reschke Date: Tue, 3 Mar 2015 12:32:40 -0600 Subject: [PATCH] Updates --- colors/Spink.vim | 220 ++++++++++++ colors/atom-dark.vim | 116 +++++++ colors/cobalt2.vim | 691 +++++++++++++++++++++++++++++++++++++ colors/heroku-terminal.vim | 363 +++++++++++++++++++ colors/heroku.vim | 355 +++++++++++++++++++ colors/molokai.vim | 276 --------------- vimrc | 19 +- 7 files changed, 1755 insertions(+), 285 deletions(-) create mode 100644 colors/Spink.vim create mode 100644 colors/atom-dark.vim create mode 100644 colors/cobalt2.vim create mode 100644 colors/heroku-terminal.vim create mode 100644 colors/heroku.vim delete mode 100644 colors/molokai.vim diff --git a/colors/Spink.vim b/colors/Spink.vim new file mode 100644 index 0000000..c1532e4 --- /dev/null +++ b/colors/Spink.vim @@ -0,0 +1,220 @@ +" Vim color file - Spink +set background=dark +if version > 580 + hi clear + if exists("syntax_on") + syntax reset + endif +endif + +set t_Co=256 +let g:colors_name = "Spink" +let g:unite_cursor_line_highlight = 'UniteLineHi' + +" Alternative support for Vim plugins { +hi MyTagListFileName guifg=#BD9700 guibg=NONE guisp=NONE gui=underline +hi IndentGuidesOdd guifg=NONE guibg=#515e61 guisp=NONE gui=NONE +hi IndentGuidesEven guifg=NONE guibg=#777777 guisp=NONE gui=NONE +hi EasyMotionTarget guifg=#BD9700 guibg=NONE guisp=NONE gui=bold +hi EasyMotionShade guifg=#777777 guibg=NONE guisp=NONE gui=bold +hi EasyMotionTarget2First guifg=#BD9700 guibg=NONE guisp=NONE gui=bold +hi EasyMotionTarget2Second guifg=#BD9700 guibg=NONE guisp=NONE gui=bold +hi CtrlPMatch guifg=#8a3824 guibg=NONE guisp=#F9F9F9 gui=bold +hi UniteLineHi guifg=NONE guibg=#492224 guisp=NONE gui=NONE +hi SyntasticError guifg=#F9F9FF guibg=#912C00 guisp=NONE gui=NONE +hi SyntasticErrorSign guifg=#ceb67f guibg=#492224 guisp=NONE gui=NONE +hi TabLine guifg=#8a3824 guibg=NONE guisp=NONE gui=underline +hi TabLineSel guifg=#9A7B00 guibg=#492224 guisp=NONE gui=underline +hi TabLineFill guifg=#3D3D3D guibg=NONE guisp=NONE gui=underline + + +" Default syntax { +hi Boolean guifg=#A1A6A8 guibg=NONE guisp=NONE gui=NONE +hi Character guifg=#A1A6A8 guibg=NONE guisp=NONE gui=NONE +hi ColorColumn guifg=NONE guibg=#222222 guisp=#5E6C70 gui=NONE +hi Comment guifg=#515e61 guibg=NONE guisp=NONE gui=italic +hi Conditional guifg=#ceb67f guibg=NONE guisp=NONE gui=bold +hi Constant guifg=#8f1d1d guibg=NONE guisp=NONE gui=NONE +hi Cursor guifg=NONE guibg=#750000 guisp=#F9F9F9 gui=NONE +hi iCursor guifg=#BD9800 guibg=#750000 guisp=NONE gui=NONE +hi Underlined guifg=#BD9800 guibg=#750000 guisp=NONE gui=NONE +hi cursorim guifg=#BD9700 guibg=#750000 guisp=#536991 gui=NONE +hi CursorColumn guifg=NONE guibg=#222E30 guisp=#222E30 gui=NONE +hi CursorLine guifg=NONE guibg=#222E30 guisp=#222E30 gui=NONE +hi CursorLineNR guifg=#8A905D guibg=#3C3836 guisp=#222E30 gui=NONE +hi Debug guifg=#BD9800 guibg=NONE guisp=NONE gui=NONE +hi Define guifg=#ceb67f guibg=NONE guisp=NONE gui=NONE +hi Delimiter guifg=#fffedc guibg=NONE guisp=NONE gui=NONE +hi DiffAdd guifg=NONE guibg=#193224 guisp=#193224 gui=NONE +hi DiffChange guifg=NONE guibg=#492224 guisp=#492224 gui=NONE +hi DiffDelete guifg=NONE guibg=#192224 guisp=#192224 gui=NONE +hi DiffText guifg=NONE guibg=#492224 guisp=#492224 gui=NONE +hi Directory guifg=#536991 guibg=NONE guisp=NONE gui=bold +hi Error guifg=NONE guibg=NONE guisp=NONE gui=NONE +hi ErrorMsg guifg=#A1A6A8 guibg=#643c3c guisp=NONE gui=NONE +hi Exception guifg=#ceb67f guibg=NONE guisp=NONE gui=bold +hi Float guifg=#A1A6A8 guibg=NONE guisp=NONE gui=NONE +hi Folded guibg=#2D3239 guifg=#747474 guisp=NONE gui=bold +hi FoldColumn guifg=#66595f guibg=#1a1a1a guisp=#A1A6A8 gui=NONE +hi Function guifg=#8A3824 guibg=NONE guisp=NONE gui=none +hi Identifier guifg=#fffedc guibg=NONE guisp=NONE gui=NONE +hi IncSearch guifg=#400000 guibg=#515e61 guisp=#BD9800 gui=bold +hi Search guifg=NONE guibg=#710000 guisp=#F9F9FF gui=NONE +hi Include guifg=#ceb67f guibg=NONE guisp=NONE gui=NONE +hi Keyword guifg=#727152 guibg=NONE guisp=NONE gui=bold +hi Label guifg=#BD9800 guibg=NONE guisp=NONE gui=bold +hi LineNr guifg=#3C3836 guibg=NONE guisp=NONE gui=NONE +hi Macro guifg=#BD9800 guibg=NONE guisp=NONE gui=NONE +hi MatchParen guifg=NONE guibg=#3F3F3F guisp=NONE gui=bold,italic +hi ModeMsg guifg=#fffedc guibg=#192224 guisp=#192224 gui=bold +hi MoreMsg guifg=#BD9800 guibg=NONE guisp=NONE gui=bold +hi NonText guifg=#5E6C70 guibg=NONE guisp=NONE gui=italic +hi Normal guifg=#CEB67F guibg=#141414 guisp=#0e1314 gui=NONE +hi Number guifg=#8f0000 guibg=NONE guisp=NONE gui=NONE +hi Operator guifg=#BD9800 guibg=NONE guisp=NONE gui=NONE +hi PMenu guifg=#5a5a5a guibg=#141414 guisp=#1a1a1a gui=underline +hi PMenuSbar guifg=NONE guibg=#848688 guisp=#848688 gui=underline +hi PMenuSel guifg=NONE guibg=#750000 guisp=#BD9800 gui=bold,underline +hi PMenuThumb guifg=NONE guibg=#a4a6a8 guisp=#a4a6a8 gui=underline +hi PreCondit guifg=#ceb67f guibg=NONE guisp=NONE gui=NONE +hi PreProc guifg=#ceb67f guibg=NONE guisp=NONE gui=NONE +hi Repeat guifg=#ceb67f guibg=NONE guisp=NONE gui=bold +hi SignColumn guifg=#BD9800 guibg=NONE guisp=#1a1a1a gui=NONE +hi Special guifg=#Fff5bF guibg=NONE guisp=NONE gui=NONE +hi SpecialChar guifg=#ceb67f guibg=NONE guisp=NONE gui=NONE +hi SpecialComment guifg=#BD9800 guibg=NONE guisp=NONE gui=NONE +hi SpecialKey guifg=#5E6C70 guibg=NONE guisp=NONE gui=italic +hi SpellBad guifg=#F9F9FF guibg=#192224 guisp=#192224 gui=underline +hi SpellCap guifg=#F9F9FF guibg=#192224 guisp=#192224 gui=underline +hi SpellLocal guifg=#F9F9FF guibg=#192224 guisp=#192224 gui=underline +hi SpellRare guifg=#F9F9FF guibg=#192224 guisp=#192224 gui=underline +hi Statement guifg=#8a3824 guibg=NONE guisp=NONE gui=bold +hi StatusLine guifg=#9a7824 guibg=NONE guisp=#750000 gui=NONE +hi StatusLineNC guifg=#4A4A4A guibg=NONE guisp=#5E6C70 gui=NONE +hi Bufferline guifg=#4A4A4A guibg=#F9F9F9 guisp=#5E6C70 gui=NONE +hi StorageClass guifg=#A1A6A8 guibg=NONE guisp=NONE gui=italic +hi String guifg=#617689 guibg=NONE guisp=NONE gui=italic +hi Structure guifg=#A1A6A8 guibg=NONE guisp=NONE gui=italic +hi Tag guifg=#ceb67f guibg=NONE guisp=NONE gui=NONE +hi Title guifg=#F9F9FF guibg=#192224 guisp=#192224 gui=bold +hi Todo guifg=#BD9800 guibg=#492224 guisp=#BD9800 gui=NONE +hi Type guifg=#8A905D guibg=NONE guisp=NONE gui=bold +hi Typedef guifg=#536991 guibg=NONE guisp=NONE gui=italic +hi Underlined guifg=NONE guibg=#492224 guisp=NONE gui=NONE +hi VertSplit guifg=#21201F guibg=#21201F guisp=NONE gui=bold +hi Split guifg=#3D3D3D guibg=NONE guisp=NONE gui=bold +hi Visual guifg=NONE guibg=#492224 guisp=#F9F9FF gui=NONE +hi VisualNOS guifg=#192224 guibg=#750000 guisp=#F9F9FF gui=underline +hi WarningMsg guifg=#A1A6A8 guibg=#912C00 guisp=#912C00 gui=NONE +hi WildMenu guifg=#BD9800 guibg=NONE guisp=NONE gui=NONE + +" HTML syntax { +hi HtmlHiLink guifg=NONE guibg=#492224 guisp=NONE gui=underline +hi htmlLinkText guifg=NONE guibg=#492224 guisp=NONE gui=underline +hi htmlTag guifg=#245361 guibg=NONE guisp=#750000 gui=bold +hi htmlEndTag guifg=#245361 guibg=NONE guisp=NONE gui=NONE +hi htmlTagName guifg=#599cab guibg=NONE guisp=NONE gui=NONE +hi htmlTagN guifg=#ceb67f guibg=NONE guisp=NONE gui=NONE +hi htmlString guifg=#FFF5BF guibg=NONE guisp=NONE gui=NONE +hi htmlArg guifg=#599cab guibg=NONE guisp=NONE gui=NONE +hi htmlSpecialChar guifg=#ceb67f guibg=NONE guisp=NONE gui=NONE + +" PHP/ Mysql syntax { +hi PHPprivate guifg=#978A55 guibg=NONE guisp=NONE gui=underline,bold +hi PHPfunction guifg=#978A55 guibg=NONE guisp=NONE gui=underline,bold +hi PHPtest guifg=#978A55 guibg=NONE guisp=NONE gui=underline,bold +hi PHPClass guifg=#978A55 guibg=NONE guisp=NONE gui=underline,bold +hi PHPConstant guifg=#978A55 guibg=NONE guisp=NONE gui=underline,bold +hi mysqlKeyword guifg=#889CAC guibg=NONE guisp=NONE gui=NONE +hi mysqlOperator guifg=#889CAC guibg=NONE guisp=NONE gui=NONE +hi phpFunctions guifg=#6C1C00 guibg=NONE guisp=NONE gui=bold + +" Python syntax { +hi pythonFunction guifg=#8A905D guibg=NONE guisp=NONE gui=underline +hi pythonString guifg=#617689 guibg=NONE guisp=NONE gui=italic +hi pythonStatement guifg=#973824 guibg=NONE guisp=NONE gui=bold +hi pythonInclude guifg=#727152 guibg=NONE guisp=NONE gui=none +hi pythonImport guifg=#727152 guibg=NONE guisp=NONE gui=none +hi pythonOperator guifg=#BD9800 guibg=NONE guisp=NONE gui=none +hi pythonRepeat guifg=#A88800 guibg=NONE guisp=NONE gui=none +hi pythonConditional guifg=#AA8800 guibg=NONE guisp=NONE gui=none + +" Javascript syntax { +hi jsSpecial guifg=#fff5bf guibg=NONE guisp=NONE gui=NONE +hi javascriptSpecial guifg=#fff5bf guibg=NONE guisp=NONE gui=NONE +hi jsString guifg=#868F4E guibg=NONE guisp=NONE gui=italic +hi javascriptString guifg=#868F4E guibg=NONE guisp=NONE gui=italic +hi jsStringS guifg=#868F4E guibg=NONE guisp=NONE gui=italic +hi javascriptStringS guifg=#868F4E guibg=NONE guisp=NONE gui=italic +hi jsStringD guifg=#868F4E guibg=NONE guisp=NONE gui=italic +hi javascriptStringD guifg=#868F4E guibg=NONE guisp=NONE gui=italic +hi jsFunction guifg=#648A1C guibg=NONE guisp=NONE gui=underline,bold +hi javascriptFunction guifg=#648A1C guibg=NONE guisp=NONE gui=underline,bold +hi jsConditional guifg=#C6D93C guibg=NONE guisp=NONE gui=none +hi javascriptConditional guifg=#C6D93C guibg=NONE guisp=NONE gui=none +hi jsFuncName guifg=#648A1C guibg=NONE guisp=NONE gui=underline +hi javascriptFuncName guifg=#648A1C guibg=NONE guisp=NONE gui=underline +hi javascriptIdentifier guifg=#C6D93C guibg=NONE guisp=NONE gui=none +hi jsNumber guifg=#C6D93C guibg=NONE guisp=NONE gui=none +hi javascriptNumber guifg=#C6D93C guibg=NONE guisp=NONE gui=none +hi jsFloat guifg=#C6D93C guibg=NONE guisp=NONE gui=none +hi javascriptFloat guifg=#C6D93C guibg=NONE guisp=NONE gui=none +if (&ft=='javascript' || &ft=='js') + hi level12 guifg=#EEFD86 + hi level13 guifg=#EEFD86 + hi level14 guifg=#EEFD86 + hi level15 guifg=#EEFD86 + hi level16 guifg=#EEFD86 +endif + + + +" CSS syntax { +hi cssTagName guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssAttrComma guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssAttr guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssClassName guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssIdentifier guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssBraces guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssNoise guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssMediaQuery guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssMedia guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssTextProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssFontProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssUIProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssPageProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssTransformProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssDimensionProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssBackgroundPro guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssTransitionPro guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssListProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssBorderProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssTableProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssColorProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssAnimationProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssPositioningPr guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssBoxProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssMediaProp guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssFlexibleBoxPr guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssFunctionNam guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssURL guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssColor guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssClassName guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssImportant guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssStringQQ guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssValueLength guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssValueTime guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssCommonAttr guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssUnitDecorator guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssValueNumber guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi cssPseudoClass guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi sassProperty guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE +hi sassComment guifg=#599cab guibg=NONE guisp=#1a1a1a gui=NONE + +if (&ft=='css') + hi level12 guifg=#CEA65B guibg=NONE guisp=#1a1a1a gui=NONE + hi level13 guifg=#CEA65B guibg=NONE guisp=#1a1a1a gui=NONE + hi level14 guifg=#CEA65B guibg=NONE guisp=#1a1a1a gui=NONE + hi level15 guifg=#CEA65B guibg=NONE guisp=#1a1a1a gui=NONE + hi level16 guifg=#CEA65B guibg=NONE guisp=#1a1a1a gui=NONE +endif diff --git a/colors/atom-dark.vim b/colors/atom-dark.vim new file mode 100644 index 0000000..52f52f7 --- /dev/null +++ b/colors/atom-dark.vim @@ -0,0 +1,116 @@ +" Vim color file +" +" Author: Federico Ramirez +" https://github.com/gosukiwi/vim-atom-dark +" +" Note: Based on the Monokai theme variation by Tomas Restrepo +" https://github.com/tomasr/molokai + +hi clear + +if version > 580 + " no guarantees for version 5.8 and below, but this makes it stop + " complaining + hi clear + if exists("syntax_on") + syntax reset + endif +endif +let g:colors_name="atom-dark" + +hi Boolean guifg=#99CC99 +hi Character guifg=#A8FF60 +hi Number guifg=#99CC99 +hi String guifg=#A8FF60 +hi Conditional guifg=#92C5F7 gui=none +hi Constant guifg=#99CC99 gui=none +hi Cursor guifg=#F1F1F1 guibg=#777777 +hi iCursor guifg=#F1F1F1 guibg=#777777 +hi Debug guifg=#BCA3A3 gui=none +hi Define guifg=#66D9EF +hi Delimiter guifg=#8F8F8F +hi DiffAdd guibg=#13354A +hi DiffChange guifg=#89807D guibg=#4C4745 +hi DiffDelete guifg=#960050 guibg=#1E0010 +hi DiffText guibg=#4C4745 gui=none + +hi Directory guifg=#AAAAAA gui=none +hi Error guifg=#A8FF60 guibg=#1E0010 +hi ErrorMsg guifg=#92C5F7 guibg=#232526 gui=none +hi Exception guifg=#DAD085 gui=none +hi Float guifg=#99CC99 +hi FoldColumn guifg=#465457 guibg=#000000 +hi Folded guifg=#465457 guibg=#000000 +hi Function guifg=#DAD085 +hi Identifier guifg=#B6B7EB +hi Ignore guifg=#808080 guibg=bg +hi IncSearch guifg=#C4BE89 guibg=#000000 + +hi Keyword guifg=#92C5F7 gui=none +hi Label guifg=#A8FF60 gui=none +hi Macro guifg=#C4BE89 gui=none +hi SpecialKey guifg=#66D9EF gui=none + +hi MatchParen guifg=#B7B9B8 guibg=#444444 gui=none +hi ModeMsg guifg=#A8FF60 +hi MoreMsg guifg=#A8FF60 +hi Operator guifg=#92C5F7 + +" complete menu +hi Pmenu guifg=#66D9EF guibg=#000000 +hi PmenuSel guibg=#808080 +hi PmenuSbar guibg=#080808 +hi PmenuThumb guifg=#66D9EF + +hi PreCondit guifg=#DAD085 gui=none +hi PreProc guifg=#DAD085 +hi Question guifg=#66D9EF +hi Repeat guifg=#92C5F7 gui=none +hi Search guifg=#000000 guibg=#B4EC85 +" marks +hi SignColumn guifg=#DAD085 guibg=#232526 +hi SpecialChar guifg=#92C5F7 gui=none +hi SpecialComment guifg=#7C7C7C gui=none +hi Special guifg=#66D9EF guibg=bg gui=none +if has("spell") + hi SpellBad guisp=#FF0000 gui=undercurl + hi SpellCap guisp=#7070F0 gui=undercurl + hi SpellLocal guisp=#70F0F0 gui=undercurl + hi SpellRare guisp=#FFFFFF gui=undercurl +endif +hi Statement guifg=#92C5F7 gui=none +hi StatusLine guifg=#455354 guibg=fg gui=none +hi StatusLineNC guifg=#808080 guibg=#080808 +hi StorageClass guifg=#B6B7EB gui=none +hi Structure guifg=#66D9EF +hi Tag guifg=#92C5F7 gui=none +hi Title guifg=#B6B7EB gui=none +hi Todo guifg=#FFFFFF guibg=bg gui=none + +hi Typedef guifg=#66D9EF +hi Type guifg=#66D9EF gui=none +hi Underlined guifg=#808080 gui=underline + +hi VertSplit guifg=#808080 guibg=#080808 +hi VisualNOS guibg=#403D3D +hi Visual guibg=#403D3D +hi WarningMsg guifg=#FFFFFF guibg=#333333 +hi WildMenu guifg=#66D9EF guibg=#000000 + +hi TabLineFill guifg=#1D1F21 guibg=#1D1F21 +hi TabLine guibg=#1D1F21 guifg=#808080 gui=none + +hi Normal guifg=#F8F8F2 guibg=#1D1F21 +hi Comment guifg=#7C7C7C +hi CursorLine guibg=#293739 +hi CursorLineNr guifg=#B6B7EB gui=none +hi CursorColumn guibg=#293739 +hi ColorColumn guibg=#232526 +hi LineNr guifg=#465457 guibg=#232526 +hi NonText guifg=#465457 +hi SpecialKey guifg=#465457 + +" Must be at the end, because of ctermbg=234 bug. +" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ +set background=dark + diff --git a/colors/cobalt2.vim b/colors/cobalt2.vim new file mode 100644 index 0000000..eb5136e --- /dev/null +++ b/colors/cobalt2.vim @@ -0,0 +1,691 @@ +" Vim color file +" Author: Gertjan Reynaert (port from theme of Wes Bos) +" Notes: Cobalt2 color scheme port for VIM + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "cobalt" + +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 + +" 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:cobalt_bg") + let g:cobalt_bg = "193549" +end + +let g:black = "000000" " #000000 +let g:light_grey = "CCCCCC" " #CCCCCC +let g:white = "FFFFFF" " #FFFFFF +let g:dark_orange = "FF9A00" " #FF9A00 +let g:light_orange = "FF9D00" " #FF9D00 +let g:yellow = "FFC600" " #FFC600 +let g:light_yellow = "F2ED7F" " #F2ED7F +let g:green = "3AD900" " #3AD900 +let g:light_green = "88FF88" " #88FF88 +let g:purple = "967EFB" " #967EFB +let g:darkest_blue = "0050A4" " #0050A4 +let g:dark_blue = "0088FF" " #0088FF +let g:blue = "00AAFF" " #00AAFF +let g:light_blue = "80FCFF" " #80FCFF +let g:dark_red = "902020" " #902020 +let g:red = "FF0000" " #FF0000 +let g:dark_pink = "FF628C" " #FF628C +let g:pink = "FF00FF" " #FF00FF +let g:light_pink = "EE80E1" " #EE80E1 +let g:lightest_pink = "FFA5F3" " #FFA5F3 +let g:dirty_pink = "EB939A" " #EB939A + +" regex +let g:regex_or = "22FF00" " #22FF00 +let g:regex_group = "22FF00" " #22FF00 +let g:regex_quantifier = "55FF66" " #55FF66 +let g:regex_boundary = "88FF88" " #88FF88 +let g:regex_char_group = "9DFF99" " #9DFF99 +let g:regex_string = "BBFFDD" " #BBFFDD + +call s:X("Normal",g:white,g:cobalt_bg,"","White","") +set background=dark + +let s:termBlack = "Black" + +call s:X("MatchParen",g:white,"556779","bold","","DarkCyan") + +" vim tabpane headers +call s:X("TabLine",g:black,"b0b8c0","italic","",s:termBlack) +call s:X("TabLineFill","9098a0","","","",s:termBlack) +call s:X("TabLineSel",g:black,g:yellow,"italic,bold",s:termBlack,"White") + +" Auto-completion +call s:X("Pmenu",g:white,"606060","","White",s:termBlack) +call s:X("PmenuSel","101010","eeeeee","",s:termBlack,"White") + +call s:X("Visual","",g:darkest_blue,"","",s:termBlack) + +call s:X("Cursor",g:cobalt_bg,g:yellow,"","","") +call s:X("CursorColumn","",g:yellow,"","",s:termBlack) +call s:X("CursorLine","",g:yellow,"","",s:termBlack) +call s:X("CursorLineNr",g:light_blue,"","none","White","") + +call s:X("LineNr","605958",g:cobalt_bg,"none",s:termBlack,"") +call s:X("Comment",g:dark_blue,"","italic","Grey","") +call s:X("Todo",g:dark_blue,"","bold","Grey", "") + +call s:X("StatusLine",g:black,"dddddd","italic","","White") +call s:X("StatusLineNC",g:white,"403c41","italic","White","Black") +call s:X("VertSplit",g:yellow,"","","","") +call s:X("WildMenu","f0a0c0","302028","","Magenta","") + +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","",g:black,"","",s:termBlack) + +call s:X("Title","70b950","","bold","Green","") + +call s:X("Constant",g:dark_pink,"","","Red","") +call s:X("Special",g:light_green,"","","Green","") +call s:X("Delimiter","668799","","","Grey","") + +call s:X("String",g:green,"","","Green","") +call s:X("StringDelimiter",g:green,"","","Green","") + +call s:X("Identifier",g:dark_orange,"","",g:dark_orange,"") +hi! link Structure Comment +" call s:X("Structure","#8fbfdc","","","LightCyan","") +call s:X("Function",g:yellow,"","","","") +call s:X("Statement",g:dark_orange,"","","","") +hi! link PreProc Identifier + +hi! link Operator Structure + +call s:X("Type",g:yellow,"","","Yellow","") +call s:X("NonText","606060",g:cobalt_bg,"",s:termBlack,"") + +call s:X("SpecialKey","444444","1c1c1c","",s:termBlack,"") + +call s:X("Search",g:yellow,"302028","underline","Magenta","") + +call s:X("Directory",g:yellow,"","","Yellow","") +call s:X("ErrorMsg","",g:dark_red,"","","DarkRed") +hi! link Error ErrorMsg +hi! link MoreMsg Special +call s:X("Question","65C254","","","Green","") + +" Spell Checking + +call s:X("SpellBad",g:dark_red,"","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 + +" VimDiff + +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",g:black,"reverse","Yellow","") + +" PHP + +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 + +call s:X("rubyClass",g:dark_orange,"","","DarkBlue","") +hi! link rubyModule rubyClass + +call s:X("rubyInstanceVariable",g:light_grey,"","","Cyan","") +call s:X("rubySymbol",g:dark_pink,"","","Magenta","") +hi! link rubyGlobalVariable rubyInstanceVariable + +call s:X("rubyAccess",g:purple,"","","","") + +" params between pipes after do, and pipes themselfs +call s:X("rubyBlockParameter",g:light_grey,"","","Blue","") +call s:X("rubyBlockParameterList",g:white,"","","Blue","") + +call s:X("rubyInterpolation","9EFF80","","","Magenta","") +call s:X("rubyInterpolationDelimiter",g:white,"","","Magenta","") + +call s:X("rubyRegexpDelimiter","80FFC2","","","","") +call s:X("rubyRegexp","80FFC2","","","","") +call s:X("rubyRegexpSpecial",g:white,"","","","") +call s:X("rubyRegexpEscape","80FFC2","","","","") + +" JavaScript + +hi! link javaScriptValue Constant +hi! link javaScriptRegexpString rubyRegexp + +call s:X("jsFunction",g:light_pink,"","","","") +call s:X("jsFuncCall",g:yellow,"","","","") +call s:X("jsOperator",g:light_orange,"","","","") +call s:X("jsStorageClass",g:yellow,"","","","") +call s:X("jsFuncArgs",g:light_grey,"","","","") + +call s:X("jsBuiltins",g:light_orange,"","","","") +call s:X("jsUndefined",g:dark_pink,"","","","") +call s:X("jsThis",g:light_pink,"","","","") +call s:X("jsPrototype","EB939A","","","","") + +call s:X("jsRegexpOr","22FF00","","","","") " #22FF00 | highlight +call s:X("jsRegexpQuantifier","55FF66","","","","") " #55FF66 ? and {4} +call s:X("jsRegexpGroup","22FF00","","","","") " #22FF00 ( and ) +call s:X("jsRegexpBoundary","88FF88","","","","") " #88FF88 start and end of regex +call s:X("jsRegexpCharClass","9DFF99","","","","") " #9DFF99 [A-z] +call s:X("jsRegexpString","BBFFDD","","","","") " #BBFFDD regular text +call s:X("jsRegexpMod",g:pink,"","","","") +call s:X("jsRegexpBackRef",g:light_orange,"","","","") + +" CoffeeScript + +hi! link coffeeComment comment +hi! link coffeeBlockComment comment +hi! link coffeeTodo todo +hi! link coffeeHeregexComment comment +call s:X("coffeeKeyword",g:dark_orange,"","","","") +call s:X("coffeeObject",g:blue,"","","","") +call s:X("coffeeObjAssign",g:yellow,"","","","") +call s:X("coffeeExtendedOp",g:dark_orange,"","","","") +call s:X("coffeeParen",g:light_grey,"","","","") +call s:X("coffeeParens",g:light_grey,"","","","") +call s:X("coffeeSpecialOp",g:light_grey,"","","","") +call s:X("coffeeStatement",g:dark_orange,"","","","") +hi! link coffeeString String +hi! link coffeeHeredoc String +call s:X("coffeeInterpDelim",g:white,"","","","") +call s:X("coffeeInterp","9EFF80","","","","") " #9EFF80 +call s:X("coffeeRegex","80FFC2","","","","") " #80FFC2 +call s:X("coffeeEscape","98F99D","","","","") " #98F99D +call s:X("coffeeRegexCharSet","22FF00","","","","") " #22FF00 +call s:X("coffeeHeregex","80FFC2","","","","") " #80FFC2 +call s:X("coffeeHeregexCharSet","22FF00","","","","") " #22FF00 +call s:X("coffeeSpecialIdent",g:light_grey,"","","","") +call s:X("coffeeBracket",g:white,"","","","") +call s:X("coffeeBrackets",g:white,"","","","") +call s:X("coffeeNumber",g:dark_pink,"","","","") +call s:X("coffeeFloat",g:dark_pink,"","","","") +call s:X("coffeeCurly",g:white,"","","","") +call s:X("coffeeCurlies",g:white,"","","","") +call s:X("coffeeConditional",g:dark_orange,"","","","") +call s:X("coffeeBoolean",g:dark_pink,"","","","") +call s:X("coffeeSpecialVar",g:light_pink,"","","","") +call s:X("coffeeDotAccess",g:white,"","","","") +call s:X("coffeeConstant",g:dark_pink,"","","","") +call s:X("coffeeRepeat",g:dark_orange,"","","","") +call s:X("coffeeGlobal",g:dark_pink,"","","","") +call s:X("coffeeOperator",g:dark_orange,"","","","") +hi! link coffeeSemicolonError ErrorMsg +hi! link coffeeReservedError ErrorMsg +hi! link coffeeSpaceError ErrorMsg + +" HTML +call s:X("htmlTag",g:light_grey,"","","","") +call s:X("htmlEndTag",g:light_grey,"","","","") +call s:X("htmlTagName",g:light_blue,"","","","") +call s:X("htmlSpecialTagName",g:blue,"","","","") + + +call s:X("htmlArg",g:dark_orange,"","","","") +call s:X("htmlEvent",g:dark_orange,"","","","") +call s:X("htmlString",g:yellow,"","","","") + +call s:X("htmlTitle",g:purple,"","","","") +call s:X("htmlH1",g:light_orange,"","","","") +call s:X("htmlItalic",g:pink,"","","","") + +" Haml +hi! link hamlTag htmlTag +hi! link hamlIdChar hamlId +hi! link hamlClassChar hamlClass +call s:X("hamlAttributes",g:pink,"","","","") +call s:X("hamlInterpolationDelimiter",g:green,"","","","") + +" call s:X("hamlInterpolation",g:pink,"","","","") +" call s:X("hamlObject",g:pink,"","","","") +" call s:X("hamlInterpolatable",g:pink,"","","","") +" call s:X("hamlRubyFilter",g:pink,"","","","") +" call s:X("hamlBegin",g:pink,"","","","") +" call s:X("hamlEscapedFilter",g:pink,"","","","") + +" call s:X("hamlPlainFilter",g:pink,"","","","") +" call s:X("hamlSassFilter",g:pink,"","","","") +" call s:X("hamlErbFilter",g:pink,"","","","") +" call s:X("hamlJavascriptFilter",g:pink,"","","","") +" call s:X("hamlCSSFilter",g:pink,"","","","") +" call s:X("hamlJavascriptBlock",g:pink,"","","","") +" call s:X("hamlCssBlock",g:pink,"","","","") +" call s:X("hamlCoffeescriptFilter",g:pink,"","","","") + +" Markdown +call s:X("markdownH1",g:yellow,"","","","") +hi! link markdownH2 markdownH1 +hi! link markdownH3 markdownH1 +hi! link markdownH4 markdownH1 +hi! link markdownH5 markdownH1 +hi! link markdownH6 markdownH1 +call s:X("markdownHeadingRule",g:dark_orange,"","","","") +hi! link markdownHeadingDelimiter markdownHeadingRule + +call s:X("markdownRule",g:light_blue,"","","","") + +call s:X("markdownCode","AAAAAA","","","","") +hi! link markdownCodeBlock markdownCode +call s:X("markdownCodeDelimiter",g:dark_blue,"","","","") + +call s:X("markdownLinkText",g:green,"","","","") +call s:X("markdownUrl",g:dark_pink,"","","","") + +call s:X("markdownId",g:yellow,"","","","") +hi! link markdownIdDeclaration markdownId + +" CSS +call s:X("cssIdentifier",g:yellow,"","","","") +call s:X("cssIncludeKeyword",g:dark_orange,"","","","") +call s:X("cssMediaType",g:dirty_pink,"","","","") +call s:X("cssMediaKeyword",g:dark_orange,"","","","") +call s:X("cssInclude",g:white,"","","","") +call s:X("cssMediaProp",g:light_green,"","","","") +call s:X("cssValueLength",g:light_yellow,"","","","") +call s:X("cssUnitDecorators",g:dark_orange,"","","","") +call s:X("cssBraces",g:white,"","","","") +call s:X("cssTagName",g:light_blue,"","","","") +call s:X("cssClassName",g:green,"","","","") +call s:X("cssPseudoClassFn",g:dark_pink,"","","","") + +call s:X("cssBoxAttr",g:light_yellow,"","","","") +hi! link cssValueNumber cssBoxAttr +hi! link cssCommonAttr cssBoxAttr +hi! link cssPositioningAttr cssBoxAttr +hi! link cssFontAttr cssBoxAttr +hi! link cssBorderAttr cssBoxAttr +hi! link cssTextAttr cssBoxAttr +hi! link cssDimensionAttr cssBoxAttr +hi! link cssBackgroundAttr cssBoxAttr +hi! link cssPageAttr cssBoxAttr +hi! link cssColorAttr cssBoxAttr +hi! link cssTransitionAttr cssBoxAttr +hi! link cssUIAttr cssBoxAttr + +call s:X("cssBoxProp",g:light_green,"","","","") +hi! link cssTextProp cssBoxProp +hi! link cssDimensionProp cssBoxProp +hi! link cssFontProp cssBoxProp +hi! link cssPositioningProp cssBoxProp +hi! link cssBackgroundProp cssBoxProp +hi! link cssBorderProp cssBoxProp +hi! link cssPageProp cssBoxProp +hi! link cssColorProp cssBoxProp +hi! link cssTransitionProp cssBoxProp +hi! link cssUIProp cssBoxProp + +" SCSS/SASS +hi! link sassIdChar cssIdentifier +hi! link sassId cssIdentifier +hi! link sassClass cssClassName +hi! link sassCssAttribute cssBoxAttr + +" JSON +call s:X("jsonBraces",g:purple,"","","","") +call s:X("jsonQuote",g:dark_blue,"","","","") +call s:X("jsonNoise",g:dark_blue,"","","","") +call s:X("jsonKeywordMatch",g:dark_blue,"","","","") + +" Erlang + +hi! link erlangAtom rubySymbol +hi! link erlangBIF rubyPredefinedIdentifier +hi! link erlangFunction rubyPredefinedIdentifier +hi! link erlangDirective Statement +hi! link erlangNode Identifier + +" 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") + +" NERDTree + +call s:X("NERDTreeHelp","345FA8","","","","") +call s:X("NERDTreeUp","345FA8","","","","") + +call s:X("NERDTreeOpenable",g:yellow,"","","","") +call s:X("NERDTreeClosable",g:red,"","","","") +call s:X("NERDTreeDir",g:yellow,"","","","") +hi! link NERDTreeDirSlash Ignore + +call s:X("NERDTreeExecFile",g:purple,"","","","") + +" Grep search +call s:X("qfLineNr",g:dark_blue,"","","","") + +if !exists("g:cobalt_bg_256") + let g:cobalt_bg_256="NONE" +end + +" Manual overrides for 256-color terminals. Dark colors auto-map badly. +if !s:low_color + hi StatusLineNC ctermbg=232 + hi Folded ctermbg=236 + hi FoldColumn ctermbg=234 + hi SignColumn ctermbg=236 + hi CursorColumn ctermbg=234 + hi CursorLine ctermbg=235 + hi SpecialKey ctermbg=234 + exec "hi NonText ctermbg=".g:cobalt_bg_256 + exec "hi LineNr ctermbg=".g:cobalt_bg_256 + hi DiffText ctermfg=81 + exec "hi Normal ctermbg=".g:cobalt_bg_256 + hi DbgBreakPt ctermbg=53 + hi IndentGuidesOdd ctermbg=235 + hi IndentGuidesEven ctermbg=234 +endif + +" 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 diff --git a/colors/heroku-terminal.vim b/colors/heroku-terminal.vim new file mode 100644 index 0000000..23c5b3e --- /dev/null +++ b/colors/heroku-terminal.vim @@ -0,0 +1,363 @@ +" Heroku Colorscheme +" +" - iTerm2 only +" - Depends on heroku colorscheme for iTerm2 +" - It's for terminal vim only; +" - Hex color conversion functions borrowed from the theme 'Desert256'" + +let s:background = "1b1b24" +let s:foreground = "8584ae" +let s:selection = "ffffff" +let s:line = "262633" +let s:comment = "62548b" +let s:red = "c13333" +let s:orange = "ffa500" +let s:yellow = "ffea00" +let s:green = "6dba09" +let s:aqua = "b4f5fe" +let s:blue = "09afed" +let s:purple = "a292ff" +let s:window = "17171d" + +set background=dark +hi clear +hi clear SpellCap +hi clear SpellBad +hi SpellBad cterm=underline +syntax reset + +let g:colors_name = "heroku-terminal" + +if &t_Co == 88 || &t_Co == 256 + " Returns an approximate grey index for the given grey level + fun 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 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 grey_colour(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 colour index for the given colour level + fun 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 colour level for the given colour index + fun 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 colour indices + fun rgb_colour(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 colour levels + fun colour(r, g, b) + " Get the closest grey + let l:gx = grey_number(a:r) + let l:gy = grey_number(a:g) + let l:gz = grey_number(a:b) + + " Get the closest colour + let l:x = rgb_number(a:r) + let l:y = rgb_number(a:g) + let l:z = rgb_number(a:b) + + if l:gx == l:gy && l:gy == l:gz + " There are two possibilities + let l:dgr = grey_level(l:gx) - a:r + let l:dgg = grey_level(l:gy) - a:g + let l:dgb = grey_level(l:gz) - a:b + let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) + let l:dr = rgb_level(l:gx) - a:r + let l:dg = rgb_level(l:gy) - a:g + let l:db = 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 grey_colour(l:gx) + else + " Use the colour + return rgb_colour(l:x, l:y, l:z) + endif + else + " Only one possibility + return rgb_colour(l:x, l:y, l:z) + endif + endfun + + " Returns the palette index to approximate the 'rrggbb' hex string + fun 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 colour(l:r, l:g, l:b) + endfun + + " Sets the highlighting for the given group + fun X(group, fg, bg, attr) + if a:fg != "" + exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . rgb(a:fg) + endif + if a:bg != "" + exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . rgb(a:bg) + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + endfun + + " Vim Highlighting + highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE gui=NONE guifg=DarkGrey guibg=NONE + call X("NonText", s:comment, "", "") + call X("SpecialKey", s:selection, "", "") + call X("Search", s:yellow, s:background, "") + call X("TabLine", s:foreground, s:background, "reverse") + call X("StatusLine", s:window, s:yellow, "reverse") + call X("StatusLineNC", s:window, s:foreground, "reverse") + call X("VertSplit", s:window, s:window, "none") + call X("Visual", "", s:selection, "") + call X("Directory", s:blue, "", "") + call X("ModeMsg", s:green, "", "") + call X("MoreMsg", s:green, "", "") + call X("Question", s:green, "", "") + call X("WarningMsg", s:red, "", "") + call X("MatchParen", s:selection, s:foreground, "") + call X("Folded", s:comment, s:background, "") + call X("FoldColumn", "", s:background, "") + if version >= 700 + call X("CursorLine", "", s:line, "none") + call X("CursorColumn", "", s:line, "none") + call X("PMenu", s:foreground, s:selection, "none") + call X("PMenuSel", s:foreground, s:selection, "reverse") + end + if version >= 703 + call X("ColorColumn", "", s:line, "none") + end + + " Standard Highlighting + call X("Comment", s:comment, "", "") + call X("Todo", s:comment, s:foreground, "") + call X("Title", s:comment, "", "") + call X("Identifier", s:red, "", "none") + call X("Statement", s:foreground, "", "") + call X("Conditional", s:foreground, "", "") + call X("Repeat", s:foreground, "", "") + call X("Structure", s:purple, "", "") + call X("Function", s:blue, "", "") + call X("Constant", s:orange, "", "") + call X("String", s:green, "", "") + call X("Special", s:foreground, "", "") + call X("PreProc", s:purple, "", "") + call X("Operator", s:aqua, "", "none") + call X("Type", s:blue, "", "none") + call X("Define", s:purple, "", "none") + call X("Include", s:blue, "", "") + "call X("Ignore", "666666", "", "") + + " Vim Highlighting + call X("vimCommand", s:red, "", "none") + + " C Highlighting + call X("cType", s:yellow, "", "") + call X("cStorageClass", s:purple, "", "") + call X("cConditional", s:purple, "", "") + call X("cRepeat", s:purple, "", "") + + " PHP Highlighting + call X("phpVarSelector", s:red, "", "") + call X("phpKeyword", s:purple, "", "") + call X("phpRepeat", s:purple, "", "") + call X("phpConditional", s:purple, "", "") + call X("phpStatement", s:purple, "", "") + call X("phpMemberSelector", s:foreground, "", "") + + " Ruby Highlighting + call X("rubySymbol", s:green, "", "") + call X("rubyConstant", s:yellow, "", "") + call X("rubyAttribute", s:blue, "", "") + call X("rubyInclude", s:blue, "", "") + call X("rubyLocalVariableOrMethod", s:orange, "", "") + call X("rubyCurlyBlock", s:orange, "", "") + call X("rubyStringDelimiter", s:green, "", "") + call X("rubyInterpolationDelimiter", s:orange, "", "") + call X("rubyConditional", s:purple, "", "") + call X("rubyRepeat", s:purple, "", "") + + " Python Highlighting + call X("pythonInclude", s:purple, "", "") + call X("pythonStatement", s:purple, "", "") + call X("pythonConditional", s:purple, "", "") + call X("pythonFunction", s:blue, "", "") + + " JavaScript Highlighting + call X("javaScriptBraces", s:foreground, "", "") + call X("javaScriptFunction", s:purple, "", "") + call X("javaScriptConditional", s:purple, "", "") + call X("javaScriptRepeat", s:purple, "", "") + call X("javaScriptNumber", s:orange, "", "") + call X("javaScriptMember", s:orange, "", "") + + " CoffeeScript Highlighting + call X("coffeeKeyword", s:orange, "", "") + call X("coffeeRepeat", s:orange, "", "") + call X("coffeeConditional", s:orange, "", "") + + call X("coffeeParen", s:aqua, "", "") + call X("coffeeParens", s:blue, "", "") + call X("coffeeBracket", s:aqua, "", "") + call X("coffeeBrackets", s:blue, "", "") + + call X("coffeeDotAccess", s:aqua, "", "") + call X("coffeeStatement", s:red, "", "") + + " HTML Highlighting + call X("htmlTag", s:red, "", "") + call X("htmlTagName", s:red, "", "") + call X("htmlArg", s:red, "", "") + call X("htmlScriptTag", s:red, "", "") + + " Diff Highlighting + call X("diffAdded", s:green, "", "") + call X("diffRemoved", s:red, "", "") + + " Delete Functions + delf X + delf rgb + delf colour + delf rgb_colour + delf rgb_level + delf rgb_number + delf grey_colour + delf grey_level + delf grey_number +endif diff --git a/colors/heroku.vim b/colors/heroku.vim new file mode 100644 index 0000000..a11b931 --- /dev/null +++ b/colors/heroku.vim @@ -0,0 +1,355 @@ +let s:foreground = "8584ae" +let s:background = "1b1b24" +let s:selection = "ffffff" +let s:line = "262633" +let s:comment = "62548b" +let s:red = "c13333" +let s:orange = "ffa500" +let s:yellow = "ffea00" +let s:green = "6dba09" +let s:aqua = "b4f5fe" +let s:blue = "09afed" +let s:purple = "a292ff" +let s:window = "17171d" + +set background=dark +hi clear +hi clear SpellBad +syntax reset + +let g:colors_name = "heroku" + +if has("gui_running") + " Returns an approximate grey index for the given grey level + fun 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 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 grey_colour(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 colour index for the given colour level + fun 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 colour level for the given colour index + fun 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 colour indices + fun rgb_colour(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 colour levels + fun colour(r, g, b) + " Get the closest grey + let l:gx = grey_number(a:r) + let l:gy = grey_number(a:g) + let l:gz = grey_number(a:b) + + " Get the closest colour + let l:x = rgb_number(a:r) + let l:y = rgb_number(a:g) + let l:z = rgb_number(a:b) + + if l:gx == l:gy && l:gy == l:gz + " There are two possibilities + let l:dgr = grey_level(l:gx) - a:r + let l:dgg = grey_level(l:gy) - a:g + let l:dgb = grey_level(l:gz) - a:b + let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) + let l:dr = rgb_level(l:gx) - a:r + let l:dg = rgb_level(l:gy) - a:g + let l:db = 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 grey_colour(l:gx) + else + " Use the colour + return rgb_colour(l:x, l:y, l:z) + endif + else + " Only one possibility + return rgb_colour(l:x, l:y, l:z) + endif + endfun + + " Returns the palette index to approximate the 'rrggbb' hex string + fun 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 colour(l:r, l:g, l:b) + endfun + + " Sets the highlighting for the given group + fun X(group, fg, bg, attr) + if a:fg != "" + exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . rgb(a:fg) + endif + if a:bg != "" + exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . rgb(a:bg) + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + endfun + + " Vim Highlighting + call X("Normal", s:foreground, s:background, "") + highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE gui=NONE guifg=DarkGrey guibg=NONE + call X("NonText", s:comment, "", "") + call X("SpecialKey", s:selection, "", "") + call X("Search", s:foreground, s:yellow, "") + call X("TabLine", s:foreground, s:background, "reverse") + call X("StatusLine", s:window, s:yellow, "reverse") + call X("StatusLineNC", s:window, s:foreground, "reverse") + call X("VertSplit", s:window, s:window, "none") + call X("Visual", "", s:selection, "") + call X("Directory", s:blue, "", "") + call X("ModeMsg", s:green, "", "") + call X("MoreMsg", s:green, "", "") + call X("Question", s:green, "", "") + call X("WarningMsg", s:red, "", "") + call X("MatchParen", "", s:selection, "") + call X("Folded", s:comment, s:background, "") + call X("FoldColumn", "", s:background, "") + if version >= 700 + call X("CursorLine", "", s:line, "none") + call X("CursorColumn", "", s:line, "none") + call X("PMenu", s:foreground, s:selection, "none") + call X("PMenuSel", s:foreground, s:selection, "reverse") + end + if version >= 703 + call X("ColorColumn", "", s:line, "none") + end + + " Standard Highlighting + call X("Comment", s:comment, "", "") + call X("Todo", s:comment, s:background, "") + call X("Title", s:comment, "", "") + call X("Identifier", s:red, "", "none") + call X("Statement", s:foreground, "", "") + call X("Conditional", s:foreground, "", "") + call X("Repeat", s:foreground, "", "") + call X("Structure", s:purple, "", "") + call X("Function", s:blue, "", "") + call X("Constant", s:orange, "", "") + call X("String", s:green, "", "") + call X("Special", s:foreground, "", "") + call X("PreProc", s:purple, "", "") + call X("Operator", s:aqua, "", "none") + call X("Type", s:blue, "", "none") + call X("Define", s:purple, "", "none") + call X("Include", s:blue, "", "") + "call X("Ignore", "666666", "", "") + + " Vim Highlighting + call X("vimCommand", s:red, "", "none") + + " C Highlighting + call X("cType", s:yellow, "", "") + call X("cStorageClass", s:purple, "", "") + call X("cConditional", s:purple, "", "") + call X("cRepeat", s:purple, "", "") + + " PHP Highlighting + call X("phpVarSelector", s:red, "", "") + call X("phpKeyword", s:purple, "", "") + call X("phpRepeat", s:purple, "", "") + call X("phpConditional", s:purple, "", "") + call X("phpStatement", s:purple, "", "") + call X("phpMemberSelector", s:foreground, "", "") + + " Ruby Highlighting + call X("rubySymbol", s:green, "", "") + call X("rubyConstant", s:yellow, "", "") + call X("rubyAttribute", s:blue, "", "") + call X("rubyInclude", s:blue, "", "") + call X("rubyLocalVariableOrMethod", s:orange, "", "") + call X("rubyCurlyBlock", s:orange, "", "") + call X("rubyStringDelimiter", s:green, "", "") + call X("rubyInterpolationDelimiter", s:orange, "", "") + call X("rubyConditional", s:purple, "", "") + call X("rubyRepeat", s:purple, "", "") + + " Python Highlighting + call X("pythonInclude", s:purple, "", "") + call X("pythonStatement", s:purple, "", "") + call X("pythonConditional", s:purple, "", "") + call X("pythonFunction", s:blue, "", "") + + " JavaScript Highlighting + call X("javaScriptBraces", s:foreground, "", "") + call X("javaScriptFunction", s:purple, "", "") + call X("javaScriptConditional", s:purple, "", "") + call X("javaScriptRepeat", s:purple, "", "") + call X("javaScriptNumber", s:orange, "", "") + call X("javaScriptMember", s:orange, "", "") + + " CoffeeScript Highlighting + call X("coffeeKeyword", s:orange, "", "") + call X("coffeeRepeat", s:orange, "", "") + call X("coffeeConditional", s:orange, "", "") + + call X("coffeeParen", s:aqua, "", "") + call X("coffeeParens", s:blue, "", "") + call X("coffeeBracket", s:aqua, "", "") + call X("coffeeBrackets", s:blue, "", "") + + call X("coffeeDotAccess", s:aqua, "", "") + call X("coffeeStatement", s:red, "", "") + + " HTML Highlighting + call X("htmlTag", s:red, "", "") + call X("htmlTagName", s:red, "", "") + call X("htmlArg", s:red, "", "") + call X("htmlScriptTag", s:red, "", "") + + " Diff Highlighting + call X("diffAdded", s:green, "", "") + call X("diffRemoved", s:red, "", "") + + " Delete Functions + delf X + delf rgb + delf colour + delf rgb_colour + delf rgb_level + delf rgb_number + delf grey_colour + delf grey_level + delf grey_number +endif diff --git a/colors/molokai.vim b/colors/molokai.vim deleted file mode 100644 index 6d97053..0000000 --- a/colors/molokai.vim +++ /dev/null @@ -1,276 +0,0 @@ -" Vim color file -" -" Author: Tomas Restrepo -" https://github.com/tomasr/molokai -" -" Note: Based on the Monokai theme for TextMate -" by Wimer Hazenberg and its darker variant -" by Hamish Stuart Macpherson -" - -hi clear - -if version > 580 - " no guarantees for version 5.8 and below, but this makes it stop - " complaining - hi clear - if exists("syntax_on") - syntax reset - endif -endif -let g:colors_name="molokai" - -if exists("g:molokai_original") - let s:molokai_original = g:molokai_original -else - let s:molokai_original = 0 -endif - - -hi Boolean guifg=#AE81FF -hi Character guifg=#E6DB74 -hi Number guifg=#AE81FF -hi String guifg=#E6DB74 -hi Conditional guifg=#F92672 gui=bold -hi Constant guifg=#AE81FF gui=bold -hi Cursor guifg=#000000 guibg=#F8F8F0 -hi iCursor guifg=#000000 guibg=#F8F8F0 -hi Debug guifg=#BCA3A3 gui=bold -hi Define guifg=#66D9EF -hi Delimiter guifg=#8F8F8F -hi DiffAdd guibg=#13354A -hi DiffChange guifg=#89807D guibg=#4C4745 -hi DiffDelete guifg=#960050 guibg=#1E0010 -hi DiffText guibg=#4C4745 gui=italic,bold - -hi Directory guifg=#A6E22E gui=bold -hi Error guifg=#E6DB74 guibg=#1E0010 -hi ErrorMsg guifg=#F92672 guibg=#232526 gui=bold -hi Exception guifg=#A6E22E gui=bold -hi Float guifg=#AE81FF -hi FoldColumn guifg=#465457 guibg=#000000 -hi Folded guifg=#465457 guibg=#000000 -hi Function guifg=#A6E22E -hi Identifier guifg=#FD971F -hi Ignore guifg=#808080 guibg=bg -hi IncSearch guifg=#C4BE89 guibg=#000000 - -hi Keyword guifg=#F92672 gui=bold -hi Label guifg=#E6DB74 gui=none -hi Macro guifg=#C4BE89 gui=italic -hi SpecialKey guifg=#66D9EF gui=italic - -hi MatchParen guifg=#000000 guibg=#FD971F gui=bold -hi ModeMsg guifg=#E6DB74 -hi MoreMsg guifg=#E6DB74 -hi Operator guifg=#F92672 - -" complete menu -hi Pmenu guifg=#66D9EF guibg=#000000 -hi PmenuSel guibg=#808080 -hi PmenuSbar guibg=#080808 -hi PmenuThumb guifg=#66D9EF - -hi PreCondit guifg=#A6E22E gui=bold -hi PreProc guifg=#A6E22E -hi Question guifg=#66D9EF -hi Repeat guifg=#F92672 gui=bold -hi Search guifg=#000000 guibg=#FFE792 -" marks -hi SignColumn guifg=#A6E22E guibg=#232526 -hi SpecialChar guifg=#F92672 gui=bold -hi SpecialComment guifg=#7E8E91 gui=bold -hi Special guifg=#66D9EF guibg=bg gui=italic -if has("spell") - hi SpellBad guisp=#FF0000 gui=undercurl - hi SpellCap guisp=#7070F0 gui=undercurl - hi SpellLocal guisp=#70F0F0 gui=undercurl - hi SpellRare guisp=#FFFFFF gui=undercurl -endif -hi Statement guifg=#F92672 gui=bold -hi StatusLine guifg=#455354 guibg=fg -hi StatusLineNC guifg=#808080 guibg=#080808 -hi StorageClass guifg=#FD971F gui=italic -hi Structure guifg=#66D9EF -hi Tag guifg=#F92672 gui=italic -hi Title guifg=#ef5939 -hi Todo guifg=#FFFFFF guibg=bg gui=bold - -hi Typedef guifg=#66D9EF -hi Type guifg=#66D9EF gui=none -hi Underlined guifg=#808080 gui=underline - -hi VertSplit guifg=#808080 guibg=#080808 gui=bold -hi VisualNOS guibg=#403D3D -hi Visual guibg=#403D3D -hi WarningMsg guifg=#FFFFFF guibg=#333333 gui=bold -hi WildMenu guifg=#66D9EF guibg=#000000 - -hi TabLineFill guifg=#1B1D1E guibg=#1B1D1E -hi TabLine guibg=#1B1D1E guifg=#808080 gui=none - -if s:molokai_original == 1 - hi Normal guifg=#F8F8F2 guibg=#272822 - hi Comment guifg=#75715E - hi CursorLine guibg=#3E3D32 - hi CursorLineNr guifg=#FD971F gui=none - hi CursorColumn guibg=#3E3D32 - hi ColorColumn guibg=#3B3A32 - hi LineNr guifg=#BCBCBC guibg=#3B3A32 - hi NonText guifg=#75715E - hi SpecialKey guifg=#75715E -else - hi Normal guifg=#F8F8F2 guibg=#1B1D1E - hi Comment guifg=#7E8E91 - hi CursorLine guibg=#293739 - hi CursorLineNr guifg=#FD971F gui=none - hi CursorColumn guibg=#293739 - hi ColorColumn guibg=#232526 - hi LineNr guifg=#465457 guibg=#232526 - hi NonText guifg=#465457 - hi SpecialKey guifg=#465457 -end - -" -" Support for 256-color terminal -" -if &t_Co > 255 - if s:molokai_original == 1 - hi Normal ctermbg=234 - hi CursorLine ctermbg=235 cterm=none - hi CursorLineNr ctermfg=208 cterm=none - else - hi Normal ctermfg=252 ctermbg=233 - hi CursorLine ctermbg=234 cterm=none - hi CursorLineNr ctermfg=208 cterm=none - endif - hi Boolean ctermfg=135 - hi Character ctermfg=144 - hi Number ctermfg=135 - hi String ctermfg=144 - hi Conditional ctermfg=161 cterm=bold - hi Constant ctermfg=135 cterm=bold - hi Cursor ctermfg=16 ctermbg=253 - hi Debug ctermfg=225 cterm=bold - hi Define ctermfg=81 - hi Delimiter ctermfg=241 - - hi DiffAdd ctermbg=24 - hi DiffChange ctermfg=181 ctermbg=239 - hi DiffDelete ctermfg=162 ctermbg=53 - hi DiffText ctermbg=102 cterm=bold - - hi Directory ctermfg=118 cterm=bold - hi Error ctermfg=219 ctermbg=89 - hi ErrorMsg ctermfg=199 ctermbg=16 cterm=bold - hi Exception ctermfg=118 cterm=bold - hi Float ctermfg=135 - hi FoldColumn ctermfg=67 ctermbg=16 - hi Folded ctermfg=67 ctermbg=16 - hi Function ctermfg=118 - hi Identifier ctermfg=208 cterm=none - hi Ignore ctermfg=244 ctermbg=232 - hi IncSearch ctermfg=193 ctermbg=16 - - hi keyword ctermfg=161 cterm=bold - hi Label ctermfg=229 cterm=none - hi Macro ctermfg=193 - hi SpecialKey ctermfg=81 - - hi MatchParen ctermfg=233 ctermbg=208 cterm=bold - hi ModeMsg ctermfg=229 - hi MoreMsg ctermfg=229 - hi Operator ctermfg=161 - - " complete menu - hi Pmenu ctermfg=81 ctermbg=16 - hi PmenuSel ctermfg=255 ctermbg=242 - hi PmenuSbar ctermbg=232 - hi PmenuThumb ctermfg=81 - - hi PreCondit ctermfg=118 cterm=bold - hi PreProc ctermfg=118 - hi Question ctermfg=81 - hi Repeat ctermfg=161 cterm=bold - hi Search ctermfg=0 ctermbg=222 cterm=NONE - - " marks column - hi SignColumn ctermfg=118 ctermbg=235 - hi SpecialChar ctermfg=161 cterm=bold - hi SpecialComment ctermfg=245 cterm=bold - hi Special ctermfg=81 - if has("spell") - hi SpellBad ctermbg=52 - hi SpellCap ctermbg=17 - hi SpellLocal ctermbg=17 - hi SpellRare ctermfg=none ctermbg=none cterm=reverse - endif - hi Statement ctermfg=161 cterm=bold - hi StatusLine ctermfg=238 ctermbg=253 - hi StatusLineNC ctermfg=244 ctermbg=232 - hi StorageClass ctermfg=208 - hi Structure ctermfg=81 - hi Tag ctermfg=161 - hi Title ctermfg=166 - hi Todo ctermfg=231 ctermbg=232 cterm=bold - - hi Typedef ctermfg=81 - hi Type ctermfg=81 cterm=none - hi Underlined ctermfg=244 cterm=underline - - hi VertSplit ctermfg=244 ctermbg=232 cterm=bold - hi VisualNOS ctermbg=238 - hi Visual ctermbg=235 - hi WarningMsg ctermfg=231 ctermbg=238 cterm=bold - hi WildMenu ctermfg=81 ctermbg=16 - - hi Comment ctermfg=59 - hi CursorColumn ctermbg=236 - hi ColorColumn ctermbg=236 - hi LineNr ctermfg=250 ctermbg=236 - hi NonText ctermfg=59 - - hi SpecialKey ctermfg=59 - - if exists("g:rehash256") && g:rehash256 == 1 - hi Normal ctermfg=252 ctermbg=234 - hi CursorLine ctermbg=236 cterm=none - hi CursorLineNr ctermfg=208 cterm=none - - hi Boolean ctermfg=141 - hi Character ctermfg=222 - hi Number ctermfg=141 - hi String ctermfg=222 - hi Conditional ctermfg=197 cterm=bold - hi Constant ctermfg=141 cterm=bold - - hi DiffDelete ctermfg=125 ctermbg=233 - - hi Directory ctermfg=154 cterm=bold - hi Error ctermfg=222 ctermbg=233 - hi Exception ctermfg=154 cterm=bold - hi Float ctermfg=141 - hi Function ctermfg=154 - hi Identifier ctermfg=208 - - hi Keyword ctermfg=197 cterm=bold - hi Operator ctermfg=197 - hi PreCondit ctermfg=154 cterm=bold - hi PreProc ctermfg=154 - hi Repeat ctermfg=197 cterm=bold - - hi Statement ctermfg=197 cterm=bold - hi Tag ctermfg=197 - hi Title ctermfg=203 - hi Visual ctermbg=238 - - hi Comment ctermfg=244 - hi LineNr ctermfg=239 ctermbg=235 - hi NonText ctermfg=239 - hi SpecialKey ctermfg=239 - endif -end - -" Must be at the end, because of ctermbg=234 bug. -" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ -set background=dark diff --git a/vimrc b/vimrc index a8e4a58..37a759a 100644 --- a/vimrc +++ b/vimrc @@ -142,7 +142,7 @@ set encoding=utf-8 set lazyredraw " don't update the display while executing macros set laststatus=2 " tell VIM to always put a status line in, even " if there is only one window -set cmdheight=2 " use a status bar that is 2 rows high +"set cmdheight=2 " use a status bar that is 2 rows high " }}} " Vim behaviour {{{ @@ -178,7 +178,7 @@ set showcmd " show (partial) command in the last line of the " this also shows visual selection info set nomodeline " disable mode lines (security measure) "set ttyfast " always use a fast terminal -set cursorline " underline the current line, for quick orientation +"set cursorline " underline the current line, for quick orientation " }}} @@ -257,10 +257,10 @@ nnoremap ' ` nnoremap ` ' " Use the damn hjkl keys -noremap -noremap -noremap -noremap +"noremap +"noremap +"noremap +"noremap " Remap j and k to act as expected when used on long, wrapped, lines nnoremap j gj @@ -405,6 +405,7 @@ let NERDTreeIgnore=[ '\.pyc$', '\.pyo$', '\.py\$class$', '\.obj$', - - -let g:molokai_original = 1 +" colorscheme +" colorscheme industry +" colorscheme molokai +" let g:molokai_original = 1