diff --git a/.vimrc b/.vimrc index d3b3565..3af8bd9 100644 --- a/.vimrc +++ b/.vimrc @@ -190,7 +190,10 @@ nmap \dj map u :GundoToggle "}}} "CtrlP {{{2 -let g:ctrlp_custom_ignore = '\.git$\|\.hg$\|\.svn$||\.pyo||\.pyc||\.pyd||CVS$' +let g:ctrlp_custom_ignore = { + \ 'dir': '\.git$\|\.hg$\|\.svn$', + \ 'file': '\.pyo$\|\.pyc$\|\.pyd$', + \ } let g:ctrlp_map = '' map b :CtrlPBuffer "}}} diff --git a/bundle/color_github/colors/github.vim b/bundle/color_github/colors/github.vim deleted file mode 100644 index 0b0877d..0000000 --- a/bundle/color_github/colors/github.vim +++ /dev/null @@ -1,141 +0,0 @@ -" Vim color file -" -" Author: Anthony Carapetis -" -" Note: Based on github's syntax highlighting theme -" Used Brian Mock's darkspectrum as a starting point/template -" Thanks to Ryan Heath for an easy list of some of the colours: -" http://rpheath.com/posts/356-github-theme-for-syntax-gem - -hi clear - -set background=light -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="github" - -hi Normal guifg=#000000 guibg=#F8F8FF - -" {{{ Cursor -hi Cursor guibg=#444454 guifg=#F8F8FF -hi CursorLine guibg=#D8D8DD -hi CursorColumn guibg=#E8E8EE -" gryf: added colorcolumn highlight -hi ColorColumn guibg=#E8E8EE -" }}} - -" {{{ Diff -hi DiffAdd guifg=#003300 guibg=#DDFFDD gui=none -hi DiffChange guibg=#ececec gui=none -hi DiffText guifg=#000033 guibg=#DDDDFF gui=none -hi DiffDelete guifg=#DDCCCC guibg=#FFDDDD gui=none -" }}} - -" {{{ Folding / Line Numbering / Status Lines -hi Folded guibg=#ECECEC guifg=#808080 gui=bold -hi vimFold guibg=#ECECEC guifg=#808080 gui=bold -hi FoldColumn guibg=#ECECEC guifg=#808080 gui=bold - -hi LineNr guifg=#959595 guibg=#ECECEC gui=bold -hi NonText guifg=#808080 guibg=#ECECEC -hi Folded guifg=#808080 guibg=#ECECEC gui=bold -hi FoldeColumn guifg=#808080 guibg=#ECECEC gui=bold - -hi VertSplit guibg=#bbbbbb guifg=#bbbbbb gui=none -hi StatusLine guibg=#bbbbbb guifg=#404040 gui=bold -hi StatusLineNC guibg=#d4d4d4 guifg=#404040 gui=italic -" }}} - -" {{{ Misc -hi ModeMsg guifg=#990000 -hi MoreMsg guifg=#990000 - -hi Title guifg=#ef5939 -hi WarningMsg guifg=#ef5939 -hi SpecialKey guifg=#177F80 gui=italic - -hi MatchParen guibg=#cdcdfd guifg=#000000 -hi Underlined guifg=#000000 gui=underline -hi Directory guifg=#990000 -" }}} - -" {{{ Search, Visual, etc -hi Visual guifg=#FFFFFF guibg=#3465a4 gui=none -hi VisualNOS guifg=#FFFFFF guibg=#204a87 gui=none -hi IncSearch guibg=#cdcdfd guifg=#000000 gui=italic -hi Search guibg=#cdcdfd guifg=#000000 gui=italic -" }}} - -" {{{ Syntax groups -hi Ignore guifg=#808080 -hi Identifier guifg=#0086B3 -hi PreProc guifg=#A0A0A0 gui=bold -hi Comment guifg=#999988 -hi Constant guifg=#177F80 gui=none -hi String guifg=#D81745 -hi Function guifg=#990000 gui=bold -hi Statement guifg=#000000 gui=bold -hi Type guifg=#445588 gui=bold -hi Number guifg=#1C9898 -hi Todo guifg=#FFFFFF guibg=#990000 gui=bold -hi Special guifg=#159828 gui=bold -hi rubySymbol guifg=#960B73 -hi Error guibg=#f8f8ff guifg=#ff1100 gui=undercurl -hi Todo guibg=#f8f8ff guifg=#ff1100 gui=underline -hi Label guifg=#000000 gui=bold -hi StorageClass guifg=#000000 gui=bold -hi Structure guifg=#000000 gui=bold -hi TypeDef guifg=#000000 gui=bold -" }}} - -" {{{ Completion menus -hi WildMenu guifg=#7fbdff guibg=#425c78 gui=none - -hi Pmenu guibg=#808080 guifg=#ffffff gui=bold -hi PmenuSel guibg=#cdcdfd guifg=#000000 gui=italic -hi PmenuSbar guibg=#000000 guifg=#444444 -hi PmenuThumb guibg=#aaaaaa guifg=#aaaaaa -" }}} - -" {{{ Spelling -hi spellBad guisp=#fcaf3e -hi spellCap guisp=#73d216 -hi spellRare guisp=#fcaf3e -hi spellLocal guisp=#729fcf -" }}} - -" {{{ Aliases -hi link cppSTL Function -hi link cppSTLType Type -hi link Character Number -hi link htmlTag htmlEndTag -"hi link htmlTagName htmlTag -hi link htmlLink Underlined -hi link pythonFunction Identifier -hi link Question Type -hi link CursorIM Cursor -hi link VisualNOS Visual -hi link xmlTag Identifier -hi link xmlTagName Identifier -hi link shDeref Identifier -hi link shVariable Function -hi link rubySharpBang Special -hi link perlSharpBang Special -hi link schemeFunc Statement -"hi link shSpecialVariables Constant -"hi link bashSpecialVariables Constant -" }}} - -" {{{ Tabs (non-gui0 -hi TabLine guifg=#404040 guibg=#dddddd gui=none -hi TabLineFill guifg=#404040 guibg=#dddddd gui=none -hi TabLineSel guifg=#404040 gui=bold -" }}} -" -" vim: sw=4 ts=4 foldmethod=marker diff --git a/bundle/color_inkpot/colors/inkpot.vim b/bundle/color_inkpot/colors/inkpot.vim deleted file mode 100644 index 6949f35..0000000 --- a/bundle/color_inkpot/colors/inkpot.vim +++ /dev/null @@ -1,218 +0,0 @@ -" Vim color file -" Name: inkpot.vim -" Maintainer: Ciaran McCreesh -" Homepage: http://github.com/ciaranm/inkpot/ -" -" This should work in the GUI, rxvt-unicode (88 colour mode) and xterm (256 -" colour mode). It won't work in 8/16 colour terminals. -" -" To use a black background, :let g:inkpot_black_background = 1 - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif - -let colors_name = "inkpot" - -" map a urxvt cube number to an xterm-256 cube number -fun! M(a) - return strpart("0135", a:a, 1) + 0 -endfun - -" map a urxvt colour to an xterm-256 colour -fun! X(a) - if &t_Co == 88 - return a:a - else - if a:a == 8 - return 237 - elseif a:a < 16 - return a:a - elseif a:a > 79 - return 232 + (3 * (a:a - 80)) - else - let l:b = a:a - 16 - let l:x = l:b % 4 - let l:y = (l:b / 4) % 4 - let l:z = (l:b / 16) - return 16 + M(l:x) + (6 * M(l:y)) + (36 * M(l:z)) - endif - endif -endfun - -if ! exists("g:inkpot_black_background") - let g:inkpot_black_background = 0 -endif - -if has("gui_running") - if ! g:inkpot_black_background - hi Normal gui=NONE guifg=#cfbfad guibg=#1e1e27 - else - hi Normal gui=NONE guifg=#cfbfad guibg=#000000 - endif - - hi CursorLine guibg=#2e2e37 - " gryf: added colorcolumn highlight - hi ColorColumn guibg=#2e2e37 - - hi IncSearch gui=BOLD guifg=#303030 guibg=#cd8b60 - hi Search gui=NONE guifg=#303030 guibg=#ad7b57 - hi ErrorMsg gui=BOLD guifg=#ffffff guibg=#ce4e4e - hi WarningMsg gui=BOLD guifg=#ffffff guibg=#ce8e4e - hi ModeMsg gui=BOLD guifg=#7e7eae guibg=NONE - hi MoreMsg gui=BOLD guifg=#7e7eae guibg=NONE - hi Question gui=BOLD guifg=#ffcd00 guibg=NONE - - hi StatusLine gui=BOLD guifg=#b9b9b9 guibg=#3e3e5e - hi User1 gui=BOLD guifg=#00ff8b guibg=#3e3e5e - hi User2 gui=BOLD guifg=#7070a0 guibg=#3e3e5e - hi StatusLineNC gui=NONE guifg=#b9b9b9 guibg=#3e3e5e - hi VertSplit gui=NONE guifg=#b9b9b9 guibg=#3e3e5e - - hi WildMenu gui=BOLD guifg=#eeeeee guibg=#6e6eaf - - hi MBENormal guifg=#cfbfad guibg=#2e2e3f - hi MBEChanged guifg=#eeeeee guibg=#2e2e3f - hi MBEVisibleNormal guifg=#cfcfcd guibg=#4e4e8f - hi MBEVisibleChanged guifg=#eeeeee guibg=#4e4e8f - - hi DiffText gui=NONE guifg=#ffffcd guibg=#4a2a4a - hi DiffChange gui=NONE guifg=#ffffcd guibg=#306b8f - hi DiffDelete gui=NONE guifg=#ffffcd guibg=#6d3030 - hi DiffAdd gui=NONE guifg=#ffffcd guibg=#306d30 - - hi Cursor gui=NONE guifg=#404040 guibg=#8b8bff - hi lCursor gui=NONE guifg=#404040 guibg=#8fff8b - hi CursorIM gui=NONE guifg=#404040 guibg=#8b8bff - - hi Folded gui=NONE guifg=#cfcfcd guibg=#4b208f - hi FoldColumn gui=NONE guifg=#8b8bcd guibg=#2e2e2e - - hi Directory gui=NONE guifg=#00ff8b guibg=NONE - hi LineNr gui=NONE guifg=#8b8bcd guibg=#2e2e2e - hi NonText gui=BOLD guifg=#8b8bcd guibg=NONE - hi SpecialKey gui=BOLD guifg=#ab60ed guibg=NONE - hi Title gui=BOLD guifg=#af4f4b guibg=NONE - hi Visual gui=NONE guifg=#eeeeee guibg=#4e4e8f - - hi Comment gui=NONE guifg=#cd8b00 guibg=NONE - hi Constant gui=NONE guifg=#ffcd8b guibg=NONE - hi String gui=NONE guifg=#ffcd8b guibg=#404040 - hi Error gui=NONE guifg=#ffffff guibg=#6e2e2e - hi Identifier gui=NONE guifg=#ff8bff guibg=NONE - hi Ignore gui=NONE - hi Number gui=NONE guifg=#f0ad6d guibg=NONE - hi PreProc gui=NONE guifg=#409090 guibg=NONE - hi Special gui=NONE guifg=#c080d0 guibg=NONE - hi SpecialChar gui=NONE guifg=#c080d0 guibg=#404040 - hi Statement gui=NONE guifg=#808bed guibg=NONE - hi Todo gui=BOLD guifg=#303030 guibg=#d0a060 - hi Type gui=NONE guifg=#ff8bff guibg=NONE - hi Underlined gui=BOLD guifg=#df9f2d guibg=NONE - hi TaglistTagName gui=BOLD guifg=#808bed guibg=NONE - - hi perlSpecialMatch gui=NONE guifg=#c080d0 guibg=#404040 - hi perlSpecialString gui=NONE guifg=#c080d0 guibg=#404040 - - hi cSpecialCharacter gui=NONE guifg=#c080d0 guibg=#404040 - hi cFormat gui=NONE guifg=#c080d0 guibg=#404040 - - hi doxygenBrief gui=NONE guifg=#fdab60 guibg=NONE - hi doxygenParam gui=NONE guifg=#fdd090 guibg=NONE - hi doxygenPrev gui=NONE guifg=#fdd090 guibg=NONE - hi doxygenSmallSpecial gui=NONE guifg=#fdd090 guibg=NONE - hi doxygenSpecial gui=NONE guifg=#fdd090 guibg=NONE - hi doxygenComment gui=NONE guifg=#ad7b20 guibg=NONE - hi doxygenSpecial gui=NONE guifg=#fdab60 guibg=NONE - hi doxygenSpecialMultilineDesc gui=NONE guifg=#ad600b guibg=NONE - hi doxygenSpecialOnelineDesc gui=NONE guifg=#ad600b guibg=NONE - - if v:version >= 700 - hi Pmenu gui=NONE guifg=#eeeeee guibg=#4e4e8f - hi PmenuSel gui=BOLD guifg=#eeeeee guibg=#2e2e3f - hi PmenuSbar gui=BOLD guifg=#eeeeee guibg=#6e6eaf - hi PmenuThumb gui=BOLD guifg=#eeeeee guibg=#6e6eaf - - hi SpellBad gui=undercurl guisp=#cc6666 - hi SpellRare gui=undercurl guisp=#cc66cc - hi SpellLocal gui=undercurl guisp=#cccc66 - hi SpellCap gui=undercurl guisp=#66cccc - - hi MatchParen gui=NONE guifg=#cfbfad guibg=#4e4e8f - endif -else - if ! g:inkpot_black_background - exec "hi Normal cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(80) - else - exec "hi Normal cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(16) - endif - - exec "hi IncSearch cterm=BOLD ctermfg=" . X(80) . " ctermbg=" . X(73) - exec "hi Search cterm=NONE ctermfg=" . X(80) . " ctermbg=" . X(52) - exec "hi ErrorMsg cterm=BOLD ctermfg=" . X(16) . " ctermbg=" . X(48) - exec "hi WarningMsg cterm=BOLD ctermfg=" . X(16) . " ctermbg=" . X(68) - exec "hi ModeMsg cterm=BOLD ctermfg=" . X(38) . " ctermbg=" . "NONE" - exec "hi MoreMsg cterm=BOLD ctermfg=" . X(38) . " ctermbg=" . "NONE" - exec "hi Question cterm=BOLD ctermfg=" . X(52) . " ctermbg=" . "NONE" - - exec "hi StatusLine cterm=BOLD ctermfg=" . X(85) . " ctermbg=" . X(81) - exec "hi User1 cterm=BOLD ctermfg=" . X(28) . " ctermbg=" . X(81) - exec "hi User2 cterm=BOLD ctermfg=" . X(39) . " ctermbg=" . X(81) - exec "hi StatusLineNC cterm=NONE ctermfg=" . X(84) . " ctermbg=" . X(81) - exec "hi VertSplit cterm=NONE ctermfg=" . X(84) . " ctermbg=" . X(81) - - exec "hi WildMenu cterm=BOLD ctermfg=" . X(87) . " ctermbg=" . X(38) - - exec "hi MBENormal ctermfg=" . X(85) . " ctermbg=" . X(81) - exec "hi MBEChanged ctermfg=" . X(87) . " ctermbg=" . X(81) - exec "hi MBEVisibleNormal ctermfg=" . X(85) . " ctermbg=" . X(82) - exec "hi MBEVisibleChanged ctermfg=" . X(87) . " ctermbg=" . X(82) - - exec "hi DiffText cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(34) - exec "hi DiffChange cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(17) - exec "hi DiffDelete cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(32) - exec "hi DiffAdd cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(20) - - exec "hi Folded cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(35) - exec "hi FoldColumn cterm=NONE ctermfg=" . X(39) . " ctermbg=" . X(80) - - exec "hi Directory cterm=NONE ctermfg=" . X(28) . " ctermbg=" . "NONE" - exec "hi LineNr cterm=NONE ctermfg=" . X(39) . " ctermbg=" . X(80) - exec "hi NonText cterm=BOLD ctermfg=" . X(39) . " ctermbg=" . "NONE" - exec "hi SpecialKey cterm=BOLD ctermfg=" . X(55) . " ctermbg=" . "NONE" - exec "hi Title cterm=BOLD ctermfg=" . X(48) . " ctermbg=" . "NONE" - exec "hi Visual cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(38) - - exec "hi Comment cterm=NONE ctermfg=" . X(52) . " ctermbg=" . "NONE" - exec "hi Constant cterm=NONE ctermfg=" . X(73) . " ctermbg=" . "NONE" - exec "hi String cterm=NONE ctermfg=" . X(73) . " ctermbg=" . X(81) - exec "hi Error cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(32) - exec "hi Identifier cterm=NONE ctermfg=" . X(53) . " ctermbg=" . "NONE" - exec "hi Ignore cterm=NONE" - exec "hi Number cterm=NONE ctermfg=" . X(69) . " ctermbg=" . "NONE" - exec "hi PreProc cterm=NONE ctermfg=" . X(25) . " ctermbg=" . "NONE" - exec "hi Special cterm=NONE ctermfg=" . X(55) . " ctermbg=" . "NONE" - exec "hi SpecialChar cterm=NONE ctermfg=" . X(55) . " ctermbg=" . X(81) - exec "hi Statement cterm=NONE ctermfg=" . X(27) . " ctermbg=" . "NONE" - exec "hi Todo cterm=BOLD ctermfg=" . X(16) . " ctermbg=" . X(57) - exec "hi Type cterm=NONE ctermfg=" . X(71) . " ctermbg=" . "NONE" - exec "hi Underlined cterm=BOLD ctermfg=" . X(77) . " ctermbg=" . "NONE" - exec "hi TaglistTagName cterm=BOLD ctermfg=" . X(39) . " ctermbg=" . "NONE" - - if v:version >= 700 - exec "hi Pmenu cterm=NONE ctermfg=" . X(87) . " ctermbg=" . X(82) - exec "hi PmenuSel cterm=BOLD ctermfg=" . X(87) . " ctermbg=" . X(38) - exec "hi PmenuSbar cterm=BOLD ctermfg=" . X(87) . " ctermbg=" . X(39) - exec "hi PmenuThumb cterm=BOLD ctermfg=" . X(87) . " ctermbg=" . X(39) - - exec "hi SpellBad cterm=NONE ctermbg=" . X(32) - exec "hi SpellRare cterm=NONE ctermbg=" . X(33) - exec "hi SpellLocal cterm=NONE ctermbg=" . X(36) - exec "hi SpellCap cterm=NONE ctermbg=" . X(21) - exec "hi MatchParen cterm=NONE ctermbg=" . X(14) . "ctermfg=" . X(25) - endif -endif - -" vim: set et : diff --git a/bundle/color_irblack/colors/ir_black.vim b/bundle/color_irblack/colors/ir_black.vim deleted file mode 100644 index 06e6b5f..0000000 --- a/bundle/color_irblack/colors/ir_black.vim +++ /dev/null @@ -1,213 +0,0 @@ -" ir_black color scheme -" More at: http://blog.infinitered.com/entries/show/8 - - -" ******************************************************************************** -" Standard colors used in all ir_black themes: -" Note, x:x:x are RGB values -" -" normal: #f6f3e8 -" -" string: #A8FF60 168:255:96 -" string inner (punc, code, etc): #00A0A0 0:160:160 -" number: #FF73FD 255:115:253 -" comments: #7C7C7C 124:124:124 -" keywords: #96CBFE 150:203:254 -" operators: white -" class: #FFFFB6 255:255:182 -" method declaration name: #FFD2A7 255:210:167 -" regular expression: #E9C062 233:192:98 -" regexp alternate: #FF8000 255:128:0 -" regexp alternate 2: #B18A3D 177:138:61 -" variable: #C6C5FE 198:197:254 -" -" Misc colors: -" red color (used for whatever): #FF6C60 255:108:96 -" light red: #FFB6B0 255:182:176 -" -" brown: #E18964 good for special -" -" lightpurpleish: #FFCCFF -" -" Interface colors: -" background color: black -" cursor (where underscore is used): #FFA560 255:165:96 -" cursor (where block is used): white -" visual selection: #1D1E2C -" current line: #151515 21:21:21 -" search selection: #07281C 7:40:28 -" line number: #3D3D3D 61:61:61 - - -" ******************************************************************************** -" The following are the preferred 16 colors for your terminal -" Colors Bright Colors -" Black #4E4E4E #7C7C7C -" Red #FF6C60 #FFB6B0 -" Green #A8FF60 #CEFFAB -" Yellow #FFFFB6 #FFFFCB -" Blue #96CBFE #FFFFCB -" Magenta #FF73FD #FF9CFE -" Cyan #C6C5FE #DFDFFE -" White #EEEEEE #FFFFFF - - -" ******************************************************************************** -set background=dark -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "ir_black" - - -"hi Example guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - -" General colors -hi Normal guifg=#f6f3e8 guibg=black gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi NonText guifg=#070707 guibg=black gui=NONE ctermfg=black ctermbg=NONE cterm=NONE - -hi Cursor guifg=black guibg=white gui=NONE ctermfg=black ctermbg=white cterm=reverse -hi LineNr guifg=#3D3D3D guibg=black gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE - -hi VertSplit guifg=#202020 guibg=#202020 gui=NONE ctermfg=darkgray ctermbg=darkgray cterm=NONE -hi StatusLine guifg=#CCCCCC guibg=#202020 gui=italic ctermfg=white ctermbg=darkgray cterm=NONE -hi StatusLineNC guifg=black guibg=#202020 gui=NONE ctermfg=blue ctermbg=darkgray cterm=NONE - -hi Folded guifg=#a0a8b0 guibg=#384048 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE -hi Title guifg=#f6f3e8 guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=NONE -hi Visual guifg=NONE guibg=#262D51 gui=NONE ctermfg=NONE ctermbg=darkgray cterm=NONE - -hi SpecialKey guifg=#808080 guibg=#343434 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - -hi WildMenu guifg=green guibg=yellow gui=NONE ctermfg=black ctermbg=yellow cterm=NONE -hi PmenuSbar guifg=black guibg=white gui=NONE ctermfg=black ctermbg=white cterm=NONE -"hi Ignore guifg=gray guibg=black gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - -hi Error guifg=NONE guibg=NONE gui=undercurl ctermfg=white ctermbg=red cterm=NONE guisp=#FF6C60 " undercurl color -hi ErrorMsg guifg=white guibg=#FF6C60 gui=BOLD ctermfg=white ctermbg=red cterm=NONE -hi WarningMsg guifg=white guibg=#FF6C60 gui=BOLD ctermfg=white ctermbg=red cterm=NONE - -" Message displayed in lower left, such as --INSERT-- -hi ModeMsg guifg=black guibg=#C6C5FE gui=BOLD ctermfg=black ctermbg=cyan cterm=BOLD - -if version >= 700 " Vim 7.x specific colors - hi CursorLine guifg=NONE guibg=#121212 gui=NONE ctermfg=NONE ctermbg=NONE cterm=BOLD - hi CursorColumn guifg=NONE guibg=#121212 gui=NONE ctermfg=NONE ctermbg=NONE cterm=BOLD - hi ColorColumn guifg=NONE guibg=#121212 gui=NONE ctermfg=NONE ctermbg=NONE cterm=BOLD - hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=BOLD ctermfg=white ctermbg=darkgray cterm=NONE - hi Pmenu guifg=#f6f3e8 guibg=#444444 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi PmenuSel guifg=#000000 guibg=#cae682 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE - hi Search guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline -endif - -" Syntax highlighting -hi Comment guifg=#7C7C7C guibg=NONE gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE -hi String guifg=#A8FF60 guibg=NONE gui=NONE ctermfg=green ctermbg=NONE cterm=NONE -hi Number guifg=#FF73FD guibg=NONE gui=NONE ctermfg=magenta ctermbg=NONE cterm=NONE - -hi Keyword guifg=#96CBFE guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE -hi PreProc guifg=#96CBFE guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE -hi Conditional guifg=#6699CC guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE " if else end - -hi Todo guifg=#8f8f8f guibg=NONE gui=NONE ctermfg=red ctermbg=NONE cterm=NONE -hi Constant guifg=#99CC99 guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE - -hi Identifier guifg=#C6C5FE guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE -hi Function guifg=#FFD2A7 guibg=NONE gui=NONE ctermfg=brown ctermbg=NONE cterm=NONE -hi Type guifg=#FFFFB6 guibg=NONE gui=NONE ctermfg=yellow ctermbg=NONE cterm=NONE -hi Statement guifg=#6699CC guibg=NONE gui=NONE ctermfg=lightblue ctermbg=NONE cterm=NONE - -hi Special guifg=#E18964 guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE -hi Delimiter guifg=#00A0A0 guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE -hi Operator guifg=white guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE - -hi link Character Constant -hi link Boolean Constant -hi link Float Number -hi link Repeat Statement -hi link Label Statement -hi link Exception Statement -hi link Include PreProc -hi link Define PreProc -hi link Macro PreProc -hi link PreCondit PreProc -hi link StorageClass Type -hi link Structure Type -hi link Typedef Type -hi link Tag Special -hi link SpecialChar Special -hi link SpecialComment Special -hi link Debug Special - - -" Special for Ruby -hi rubyRegexp guifg=#B18A3D guibg=NONE gui=NONE ctermfg=brown ctermbg=NONE cterm=NONE -hi rubyRegexpDelimiter guifg=#FF8000 guibg=NONE gui=NONE ctermfg=brown ctermbg=NONE cterm=NONE -hi rubyEscape guifg=white guibg=NONE gui=NONE ctermfg=cyan ctermbg=NONE cterm=NONE -hi rubyInterpolationDelimiter guifg=#00A0A0 guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE -hi rubyControl guifg=#6699CC guibg=NONE gui=NONE ctermfg=blue ctermbg=NONE cterm=NONE "and break, etc -"hi rubyGlobalVariable guifg=#FFCCFF guibg=NONE gui=NONE ctermfg=lightblue ctermbg=NONE cterm=NONE "yield -hi rubyStringDelimiter guifg=#336633 guibg=NONE gui=NONE ctermfg=lightgreen ctermbg=NONE cterm=NONE -"rubyInclude -"rubySharpBang -"rubyAccess -"rubyPredefinedVariable -"rubyBoolean -"rubyClassVariable -"rubyBeginEnd -"rubyRepeatModifier -"hi link rubyArrayDelimiter Special " [ , , ] -"rubyCurlyBlock { , , } - -hi link rubyClass Keyword -hi link rubyModule Keyword -hi link rubyKeyword Keyword -hi link rubyOperator Operator -hi link rubyIdentifier Identifier -hi link rubyInstanceVariable Identifier -hi link rubyGlobalVariable Identifier -hi link rubyClassVariable Identifier -hi link rubyConstant Type - - -" Special for Java -" hi link javaClassDecl Type -hi link javaScopeDecl Identifier -hi link javaCommentTitle javaDocSeeTag -hi link javaDocTags javaDocSeeTag -hi link javaDocParam javaDocSeeTag -hi link javaDocSeeTagParam javaDocSeeTag - -hi javaDocSeeTag guifg=#CCCCCC guibg=NONE gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE -hi javaDocSeeTag guifg=#CCCCCC guibg=NONE gui=NONE ctermfg=darkgray ctermbg=NONE cterm=NONE -"hi javaClassDecl guifg=#CCFFCC guibg=NONE gui=NONE ctermfg=white ctermbg=NONE cterm=NONE - - -" Special for XML -hi link xmlTag Keyword -hi link xmlTagName Conditional -hi link xmlEndTag Identifier - - -" Special for HTML -hi link htmlTag Keyword -hi link htmlTagName Conditional -hi link htmlEndTag Identifier - - -" Special for Javascript -hi link javaScriptNumber Number - - -" Special for Python -"hi link pythonEscape Keyword - - -" Special for CSharp -hi link csXmlTag Keyword - - -" Special for PHP diff --git a/bundle/color_jellybeans/colors/jellybeans.vim b/bundle/color_jellybeans/colors/jellybeans.vim deleted file mode 100644 index 606d558..0000000 --- a/bundle/color_jellybeans/colors/jellybeans.vim +++ /dev/null @@ -1,491 +0,0 @@ -" Vim color file -" -" " __ _ _ _ " -" " \ \ ___| | |_ _| |__ ___ __ _ _ __ ___ " -" " \ \/ _ \ | | | | | _ \ / _ \/ _ | _ \/ __| " -" " /\_/ / __/ | | |_| | |_| | __/ |_| | | | \__ \ " -" " \___/ \___|_|_|\__ |____/ \___|\____|_| |_|___/ " -" " \___/ " -" -" "A colorful, dark color scheme for Vim." -" -" File: jellybeans.vim -" Maintainer: NanoTech -" Version: 1.5 -" Last Change: January 15th, 2012 -" Contributors: Daniel Herbert , -" Henry So, Jr. , -" David Liang , -" Rich Healey (richoH), -" Andrew Wong (w0ng) -" -" Copyright (c) 2009-2012 NanoTech -" -" Permission is hereby granted, free of charge, to any person obtaining a copy -" of this software and associated documentation files (the "Software"), to deal -" in the Software without restriction, including without limitation the rights -" to use, copy, modify, merge, publish, distribute, 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 PARTICULAR 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 CONTRACT, TORT OR OTHERWISE, ARISING FROM, -" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -" THE SOFTWARE. - -set background=dark - -hi clear - -if exists("syntax_on") - syntax reset -endif - -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 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 -" }}} - -call s:X("Normal","e8e8d3","151515","","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 - 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 - -call s:X("Visual","","404040","","",s:termBlack) -call s:X("Cursor","","b0d0f0","","","") - -call s:X("LineNr","605958","151515","none",s:termBlack,"") -call s:X("Comment","888888","","italic","Grey","") -call s:X("Todo","808080","","bold","White",s:termBlack) - -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","") - -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) - -call s:X("Title","70b950","","bold","Green","") - -call s:X("Constant","cf6a4c","","","Red","") -call s:X("Special","799d6a","","","Green","") -call s:X("Delimiter","668799","","","Grey","") - -call s:X("String","99ad6a","","","Green","") -call s:X("StringDelimiter","556633","","","DarkGreen","") - -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! link Operator Normal - -call s:X("Type","ffb964","","","Yellow","") -call s:X("NonText","606060","151515","",s:termBlack,"") - -call s:X("SpecialKey","444444","1c1c1c","",s:termBlack,"") - -call s:X("Search","f0a0c0","302028","underline","Magenta","") - -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","") - - -" 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 - -" 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","000000","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 - -" Ruby - -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","") - -" JavaScript - -hi! link javaScriptValue Constant -hi! link javaScriptRegexpString rubyRegexp - -" CoffeeScript - -hi! link coffeeRegExp javaScriptRegexpString - -" Lua - -hi! link luaOperator Conditional - -" C - -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 - -" 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","","202020","","","") -call s:X("IndentGuidesEven","","1c1c1c","","","") - -" Plugins, etc. - -hi! link TagListFileName Directory -call s:X("PreciseJumpTarget","B9ED67","405026","","White","Green") - -" 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 - hi NonText ctermbg=233 - hi LineNr ctermbg=233 - hi DiffText ctermfg=81 - hi Normal ctermbg=233 - hi DbgBreakPt ctermbg=53 -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/bundle/color_lucius/colors/lucius.vim b/bundle/color_lucius/colors/lucius.vim deleted file mode 100644 index 7ca7c05..0000000 --- a/bundle/color_lucius/colors/lucius.vim +++ /dev/null @@ -1,259 +0,0 @@ -" Lucius vim color file -" Maintainer: Jonathan Filip -" Version: 6.1.0 - -hi clear -if exists("syntax_on") - syntax reset -endif -let colors_name="lucius" - -" Summary: -" Color scheme with dark and light versions (GUI and 256 color terminal). - -" Description: -" This color scheme was originally created by combining my favorite parts of -" the following color schemes: -" -" * oceandeep (vimscript #368) -" * peaksea (vimscript #760) -" * wombat (vimscript #1778) -" * moria (vimscript #1464) -" * zenburn (vimscript #415) -" -" Version 6+ has been revamped a bit from the original color scheme. If you -" prefer the old style, or the 'blue' version, use the 5Final release. Version -" 6+ only has a light and dark version. The new version tries to unify some of -" the colors and also adds more contrast between text and interface. -" -" The color scheme is dark, by default. You can change this by setting the -" g:lucius_style variable to "light" or "dark". Once the color scheme is -" loaded, you can use the commands "LuciusLight" or "LuciusDark" to change -" schemes quickly. -" -" Screenshots of the new version (6+): -" -" * Dark: http://i.imgur.com/IzYcB.png -" * Light: http://i.imgur.com/kfJcm.png -" -" Screenshots of the old versions (5Final): -" -" * Dark: http://i.imgur.com/z0bDr.png -" * Light: http://i.imgur.com/BXDiv.png -" * Blue: http://i.imgur.com/Ea1Gq.png -" -" colorsupport.vim (vimscript #2682) is used to help with mapping the GUI -" settings to the 256 terminal colors. -" -" This color scheme also has custom colors defined for the following plugins: -" -" * vimwiki (vimscript #2226) -" * tagbar (vimscript #3465) -" -" Installation: -" Copy the file to your vim colors directory and then do :colorscheme lucius. - -set background=dark -if exists("g:lucius_style") - if g:lucius_style == "light" - set background=light - endif -else - let g:lucius_style="dark" -endif - -" set colorcolumn=21,37,53,68,86,100 - -if g:lucius_style == "dark" || g:lucius_style == "blue" - - - hi Normal guifg=#e0e0e0 guibg=#202020 ctermfg=253 ctermbg=234 gui=none cterm=none - - if g:lucius_style == "blue" - hi Normal guibg=#002b36 - endif - - hi Comment guifg=#707070 guibg=NONE ctermfg=240 ctermbg=NONE gui=none cterm=none - - hi Constant guifg=#e0e090 guibg=NONE ctermfg=187 ctermbg=NONE gui=none cterm=none - hi BConstant guifg=#e0e090 guibg=NONE ctermfg=187 ctermbg=NONE gui=bold cterm=bold - - hi Identifier guifg=#c0e0a0 guibg=NONE ctermfg=150 ctermbg=NONE gui=none cterm=none - hi BIdentifier guifg=#c0e0a0 guibg=NONE ctermfg=150 ctermbg=NONE gui=bold cterm=bold - - hi Statement guifg=#80d0f0 guibg=NONE ctermfg=74 ctermbg=NONE gui=none cterm=none - hi BStatement guifg=#80d0f0 guibg=NONE ctermfg=74 ctermbg=NONE gui=bold cterm=bold - - hi PreProc guifg=#a0e0d0 guibg=NONE ctermfg=115 ctermbg=NONE gui=none cterm=none - hi BPreProc guifg=#a0e0d0 guibg=NONE ctermfg=115 ctermbg=NONE gui=bold cterm=bold - - hi Type guifg=#a0d0e0 guibg=NONE ctermfg=116 ctermbg=NONE gui=none cterm=none - hi BType guifg=#a0d0e0 guibg=NONE ctermfg=116 ctermbg=NONE gui=bold cterm=bold - - hi Special guifg=#c0a0d0 guibg=NONE ctermfg=182 ctermbg=NONE gui=none cterm=none - hi BSpecial guifg=#c0a0d0 guibg=NONE ctermfg=182 ctermbg=NONE gui=bold cterm=bold - - " == Text Markup == - hi Underlined guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=underline cterm=underline - hi Error guifg=#e07070 guibg=#503030 ctermfg=167 ctermbg=236 gui=none cterm=none - hi Todo guifg=#e0e090 guibg=#505000 ctermfg=186 ctermbg=NONE gui=none cterm=none - hi MatchParen guifg=bg guibg=#c0e070 ctermfg=bg ctermbg=192 gui=none cterm=bold - hi NonText guifg=#405060 guibg=NONE ctermfg=24 ctermbg=NONE gui=none cterm=none - hi SpecialKey guifg=#406050 guibg=NONE ctermfg=23 ctermbg=NONE gui=none cterm=none - hi Title guifg=#50b0d0 guibg=NONE ctermfg=74 ctermbg=NONE gui=bold cterm=bold - - " == Text Selection == - hi Cursor guifg=bg guibg=fg ctermfg=bg ctermbg=fg gui=none cterm=none - hi CursorIM guifg=bg guibg=fg ctermfg=bg ctermbg=fg gui=none cterm=none - hi CursorColumn guifg=NONE guibg=#484848 ctermfg=NONE ctermbg=237 gui=none cterm=none - hi CursorLine guifg=NONE guibg=#484848 ctermfg=NONE ctermbg=237 gui=none cterm=none - hi Visual guifg=NONE guibg=#205070 ctermfg=NONE ctermbg=24 gui=none cterm=none - hi VisualNOS guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=underline cterm=underline - hi IncSearch guifg=bg guibg=#50d0d0 ctermfg=bg ctermbg=116 gui=none cterm=none - hi Search guifg=bg guibg=#e0a020 ctermfg=bg ctermbg=214 gui=none cterm=none - - " == UI == - hi Pmenu guifg=#000000 guibg=#b0b0b0 ctermfg=bg ctermbg=252 gui=none cterm=none - hi PmenuSel guifg=#e0e0e0 guibg=#205070 ctermfg=fg ctermbg=24 gui=none cterm=none - hi PMenuSbar guifg=bg guibg=#b0b0b0 ctermfg=bg ctermbg=254 gui=none cterm=none - hi PMenuThumb guifg=NONE guibg=#808080 ctermfg=fg ctermbg=244 gui=none cterm=none - hi StatusLine guifg=bg guibg=#b0b0b0 ctermfg=bg ctermbg=252 gui=bold cterm=bold - hi StatusLineNC guifg=#404040 guibg=#b0b0b0 ctermfg=240 ctermbg=252 gui=none cterm=none - hi TabLine guifg=bg guibg=#b0b0b0 ctermfg=bg ctermbg=252 gui=none cterm=none - hi TabLineFill guifg=#404040 guibg=#b0b0b0 ctermfg=240 ctermbg=252 gui=none cterm=none - hi TabLineSel guifg=#e0e0e0 guibg=#205070 ctermfg=fg ctermbg=24 gui=bold cterm=bold - hi VertSplit guifg=#606060 guibg=#b0b0b0 ctermfg=245 ctermbg=252 gui=none cterm=none - hi Folded guifg=bg guibg=#808080 ctermfg=bg ctermbg=246 gui=none cterm=none - hi FoldColumn guifg=bg guibg=#808080 ctermfg=bg ctermbg=246 gui=none cterm=none - - " == Spelling =="{{{ - hi SpellBad guisp=#ee0000 ctermfg=fg ctermbg=160 gui=undercurl cterm=undercurl - hi SpellCap guisp=#eeee00 ctermfg=bg ctermbg=226 gui=undercurl cterm=undercurl - hi SpellRare guisp=#ffa500 ctermfg=bg ctermbg=214 gui=undercurl cterm=undercurl - hi SpellLocal guisp=#ffa500 ctermfg=bg ctermbg=214 gui=undercurl cterm=undercurl"}}} - - " == Diff == - hi DiffAdd guifg=fg guibg=#405040 ctermfg=fg ctermbg=22 gui=none cterm=none - hi DiffChange guifg=fg guibg=#605040 ctermfg=fg ctermbg=58 gui=none cterm=none - hi DiffDelete guifg=fg guibg=#504040 ctermfg=fg ctermbg=52 gui=none cterm=none - hi DiffText guifg=#e0b050 guibg=#605040 ctermfg=220 ctermbg=58 gui=bold cterm=bold - - " == Misc == - hi Directory guifg=#b0d0a0 guibg=NONE ctermfg=151 ctermbg=NONE gui=none cterm=none - hi ErrorMsg guifg=#ee0000 guibg=NONE ctermfg=196 ctermbg=NONE gui=none cterm=none - hi SignColumn guifg=#a0b0b0 guibg=#282828 ctermfg=145 ctermbg=233 gui=none cterm=none - hi LineNr guifg=bg guibg=#808080 ctermfg=bg ctermbg=246 gui=none cterm=none - hi MoreMsg guifg=#60c0d0 guibg=NONE ctermfg=117 ctermbg=NONE gui=none cterm=none - hi ModeMsg guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=none cterm=none - hi Question guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=none cterm=none - hi WarningMsg guifg=#e07060 guibg=NONE ctermfg=173 ctermbg=NONE gui=none cterm=none - hi WildMenu guifg=NONE guibg=#205070 ctermfg=NONE ctermbg=24 gui=none cterm=none - hi ColorColumn guifg=NONE guibg=#484038 ctermfg=NONE ctermbg=101 gui=none cterm=none - hi Ignore guifg=bg ctermfg=bg - - -elseif g:lucius_style == "light" - - - hi Normal guifg=#000000 guibg=#ffffff ctermfg=16 ctermbg=231 gui=none cterm=none - - hi Comment guifg=#909090 guibg=NONE ctermfg=246 ctermbg=NONE gui=none cterm=none - - hi Constant guifg=#a05000 guibg=NONE ctermfg=130 ctermbg=NONE gui=none cterm=none - hi BConstant guifg=#a05000 guibg=NONE ctermfg=130 ctermbg=NONE gui=bold cterm=bold - - hi Identifier guifg=#008000 guibg=NONE ctermfg=22 ctermbg=NONE gui=none cterm=none - hi BIdentifier guifg=#008000 guibg=NONE ctermfg=22 ctermbg=NONE gui=bold cterm=bold - - hi Statement guifg=#0040c0 guibg=NONE ctermfg=19 ctermbg=NONE gui=none cterm=none - hi BStatement guifg=#0040c0 guibg=NONE ctermfg=19 ctermbg=NONE gui=bold cterm=bold - - hi PreProc guifg=#009080 guibg=NONE ctermfg=30 ctermbg=NONE gui=none cterm=none - hi BPreProc guifg=#009080 guibg=NONE ctermfg=30 ctermbg=NONE gui=bold cterm=bold - - hi Type guifg=#0070a0 guibg=NONE ctermfg=25 ctermbg=NONE gui=none cterm=none - hi BType guifg=#0070a0 guibg=NONE ctermfg=25 ctermbg=NONE gui=bold cterm=bold - - hi Special guifg=#800080 guibg=NONE ctermfg=5 ctermbg=NONE gui=none cterm=none - hi BSpecial guifg=#800080 guibg=NONE ctermfg=5 ctermbg=NONE gui=bold cterm=bold - - " == Text Markup == - hi Underlined guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=underline cterm=underline - hi Error guifg=#c02620 guibg=#f0c6c0 ctermfg=1 ctermbg=181 gui=none cterm=none - hi Todo guifg=#504000 guibg=#f6f080 ctermfg=58 ctermbg=228 gui=none cterm=none - hi MatchParen guifg=NONE guibg=#40d0d0 ctermfg=NONE ctermbg=80 gui=none cterm=none - hi NonText guifg=#b0c0d0 guibg=NONE ctermfg=146 ctermbg=NONE gui=none cterm=none - hi SpecialKey guifg=#b0d0c0 guibg=NONE ctermfg=151 ctermbg=NONE gui=none cterm=none - hi Title guifg=#0060a0 guibg=NONE ctermfg=26 ctermbg=NONE gui=bold cterm=bold - - " == Text Selection == - hi Cursor guifg=bg guibg=#505050 ctermfg=bg ctermbg=239 gui=none cterm=none - hi CursorIM guifg=bg guibg=#505050 ctermfg=bg ctermbg=239 gui=none cterm=none - hi CursorColumn guifg=NONE guibg=#e8e8e8 ctermfg=NONE ctermbg=254 gui=none cterm=none - hi CursorLine guifg=NONE guibg=#e8e8e8 ctermfg=NONE ctermbg=254 gui=none cterm=none - hi Visual guifg=NONE guibg=#b0d0f0 ctermfg=NONE ctermbg=153 gui=none cterm=none - hi VisualNOS guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=underline cterm=underline - hi IncSearch guifg=#000000 guibg=#90d0d0 ctermfg=fg ctermbg=116 gui=none cterm=none - hi Search guifg=#000000 guibg=#f0b060 ctermfg=fg ctermbg=215 gui=none cterm=none - - " == UI == - hi Pmenu guifg=bg guibg=#505050 ctermfg=231 ctermbg=239 gui=none cterm=none - hi PmenuSel guifg=#000000 guibg=#c0e0ff ctermfg=16 ctermbg=153 gui=none cterm=none - hi PMenuSbar guifg=bg guibg=#404040 ctermfg=231 ctermbg=238 gui=none cterm=none - hi PMenuThumb guifg=#000000 guibg=#a0a0a0 ctermfg=16 ctermbg=247 gui=none cterm=none - hi StatusLine guifg=bg guibg=#505050 ctermfg=231 ctermbg=239 gui=bold cterm=bold - hi StatusLineNC guifg=#e0e0e0 guibg=#505050 ctermfg=254 ctermbg=239 gui=none cterm=none - hi TabLine guifg=bg guibg=#505050 ctermfg=231 ctermbg=239 gui=none cterm=none - hi TabLineFill guifg=#a0a0a0 guibg=#505050 ctermfg=247 ctermbg=239 gui=none cterm=none - hi TabLineSel guifg=#000000 guibg=#c0e0ff ctermfg=16 ctermbg=153 gui=none cterm=none - hi VertSplit guifg=#868686 guibg=#505050 ctermfg=102 ctermbg=239 gui=none cterm=none - hi Folded guifg=bg guibg=#a0a0a0 ctermfg=231 ctermbg=247 gui=none cterm=none - hi FoldColumn guifg=bg guibg=#a0a0a0 ctermfg=231 ctermbg=247 gui=none cterm=none - - " == Spelling == - hi SpellBad guisp=#ee0000 ctermbg=210 gui=undercurl cterm=undercurl - hi SpellCap guisp=#eeee00 ctermbg=227 gui=undercurl cterm=undercurl - hi SpellRare guisp=#ffa500 ctermbg=221 gui=undercurl cterm=undercurl - hi SpellLocal guisp=#ffa500 ctermbg=221 gui=undercurl cterm=undercurl - - " == Diff == - hi DiffAdd guifg=fg guibg=#d0e0d0 ctermfg=fg ctermbg=151 gui=none cterm=none - hi DiffChange guifg=fg guibg=#e0d6c0 ctermfg=fg ctermbg=187 gui=none cterm=none - hi DiffDelete guifg=fg guibg=#f0d0d0 ctermfg=fg ctermbg=181 gui=none cterm=none - hi DiffText guifg=#d05000 guibg=#e0d6c0 ctermfg=160 ctermbg=187 gui=bold cterm=bold - - " == Misc == - hi Directory guifg=#008000 guibg=NONE ctermfg=29 ctermbg=NONE gui=none cterm=none - hi ErrorMsg guifg=#a00000 guibg=NONE ctermfg=124 ctermbg=NONE gui=none cterm=none - hi SignColumn guifg=#708090 guibg=#f8f8f8 ctermfg=66 ctermbg=231 gui=none cterm=none - hi LineNr guifg=bg guibg=#a0a0a0 ctermfg=231 ctermbg=247 gui=none cterm=none - hi MoreMsg guifg=#2060c0 guibg=NONE ctermfg=4 ctermbg=NONE gui=none cterm=none - hi ModeMsg guifg=#000000 guibg=NONE ctermfg=16 ctermbg=NONE gui=none cterm=none - hi Question guifg=fg guibg=NONE ctermfg=NONE ctermbg=NONE gui=none cterm=none - hi WarningMsg guifg=#b03000 guibg=NONE ctermfg=9 ctermbg=NONE gui=none cterm=none - hi WildMenu guifg=#000000 guibg=#c0e0ff ctermfg=16 ctermbg=153 gui=none cterm=none - hi ColorColumn guifg=NONE guibg=#f0f0e0 ctermfg=NONE ctermbg=230 gui=none cterm=none - hi Ignore guifg=bg ctermfg=bg - - -endif - -" == Vimwiki Colors == -hi link VimwikiHeader1 BIdentifier -hi link VimwikiHeader2 BPreProc -hi link VimwikiHeader3 BStatement -hi link VimwikiHeader4 BSpecial -hi link VimwikiHeader5 BConstant -hi link VimwikiHeader6 BType - -" == Tagbar Colors == -hi link TagbarAccessPublic Constant -hi link TagbarAccessProtected Type -hi link TagbarAccessPrivate PreProc - -" == Commands == -command! LuciusLight let g:lucius_style = "light" | colorscheme lucius -command! LuciusDark let g:lucius_style = "dark" | colorscheme lucius -command! LuciusBlue let g:lucius_style = "blue" | colorscheme lucius - - diff --git a/bundle/color_sorcerer/colors/sorcerer.vim b/bundle/color_sorcerer/colors/sorcerer.vim deleted file mode 100644 index 452a78d..0000000 --- a/bundle/color_sorcerer/colors/sorcerer.vim +++ /dev/null @@ -1,205 +0,0 @@ -" 'sorcerer.vim' -- Vim color scheme. -" Maintainer: Jeet Sukumaran -" Based on 'Mustang' by Henrique C. Alves (hcarvalhoalves@gmail.com), - -set background=dark - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "sorcerer" - -" GUI Colors {{{1 -" ============================================================================ - -hi Normal guifg=#c2c2b0 guibg=#222222 gui=NONE -hi ColorColumn guifg=NONE guibg=#1c1c1c -hi Cursor guifg=NONE guibg=#626262 gui=NONE -hi CursorColumn guibg=#2d2d2d -hi CursorLine guibg=#2d2d2d -hi DiffAdd guifg=#000000 guibg=#3cb371 gui=NONE -hi DiffDelete guifg=#000000 guibg=#aa4450 gui=NONE -hi DiffChange guifg=#000000 guibg=#4f94cd gui=NONE -hi DiffText guifg=#000000 guibg=#8ee5ee gui=NONE -hi Directory guifg=#1e90ff guibg=bg gui=NONE -hi ErrorMsg guifg=#ff6a6a guibg=NONE gui=bold -hi FoldColumn guifg=#68838b guibg=#4B4B4B gui=bold -hi Folded guifg=#406060 guibg=#232c2c gui=NONE -hi IncSearch guifg=#ffffff guibg=#ff4500 gui=bold -hi LineNr guifg=#686858 guibg=#000000 gui=NONE -hi MatchParen guifg=#fff000 guibg=#000000 gui=bold -hi ModeMsg guifg=#000000 guibg=#00ff00 gui=bold -hi MoreMsg guifg=#2e8b57 guibg=bg gui=bold -hi NonText guifg=#404050 guibg=bg gui=NONE - -hi Pmenu guifg=#ffffff guibg=#444444 -hi PmenuSel guifg=#000000 guibg=#b1d631 -" hi PmenuSbar guifg=#ffffff guibg=#c1cdc1 gui=NONE -" hi PmenuThumb guifg=#ffffff guibg=#838b83 gui=NONE - -hi Question guifg=#00ee00 guibg=NONE gui=bold -hi Search guifg=#000000 guibg=#d6e770 gui=bold -hi SignColumn guifg=#ffffff guibg=#cdcdb4 gui=NONE -hi SpecialKey guifg=#505060 guibg=NONE gui=NONE -hi SpellBad guisp=#ee2c2c gui=undercurl -hi SpellCap guisp=#0000ff gui=undercurl -hi SpellLocal guisp=#008b8b gui=undercurl -hi SpellRare guisp=#ff00ff gui=undercurl -hi StatusLine guifg=#000000 guibg=#808070 gui=bold -hi StatusLineNC guifg=#000000 guibg=#404c4c gui=italic -hi VertSplit guifg=#404c4c guibg=#404c4c gui=NONE -hi TabLine guifg=fg guibg=#d3d3d3 gui=underline -hi TabLineFill guifg=fg guibg=bg gui=reverse -hi TabLineSel guifg=fg guibg=bg gui=bold -hi Title guifg=#528b8b guibg=NONE gui=bold -hi Visual guifg=#000000 guibg=#6688aa gui=NONE -hi WarningMsg guifg=#ee9a00 guibg=bg gui=NONE -hi WildMenu guifg=#000000 guibg=#87ceeb gui=NONE - -" Syntax highlighting -hi Comment guifg=#707670 gui=italic -hi Boolean guifg=#ff9800 gui=NONE -hi String guifg=#779b70 gui=NONE -hi Identifier guifg=#9ebac2 gui=NONE -hi Function guifg=#faf4c6 gui=NONE -hi Type guifg=#7e8aa2 gui=NONE -hi Statement guifg=#90b0d1 gui=NONE -hi Keyword guifg=#90b0d1 gui=NONE -hi Constant guifg=#ff9800 gui=NONE -hi Number guifg=#cc8800 gui=NONE -hi Special guifg=#719611 gui=NONE -hi PreProc guifg=#528b8b gui=NONE -hi Todo guifg=#8f6f8f guibg=#202020 gui=italic,underline,bold - -" Diff -hi diffOldFile guifg=#88afcb guibg=NONE gui=italic -hi diffNewFile guifg=#88afcb guibg=NONE gui=italic -hi diffFile guifg=#88afcb guibg=NONE gui=italic -hi diffLine guifg=#88afcb guibg=NONE gui=italic -hi link diffSubname diffLine -hi diffAdded guifg=#3cb371 guibg=NONE gui=NONE -hi diffRemoved guifg=#aa4450 guibg=NONE gui=NONE -hi diffChanged guifg=#4f94cd guibg=NONE gui=NONE -hi link diffOnly Constant -hi link diffIdentical Constant -hi link diffDiffer Constant -hi link diffBDiffer Constant -hi link diffIsA Constant -hi link diffNoEOL Constant -hi link diffCommon Constant -hi link diffComment Constant - -" Python -hi pythonException guifg=#90b0d1 guibg=NONE gui=NONE -hi pythonExClass guifg=#996666 guibg=NONE gui=NONE -hi pythonDecorator guifg=#888555 guibg=NONE gui=NONE -hi link pythonDecoratorFunction pythonDecorator - -" 1}}} - -" 256 Colors {{{1 -" ============================================================================ -hi Normal cterm=NONE ctermbg=235 ctermfg=145 -hi ColorColumn cterm=NONE ctermbg=16 ctermfg=fg -hi Cursor cterm=NONE ctermbg=241 ctermfg=fg -hi CursorColumn cterm=NONE ctermbg=16 ctermfg=fg -hi CursorLine cterm=NONE ctermbg=236 ctermfg=fg -hi DiffAdd cterm=NONE ctermbg=71 ctermfg=16 -hi DiffDelete cterm=NONE ctermbg=124 ctermfg=16 -hi DiffChange cterm=NONE ctermbg=68 ctermfg=16 -hi DiffText cterm=NONE ctermbg=117 ctermfg=16 -hi Directory cterm=NONE ctermbg=234 ctermfg=33 -hi ErrorMsg cterm=bold ctermbg=bg ctermfg=203 -hi FoldColumn cterm=bold ctermbg=239 ctermfg=66 -hi Folded cterm=NONE ctermbg=16 ctermfg=60 -hi IncSearch cterm=bold ctermbg=202 ctermfg=231 -hi LineNr cterm=NONE ctermbg=16 ctermfg=59 -hi MatchParen cterm=bold ctermbg=16 ctermfg=226 -hi ModeMsg cterm=bold ctermbg=46 ctermfg=16 -hi MoreMsg cterm=bold ctermbg=234 ctermfg=29 -hi NonText cterm=NONE ctermbg=bg ctermfg=59 -hi Pmenu cterm=NONE ctermbg=238 ctermfg=231 -hi PmenuSbar cterm=NONE ctermbg=250 ctermfg=fg -hi PmenuSel cterm=NONE ctermbg=149 ctermfg=16 -hi Question cterm=bold ctermbg=bg ctermfg=46 -hi Search cterm=bold ctermbg=185 ctermfg=16 -hi SignColumn cterm=NONE ctermbg=187 ctermfg=231 -hi SpecialKey cterm=NONE ctermbg=bg ctermfg=59 -hi SpellBad cterm=undercurl ctermbg=bg ctermfg=196 -hi SpellCap cterm=undercurl ctermbg=bg ctermfg=21 -hi SpellLocal cterm=undercurl ctermbg=bg ctermfg=30 -hi SpellRare cterm=undercurl ctermbg=bg ctermfg=201 -hi StatusLine cterm=bold ctermbg=101 ctermfg=16 -hi StatusLineNC cterm=NONE ctermbg=102 ctermfg=16 -hi VertSplit cterm=NONE ctermbg=102 ctermfg=102 -hi TabLine cterm=bold ctermbg=102 ctermfg=16 -hi TabLineFill cterm=NONE ctermbg=102 ctermfg=16 -hi TabLineSel cterm=bold ctermbg=16 ctermfg=59 -hi Title cterm=bold ctermbg=bg ctermfg=66 -hi Visual cterm=NONE ctermbg=67 ctermfg=16 -hi WarningMsg cterm=NONE ctermbg=234 ctermfg=208 -hi WildMenu cterm=NONE ctermbg=116 ctermfg=16 - -hi Comment cterm=NONE ctermbg=bg ctermfg=65 -hi Boolean cterm=NONE ctermbg=bg ctermfg=208 -hi String cterm=NONE ctermbg=bg ctermfg=101 -hi Identifier cterm=NONE ctermbg=bg ctermfg=145 -hi Function cterm=NONE ctermbg=bg ctermfg=230 -hi Type cterm=NONE ctermbg=bg ctermfg=103 -hi Statement cterm=NONE ctermbg=bg ctermfg=110 -hi Keyword cterm=NONE ctermbg=bg ctermfg=110 -hi Constant cterm=NONE ctermbg=bg ctermfg=208 -hi Number cterm=NONE ctermbg=bg ctermfg=172 -hi Special cterm=NONE ctermbg=bg ctermfg=64 -hi PreProc cterm=NONE ctermbg=bg ctermfg=66 -hi Todo cterm=bold,underline ctermbg=234 ctermfg=96 - -hi diffOldFile cterm=NONE ctermbg=bg ctermfg=67 -hi diffNewFile cterm=NONE ctermbg=bg ctermfg=67 -hi diffFile cterm=NONE ctermbg=bg ctermfg=67 -hi diffLine cterm=NONE ctermbg=bg ctermfg=67 -hi diffAdded cterm=NONE ctermfg=bg ctermfg=71 -hi diffRemoved cterm=NONE ctermfg=bg ctermfg=124 -hi diffChanged cterm=NONE ctermfg=bg ctermfg=68 -hi link diffSubname diffLine -hi link diffOnly Constant -hi link diffIdentical Constant -hi link diffDiffer Constant -hi link diffBDiffer Constant -hi link diffIsA Constant -hi link diffNoEOL Constant -hi link diffCommon Constant -hi link diffComment Constant - -hi pythonClass cterm=NONE ctermbg=bg ctermfg=fg -hi pythonDecorator cterm=NONE ctermbg=bg ctermfg=101 -hi pythonExClass cterm=NONE ctermbg=bg ctermfg=95 -hi pythonException cterm=NONE ctermbg=bg ctermfg=110 -hi pythonFunc cterm=NONE ctermbg=bg ctermfg=fg -hi pythonFuncParams cterm=NONE ctermbg=bg ctermfg=fg -hi pythonKeyword cterm=NONE ctermbg=bg ctermfg=fg -hi pythonParam cterm=NONE ctermbg=bg ctermfg=fg -hi pythonRawEscape cterm=NONE ctermbg=bg ctermfg=fg -hi pythonSuperclasses cterm=NONE ctermbg=bg ctermfg=fg -hi pythonSync cterm=NONE ctermbg=bg ctermfg=fg - -hi Conceal cterm=NONE ctermbg=248 ctermfg=252 -hi Error cterm=NONE ctermbg=196 ctermfg=231 -hi Ignore cterm=NONE ctermbg=bg ctermfg=234 -hi InsertModeCursorLine cterm=NONE ctermbg=16 ctermfg=fg -hi NormalModeCursorLine cterm=NONE ctermbg=235 ctermfg=fg -hi PmenuThumb cterm=reverse ctermbg=bg ctermfg=fg -hi StatusLineAlert cterm=NONE ctermbg=160 ctermfg=231 -hi StatusLineUnalert cterm=NONE ctermbg=238 ctermfg=144 -hi Test cterm=NONE ctermbg=bg ctermfg=fg -hi Underlined cterm=underline ctermbg=bg ctermfg=111 -hi VisualNOS cterm=bold,underline ctermbg=bg ctermfg=fg -hi cCursor cterm=reverse ctermbg=bg ctermfg=fg -hi iCursor cterm=NONE ctermbg=210 ctermfg=16 -hi lCursor cterm=NONE ctermbg=145 ctermfg=234 -hi nCursor cterm=NONE ctermbg=46 ctermfg=16 -hi vCursor cterm=NONE ctermbg=201 ctermfg=16 -" 1}}} diff --git a/bundle/color_tolerable/colors/tolerable.vim b/bundle/color_tolerable/colors/tolerable.vim deleted file mode 100644 index 7b97b9a..0000000 --- a/bundle/color_tolerable/colors/tolerable.vim +++ /dev/null @@ -1,43 +0,0 @@ -" Vim color file -" Maintainer: Ian Langworth -" Last Change: 2004 Dec 24 -" Email: - -" Color settings inspired by BBEdit for Mac OS, plus I liked -" the low-contrast comments from the 'oceandeep' colorscheme - -set background=light -hi clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name="tolerable" - -hi Cursor guifg=white guibg=darkgreen - -hi Normal gui=none guifg=black guibg=white -hi NonText gui=none guifg=orange guibg=white - -hi Statement gui=none guifg=blue -hi Special gui=none guifg=red -hi Constant gui=none guifg=darkred -hi Comment gui=none guifg=#555555 -hi Preproc gui=none guifg=darkcyan -hi Type gui=none guifg=darkmagenta -hi Identifier gui=none guifg=darkgreen -hi Title gui=none guifg=black - -hi StatusLine gui=none guibg=#333333 guifg=white -hi StatusLineNC gui=none guibg=#333333 guifg=white -hi VertSplit gui=none guibg=#333333 guifg=white - -hi Visual gui=none guibg=green guifg=black -hi Search gui=none guibg=yellow -hi Directory gui=none guifg=darkblue -hi WarningMsg gui=none guifg=red -hi Error gui=none guifg=white guibg=red -hi Todo gui=none guifg=black guibg=yellow - -hi MoreMsg gui=none -hi ModeMsg gui=none - diff --git a/bundle/color_vydark/colors/vydark.vim b/bundle/color_vydark/colors/vydark.vim deleted file mode 100644 index 676678c..0000000 --- a/bundle/color_vydark/colors/vydark.vim +++ /dev/null @@ -1,85 +0,0 @@ -" -" Vim colour file -" -" Maintainer: Vy-Shane Sin Fat -" Version: 1.2 -" -" This colour file is meant for GUI use. -" - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name="vydark" - - -hi Normal guifg=#bbbbbb guibg=#282828 -hi Title guifg=white -hi Cursor guibg=#ffffff -hi LineNr guifg=#444455 guibg=#292929 -hi Visual guibg=#555555 -hi NonText guifg=#292929 guibg=#292929 -hi StatusLine guifg=#bbbbbb guibg=#353535 gui=none -hi StatusLineNC guifg=#777777 guibg=#353535 gui=none -hi VertSplit guifg=#353535 guibg=#353535 gui=none -hi ModeMsg guifg=#99dd99 guibg=#394439 gui=none -hi ErrorMsg guifg=#222222 guibg=#ff8888 gui=none -hi Error guifg=#ffaaaa guibg=#333333 gui=none -hi Folded guifg=#666677 guibg=#242424 - - -" Vim 7.x specific -if version >= 700 - hi MatchParen guibg=#364836 gui=none - hi Pmenu guifg=#bbbbbb guibg=#444444 gui=none - hi PmenuSel guifg=#222222 guibg=#99bbdd gui=none - hi PmenuSbar guifg=#494949 guibg=#494949 gui=bold - hi PmenuThumb guifg=#666666 guibg=#666666 gui=bold - hi Search guifg=#dddd99 guibg=#444433 gui=none - hi IncSearch guifg=#eeeeaa guibg=#666633 gui=bold - hi CursorLine guibg=#353535 gui=none - hi ColorColumn guibg=#252525 - hi SpellBad guisp=#774444 - hi SpellCap guisp=#774444 - hi SpellLocal guisp=#774444 - hi SpellRare guisp=#774444 -endif - - -" Syntax highlighting -hi Comment guifg=#666677 gui=none -hi Todo guifg=#8888aa guibg=#303030 gui=italic -hi Operator guifg=#bbbbbb gui=none -hi Identifier guifg=#bbbbbb gui=none -hi Statement guifg=#bbbbbb gui=none -hi Type guifg=#99bbcc gui=none -hi Constant guifg=#88cc99 gui=none -hi Conditional guifg=#99bbcc gui=none -hi Delimiter guifg=#99bbdd gui=none -hi PreProc guifg=#88ddcc gui=none -hi Special guifg=#99dd99 gui=bold -hi Keyword guifg=#bbbbbb gui=none - -hi link Function Normal -hi link Character Constant -hi link String Constant -hi link Boolean Constant -hi link Number Constant -hi link Float Number -hi link Repeat Conditional -hi link Label Statement -hi link Exception Statement -hi link Include Normal -hi link Define Type -hi link Macro PreProc -hi link PreCondit PreProc -hi link StorageClass Type -hi link Structure Type -hi link Typedef Type -hi link Tag Special -hi link SpecialChar Special -hi link SpecialComment Special -hi link Debug Special - diff --git a/bundle/color_vylight/colors/vylight.vim b/bundle/color_vylight/colors/vylight.vim deleted file mode 100644 index 3900a96..0000000 --- a/bundle/color_vylight/colors/vylight.vim +++ /dev/null @@ -1,81 +0,0 @@ -" -" Vim colour file -" -" Maintainer: Vy-Shane Sin Fat -" Version: 1.4 -" -" This colour file is meant for GUI use. -" - -set background=light -hi clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name="vylight" - - -hi Normal guifg=#111111 guibg=white -hi Title guifg=black guibg=white -hi Cursor guibg=#FF7311 -hi LineNr guifg=#bebebe guibg=#f8f8f8 -hi Visual guibg=#bbddff -hi NonText guifg=#fafafa guibg=#fafafa -hi StatusLine guifg=#222222 guibg=#eeeeee gui=none -hi StatusLineNC guifg=#888888 guibg=#eeeeee gui=none -hi VertSplit guifg=#eeeeee guibg=#eeeeee gui=none -hi ModeMsg guifg=black guibg=#bbddff gui=none -hi ErrorMsg guifg=black guibg=#ffbbbb gui=none -hi Error guifg=#bb3355 guibg=white gui=none -hi Folded guifg=#999999 guibg=#fafafa - - -" Vim 7.x specific -if version >= 700 - hi MatchParen guibg=#ccffdd gui=none - hi Pmenu guifg=#60656f guibg=#f0f5ff gui=none - hi PmenuSel guifg=white guibg=#3585ef gui=bold - hi PmenuSbar guifg=#d0d5dd guibg=#e0e5ee gui=bold - hi PmenuThumb guifg=#e0e5ee guibg=#c0c5dd gui=bold - hi Search guibg=#fcfcaa gui=none - hi IncSearch guibg=#ffff33 gui=bold - hi CursorLine guibg=#f1faff - hi ColorColumn guibg=#fafafa -endif - - -" Syntax highlighting -hi Comment guifg=#777777 gui=none -hi Todo guifg=#446644 guibg=#ddeecc gui=italic -hi Operator guifg=#1a1a1a gui=none -hi Identifier guifg=#1a1a1a gui=none -hi Statement guifg=#1a1a1a gui=none -hi Type guifg=#0050b0 gui=none -hi Constant guifg=#204070 gui=none -hi Conditional guifg=#006633 gui=none -hi Delimiter guifg=#1a1a1a gui=none -hi PreProc guifg=#006633 gui=none -hi Special guifg=#006633 gui=none -hi Keyword guifg=#007050 gui=none - -hi link Function Normal -hi link Character Constant -hi link String Constant -hi link Boolean Constant -hi link Number Constant -hi link Float Number -hi link Repeat Conditional -hi link Label Statement -hi link Exception Statement -hi link Include Normal -hi link Define PreProc -hi link Macro PreProc -hi link PreCondit PreProc -hi link StorageClass Type -hi link Structure Type -hi link Typedef Type -hi link Tag Special -hi link SpecialChar Special -hi link SpecialComment Special -hi link Debug Special - diff --git a/bundle/color_zenburn/colors/zenburn.vim b/bundle/color_zenburn/colors/zenburn.vim deleted file mode 100644 index 1f4acee..0000000 --- a/bundle/color_zenburn/colors/zenburn.vim +++ /dev/null @@ -1,561 +0,0 @@ -" Vim color file -" Maintainer: Jani Nurminen -" Last Change: $Id: zenburn.vim,v 2.21 2011/04/26 12:13:41 slinky Exp slinky $ -" URL: http://slinky.imukuppi.org/zenburnpage/ -" License: GNU GPL -" -" Nothing too fancy, just some alien fruit salad to keep you in the zone. -" This syntax file was designed to be used with dark environments and -" low light situations. Of course, if it works during a daybright office, go -" ahead :) -" -" Owes heavily to other Vim color files! With special mentions -" to "BlackDust", "Camo" and "Desert". -" -" To install, copy to ~/.vim/colors directory. -" -" Alternatively, you can use Vimball installation: -" vim zenburn.vba -" :so % -" :q -" -" For details, see :help vimball -" -" After installation, use it with :colorscheme zenburn. -" See also :help syntax -" -" Credits: -" - Jani Nurminen - original Zenburn, maintainer -" - Steve Hall & Cream posse - higher-contrast Visual selection -" - Kurt Maier - 256 color console coloring, low and high contrast toggle, -" bug fixing -" - Charlie - spotted too bright StatusLine in non-high contrast mode -" - Pablo Castellazzi - CursorLine fix for 256 color mode -" - Tim Smith - force dark background -" - John Gabriele - spotted bad Ignore-group handling -" - Zac Thompson - spotted invisible NonText in low contrast mode -" - Christophe-Marie Duquesne - suggested making a Vimball, -" suggested support for ctags_highlighting.vim -" - Andrew Wagner - noted the CursorColumn bug (guifg was unintentionally set), -" unify CursorColumn colour -" - Martin Langasek - clarify the license, whitespace fixes -" - Marcin Szamotulski - support autocomplete for Zenburn configuration -" parameters -" - Clayton Parker (claytron) - Convinced by Kurt Maier to use Zenburn. Point -" out issues with LineNr, fix directory styles, and their usage in MacVim. -" - Paweł Piekarski - Spotted bad FoldColumn and TabLine. Made better -" FoldColumn colors, fixed TabLine colors. -" -" CONFIGURABLE PARAMETERS: -" -" You can use the default (don't set any parameters), or you can -" set some parameters to tweak the Zenburn colours. -" -" To use them, put them into your .vimrc file before loading the color scheme, -" example: -" let g:zenburn_high_Contrast=1 -" colors zenburn -" -" You can also do ":let g:zenburn" then hit Ctrl-d or Tab to scroll through the -" list of configurable parameters. -" -" * You can now set a darker background for bright environments. To activate, use: -" contrast Zenburn, use: -" -" let g:zenburn_high_Contrast = 1 -" -" * For example, Vim help files uses the Ignore-group for the pipes in tags -" like "|somelink.txt|". By default, the pipes are not visible, as they -" map to Ignore group. If you wish to enable coloring of the Ignore group, -" set the following parameter to 1. Warning, it might make some syntax files -" look strange. -" -" let g:zenburn_color_also_Ignore = 1 -" -" * To get more contrast to the Visual selection, use -" -" let g:zenburn_alternate_Visual = 1 -" -" Note: this is enabled only if the old-style Visual -" if used, see g:zenburn_old_Visual -" -" * To use alternate colouring for Error message, use -" -" let g:zenburn_alternate_Error = 1 -" -" * The new default for Include is a duller orange. To use the original -" colouring for Include, use -" -" let g:zenburn_alternate_Include = 1 -" -" * Work-around to a Vim bug, it seems to misinterpret ctermfg and 234 and 237 -" as light values, and sets background to light for some people. If you have -" this problem, use: -" -" let g:zenburn_force_dark_Background = 1 -" -" * By default the CursorColumn is of a lighter colour. I find it more readable -" that way, but some people may want to align it with the darker CursorLine -" color, for visual uniformity. To do so, use: -" -" let g:zenburn_unified_CursorColumn = 1 -" -" Note: you can ignore this unless you use -" ":set cursorline cursorcolumn", since otherwise the effect won't be -" seen. -" -" * New (dark) Visual coloring has been introduced. -" The dark Visual is more aligned with the rest of the colour scheme, -" especially if you use line numbers. If you wish to use the -" old Visual coloring, use -" -" let g:zenburn_old_Visual = 1 -" -" Default is to use the new Visual. -" -" * EXPERIMENTAL FEATURE: Zenburn will automatically detect if you -" have ctags_highlighting.vim (by Al Budden, -" http://www.vim.org/scripts/script.php?script_id=2646) enabled, and -" will set sensible highlight links. Nothing will happen if you do -" not have ctags_highlighting.vim. If you do not want this feature, you can -" override the check with: -" -" let g:zenburn_disable_ctags_highlighting_support = 1 -" -" NOTE: -" -" * To turn the parameter(s) back to defaults, use UNLET or set them to 0: -" -" unlet g:zenburn_alternate_Include -" or -" let g:zenburn_alternate_Include = 0 -" -" -" That's it, enjoy! -" -" TODO -" - Visual alternate color is broken? Try GVim >= 7.0.66 if you have trouble -" - IME colouring (CursorIM) - -" Set defaults, but keep any parameters already set by the user -if ! exists("g:zenburn_high_Contrast") - let g:zenburn_high_Contrast = 0 -endif - -if ! exists("g:zenburn_color_also_Ignore") - let g:zenburn_color_also_Ignore = 0 -endif - -if ! exists("g:zenburn_alternate_Error") - let g:zenburn_alternate_Error = 0 -endif - -if ! exists("g:zenburn_force_dark_Background") - let g:zenburn_force_dark_Background = 0 -endif - -if ! exists("g:zenburn_alternate_Visual") - let g:zenburn_alternate_Visual = 0 -endif - -if ! exists("g:zenburn_alternate_Include") - let g:zenburn_alternate_Include = 0 -endif - -if ! exists("g:zenburn_unified_CursorColumn") - let g:zenburn_unified_CursorColumn = 0 -endif - -if ! exists("g:zenburn_old_Visual") - let g:zenburn_old_Visual = 0 -endif - -if ! exists("g:zenburn_disable_ctags_highlighting_support") - " enabled by default - let g:zenburn_disable_ctags_highlighting_support = 0 -endif - -" ----------------------------------------------- - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name="zenburn" - -" check for ctags-highlighting -if exists("g:loaded_ctags_highlighting") && g:loaded_ctags_highlighting && ! g:zenburn_disable_ctags_highlighting_support - " internal - let _zenburn_ctags = 1 -endif - -hi Boolean guifg=#dca3a3 -hi Character guifg=#dca3a3 gui=bold -hi Comment guifg=#7f9f7f gui=italic -hi Conditional guifg=#f0dfaf gui=bold -hi Constant guifg=#dca3a3 gui=bold -hi Cursor guifg=#000d18 guibg=#8faf9f gui=bold -hi Debug guifg=#bca3a3 gui=bold -hi Define guifg=#ffcfaf gui=bold -hi Delimiter guifg=#8f8f8f -hi DiffAdd guifg=#709080 guibg=#313c36 gui=bold -hi DiffChange guibg=#333333 -hi DiffDelete guifg=#333333 guibg=#464646 -hi DiffText guifg=#ecbcbc guibg=#41363c gui=bold -hi Directory guifg=#9fafaf gui=bold -hi ErrorMsg guifg=#80d4aa guibg=#2f2f2f gui=bold -hi Exception guifg=#c3bf9f gui=bold -hi Float guifg=#c0bed1 -hi FoldColumn guifg=#93b3a3 guibg=#3f4040 -hi Folded guifg=#93b3a3 guibg=#3f4040 -hi Function guifg=#efef8f -hi Identifier guifg=#efdcbc -hi IncSearch guibg=#f8f893 guifg=#385f38 -hi Keyword guifg=#f0dfaf gui=bold -hi Label guifg=#dfcfaf gui=underline -hi Macro guifg=#ffcfaf gui=bold -hi ModeMsg guifg=#ffcfaf gui=none -hi MoreMsg guifg=#ffffff gui=bold -hi Number guifg=#8cd0d3 -hi Operator guifg=#f0efd0 -hi PreCondit guifg=#dfaf8f gui=bold -hi PreProc guifg=#ffcfaf gui=bold -hi Question guifg=#ffffff gui=bold -hi Repeat guifg=#ffd7a7 gui=bold -hi Search guifg=#ffffe0 guibg=#284f28 -hi SpecialChar guifg=#dca3a3 gui=bold -hi SpecialComment guifg=#82a282 gui=bold -hi Special guifg=#cfbfaf -hi SpecialKey guifg=#9ece9e -hi Statement guifg=#e3ceab gui=none -hi StatusLine guifg=#313633 guibg=#ccdc90 -hi StatusLineNC guifg=#2e3330 guibg=#88b090 -hi StorageClass guifg=#c3bf9f gui=bold -hi String guifg=#cc9393 -hi Structure guifg=#efefaf gui=bold -hi Tag guifg=#e89393 gui=bold -hi Title guifg=#efefef gui=bold -hi Todo guifg=#dfdfdf guibg=bg gui=bold -hi Typedef guifg=#dfe4cf gui=bold -hi Type guifg=#dfdfbf gui=bold -hi Underlined guifg=#dcdccc gui=underline -hi VertSplit guifg=#2e3330 guibg=#688060 -hi VisualNOS guifg=#333333 guibg=#f18c96 gui=bold,underline -hi WarningMsg guifg=#ffffff guibg=#333333 gui=bold -hi WildMenu guibg=#2c302d guifg=#cbecd0 gui=underline - -hi SpellBad guisp=#bc6c4c guifg=#dc8c6c -hi SpellCap guisp=#6c6c9c guifg=#8c8cbc -hi SpellRare guisp=#bc6c9c guifg=#bc8cbc -hi SpellLocal guisp=#7cac7c guifg=#9ccc9c - -" Entering Kurt zone -if &t_Co > 255 - hi Boolean ctermfg=181 - hi Character ctermfg=181 cterm=bold - hi Comment ctermfg=108 - hi Conditional ctermfg=223 cterm=bold - hi Constant ctermfg=181 cterm=bold - hi Cursor ctermfg=233 ctermbg=109 cterm=bold - hi Debug ctermfg=181 cterm=bold - hi Define ctermfg=223 cterm=bold - hi Delimiter ctermfg=245 - hi DiffAdd ctermfg=66 ctermbg=237 cterm=bold - hi DiffChange ctermbg=236 - hi DiffDelete ctermfg=236 ctermbg=238 - hi DiffText ctermfg=217 ctermbg=237 cterm=bold - hi Directory ctermfg=109 cterm=bold - hi ErrorMsg ctermfg=115 ctermbg=236 cterm=bold - hi Exception ctermfg=249 cterm=bold - hi Float ctermfg=251 - hi Function ctermfg=228 - hi Identifier ctermfg=223 - hi IncSearch ctermbg=228 ctermfg=238 - hi Keyword ctermfg=223 cterm=bold - hi Label ctermfg=187 cterm=underline - hi LineNr ctermfg=248 ctermbg=233 - hi Macro ctermfg=223 cterm=bold - hi ModeMsg ctermfg=223 cterm=none - hi MoreMsg ctermfg=15 cterm=bold - hi Number ctermfg=116 - hi Operator ctermfg=230 - hi PreCondit ctermfg=180 cterm=bold - hi PreProc ctermfg=223 cterm=bold - hi Question ctermfg=15 cterm=bold - hi Repeat ctermfg=223 cterm=bold - hi Search ctermfg=230 ctermbg=236 - hi SpecialChar ctermfg=181 cterm=bold - hi SpecialComment ctermfg=108 cterm=bold - hi Special ctermfg=181 - hi SpecialKey ctermfg=151 - hi Statement ctermfg=187 ctermbg=234 cterm=none - hi StatusLine ctermfg=236 ctermbg=186 - hi StatusLineNC ctermfg=235 ctermbg=108 - hi StorageClass ctermfg=249 cterm=bold - hi String ctermfg=174 - hi Structure ctermfg=229 cterm=bold - hi Tag ctermfg=181 cterm=bold - hi Title ctermfg=7 ctermbg=234 cterm=bold - hi Todo ctermfg=108 ctermbg=234 cterm=bold - hi Typedef ctermfg=253 cterm=bold - hi Type ctermfg=187 cterm=bold - hi Underlined ctermfg=188 ctermbg=234 cterm=bold - hi VertSplit ctermfg=236 ctermbg=65 - hi VisualNOS ctermfg=236 ctermbg=210 cterm=bold - hi WarningMsg ctermfg=15 ctermbg=236 cterm=bold - hi WildMenu ctermbg=236 ctermfg=194 cterm=bold - - " spellchecking, always "bright" background - hi SpellLocal ctermfg=14 ctermbg=237 - hi SpellBad ctermfg=9 ctermbg=237 - hi SpellCap ctermfg=12 ctermbg=237 - hi SpellRare ctermfg=13 ctermbg=237 - - " pmenu - hi PMenu ctermfg=248 ctermbg=0 - hi PMenuSel ctermfg=223 ctermbg=235 - - if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast - hi Normal ctermfg=188 ctermbg=234 - hi NonText ctermfg=238 - - if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore - hi Ignore ctermfg=238 - endif - - " hc mode, darker CursorLine, default 236 - hi CursorLine ctermbg=233 cterm=none - - if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn - hi CursorColumn ctermbg=233 cterm=none - else - hi CursorColumn ctermbg=235 cterm=none - endif - else - hi Normal ctermfg=188 ctermbg=237 - hi Cursor ctermbg=109 - hi diffadd ctermbg=237 - hi diffdelete ctermbg=238 - hi difftext ctermbg=237 - hi errormsg ctermbg=237 - hi incsearch ctermbg=228 - hi linenr ctermbg=235 - hi search ctermbg=238 - hi statement ctermbg=237 - hi statusline ctermbg=144 - hi statuslinenc ctermbg=108 - hi title ctermbg=237 - hi todo ctermbg=237 - hi underlined ctermbg=237 - hi vertsplit ctermbg=65 - hi visualnos ctermbg=210 - hi warningmsg ctermbg=236 - hi wildmenu ctermbg=236 - hi NonText ctermfg=240 - - if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore - hi Ignore ctermfg=240 - endif - - " normal mode, lighter CursorLine - hi CursorLine ctermbg=238 cterm=none - - if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn - hi CursorColumn ctermbg=238 cterm=none - else - hi CursorColumn ctermbg=239 cterm=none - endif - endif - - if exists("g:zenburn_alternate_Error") && g:zenburn_alternate_Error - " use more jumpy Error - hi Error ctermfg=210 ctermbg=52 gui=bold - else - " default is something more zenburn-compatible - hi Error ctermfg=228 ctermbg=95 gui=bold - endif -endif - -if exists("g:zenburn_force_dark_Background") && g:zenburn_force_dark_Background - " Force dark background, because of a bug in VIM: VIM sets background - " automatically during "hi Normal ctermfg=X"; it misinterprets the high - " value (234 or 237 above) as a light color, and wrongly sets background to - " light. See ":help highlight" for details. - set background=dark -endif - -if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast - " use new darker background - hi Normal guifg=#dcdccc guibg=#1f1f1f - hi CursorLine guibg=#121212 gui=bold - if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn - hi CursorColumn guibg=#121212 gui=bold - else - hi CursorColumn guibg=#2b2b2b - endif - hi Pmenu guibg=#242424 guifg=#ccccbc - hi PMenuSel guibg=#353a37 guifg=#ccdc90 gui=bold - hi PmenuSbar guibg=#2e3330 guifg=#000000 - hi PMenuThumb guibg=#a0afa0 guifg=#040404 - hi MatchParen guifg=#f0f0c0 guibg=#383838 gui=bold - hi SignColumn guifg=#9fafaf guibg=#181818 gui=bold - hi TabLineFill guifg=#cfcfaf guibg=#181818 gui=bold - hi TabLineSel guifg=#efefef guibg=#1c1c1b gui=bold - hi TabLine guifg=#b6bf98 guibg=#181818 gui=bold - hi NonText guifg=#404040 gui=bold - - hi LineNr guifg=#9fafaf guibg=#161616 -else - " Original, lighter background - hi Normal guifg=#dcdccc guibg=#3f3f3f - hi CursorLine guibg=#434443 - if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn - hi CursorColumn guibg=#434343 - else - hi CursorColumn guibg=#4f4f4f - endif - hi Pmenu guibg=#2c2e2e guifg=#9f9f9f - hi PMenuSel guibg=#242424 guifg=#d0d0a0 gui=bold - hi PmenuSbar guibg=#2e3330 guifg=#000000 - hi PMenuThumb guibg=#a0afa0 guifg=#040404 - hi MatchParen guifg=#b2b2a0 guibg=#2e2e2e gui=bold - hi SignColumn guifg=#9fafaf guibg=#343434 gui=bold - hi TabLineFill guifg=#cfcfaf guibg=#353535 gui=bold - hi TabLineSel guifg=#efefef guibg=#3a3a39 gui=bold - hi TabLine guifg=#b6bf98 guibg=#353535 gui=bold - hi NonText guifg=#5b605e gui=bold - - hi LineNr guifg=#9fafaf guibg=#262626 -endif - -if exists("g:zenburn_old_Visual") && g:zenburn_old_Visual - if exists("g:zenburn_alternate_Visual") && g:zenburn_alternate_Visual - " Visual with more contrast, thanks to Steve Hall & Cream posse - " gui=none fixes weird highlight problem in at least GVim 7.0.66, thanks to Kurt Maier - hi Visual guifg=#000000 guibg=#71d3b4 gui=none - hi VisualNOS guifg=#000000 guibg=#71d3b4 gui=none - else - " use default visual - hi Visual guifg=#233323 guibg=#71d3b4 gui=none - hi VisualNOS guifg=#233323 guibg=#71d3b4 gui=none - endif -else - " new Visual style - if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast - " high contrast - "hi Visual guibg=#304a3d - "hi VisualNos guibg=#304a3d - "TODO no nice greenish in console, 65 is closest. use full black instead, - "although i like the green..! - hi Visual guibg=#0f0f0f - hi VisualNos guibg=#0f0f0f - if &t_Co > 255 - hi Visual ctermbg=0 - endif - else - " low contrast - hi Visual guibg=#2f2f2f - hi VisualNOS guibg=#2f2f2f - - if &t_Co > 255 - hi Visual ctermbg=235 - hi VisualNOS ctermbg=235 - endif - endif -endif - -if exists("g:zenburn_alternate_Error") && g:zenburn_alternate_Error - " use more jumpy Error - hi Error guifg=#e37170 guibg=#664040 gui=bold -else - " default is something more zenburn-compatible - hi Error guifg=#e37170 guibg=#3d3535 gui=none -endif - -if exists("g:zenburn_alternate_Include") && g:zenburn_alternate_Include - " original setting - hi Include guifg=#ffcfaf gui=bold -else - " new, less contrasted one - hi Include guifg=#dfaf8f gui=bold -endif - -if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore - " color the Ignore groups - " note: if you get strange coloring for your files, turn this off (unlet) - hi Ignore guifg=#545a4f -endif - -" new tabline and fold column -if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast - hi FoldColumn guibg=#161616 - hi Folded guibg=#161616 - hi TabLine guifg=#88b090 guibg=#313633 gui=none - hi TabLineSel guifg=#ccd990 guibg=#222222 - hi TabLineFill guifg=#88b090 guibg=#313633 gui=none - - hi SpecialKey guibg=#242424 - - if &t_Co > 255 - hi FoldColumn ctermbg=233 ctermfg=109 - hi Folded ctermbg=233 ctermfg=109 - hi TabLine ctermbg=236 ctermfg=108 cterm=none - hi TabLineSel ctermbg=235 ctermfg=186 cterm=bold - hi TabLineFill ctermbg=236 ctermfg=236 - endif -else - hi FoldColumn guibg=#333333 - hi Folded guibg=#333333 - hi TabLine guifg=#d0d0b8 guibg=#222222 gui=none - hi TabLineSel guifg=#f0f0b0 guibg=#333333 gui=bold - hi TabLineFill guifg=#dccdcc guibg=#101010 gui=none - - hi SpecialKey guibg=#444444 - - if &t_Co > 255 - hi FoldColumn ctermbg=236 ctermfg=109 - hi Folded ctermbg=236 ctermfg=109 - hi TabLine ctermbg=235 ctermfg=187 cterm=none - hi TabLineSel ctermbg=236 ctermfg=229 cterm=bold - hi TabLineFill ctermbg=233 ctermfg=233 - endif -endif - -" EXPERIMENTAL ctags_highlighting support -" link/set sensible defaults here; -" -" For now I mostly link to subset of Zenburn colors, the linkage is based -" on appearance, not semantics. In later versions I might define more new colours. -" -" HELP NEEDED to make this work properly. -if exists("_zenburn_ctags") && _zenburn_ctags - - " Highlighter seems to think a lot of things are global variables even - " though they're not. Example: python method-local variable is - " coloured as a global variable. They should not be global, since - " they're not visible outside the method. - " If this is some very bright colour group then things look bad. - hi link CTagsGlobalVariable Identifier - - hi CTagsClass guifg=#acd0b3 - if &t_Co > 255 - hi CTagsClass ctermfg=115 - endif - - hi link CTagsImport Statement - hi link CTagsMember Function - - hi link CTagsGlobalConstant Constant - - " These do not yet have support, I can't get them to appear - hi link EnumerationValue Float - hi link EnumerationName Identifier - hi link DefinedName WarningMsg - hi link LocalVariable WarningMsg - hi link Structure WarningMsg - hi link Union WarningMsg -endif - -" TODO check for more obscure syntax groups that they're ok - diff --git a/bundle/git_syntastic/README.markdown b/bundle/git_syntastic/README.markdown index c6712c5..57c3101 100644 --- a/bundle/git_syntastic/README.markdown +++ b/bundle/git_syntastic/README.markdown @@ -66,6 +66,35 @@ To get information or make suggestions check out the [google group](https://grou Changelog --------- +2.3.0 (16-feb-2012) + + * Add syntastic_loc_list_height option + * Allow errors to have a "subtype" that is signed differently to standard + errors. Currently geared towards differentiating style errors from + syntax errors. Currently implemented for phpcs (technosophos). + * New checkers for: + * yaml + * haxe (davidB) + * ocaml (edwintorok) + * pylint (parantapa) + * rust (cjab) + * Updates to existing checkers: + * jslint + * jshint (gillesruppert) + * fortran (bmattern) + * sass + * html (darcyparker) + * coffee (darcyparker) + * docbk (darcyparker) + * xml + * xslt + * less (irrationalfab) + * php (AD7six, technosophos) + * cuda + * python (mitchellh, pneff) + * perl (Anthony Carapetis) + * c (naoina, zsprackett) + * puppet (frimik) 2.2.0 (24-dec-2011) @@ -82,61 +111,3 @@ Changelog * JSON (millermedeiros, tocer) * rst (reStructuredText files) (JNRowe) * gentoo-metadata (JNRowe) - -2.1.0 (14-dec-2011) - - * when the cursor is on a line containing an error, echo the - * error msg (kevinw) - * various bug fixes and refactoring - * updates/fixes to existing checkers: - * html (millermedeiros) - * erlang - * coffeescript - * javascript - * sh - * php (add support for phpcs - technosophos) - * add an applescript checker (Zhai Cai) - * add support for hyphenated filetypes (JNRowe) - -2.0.0 (2-dec-2011): - - * Add support for highlighting the erroneous parts of lines (kstep) - * Add support for displaying errors via balloons (kstep) - * Add syntastic_mode_map option to give more control over when checking should be done. - * Add :SyntasticCheck command to force a syntax check - useful in passive mode (justone). - * Add the option to automatically close the location list, but not automatically open it (milkypostman) - * Add syntastic_auto_jump option to automatically jump to the first error (milkypostman) - * Only source syntax checkers as needed - instead of loading all of them when vim starts - - * Support for new filetypes: - * less (julienXX) - * docbook (tpope) - * matlab (jasongraham) - * go (dtjm) - * puppet (uggedal, roman, zsprackett) - * haskell (baldo, roman) - * tcl (et) - * vala (kstep) - * cuda (temporaer) - * css (oryband, sitedyno) - * fortran (Karl Yngve Lervåg) - * xml (kusnier) - * xslt (kusnier) - * erlang (kTT) - * zpt (claytron) - - * updates to existing checkers: - * javascript (mogren, bryanforbes, cjab, ajduncan) - * sass/scss (tmm1, atourino, dlee, epeli) - * ruby (changa) - * perl (harleypig) - * haml (bmihelac) - * php (kstep, docteurklein) - * python (kstep, soli) - * lua (kstep) - * html (kstep) - * xhtml (kstep) - * c (kongo2002, brandonw) - * cpp (kongo2002) - * coffee (industrial) - * eruby (sergevm) diff --git a/bundle/git_syntastic/doc/syntastic.txt b/bundle/git_syntastic/doc/syntastic.txt index 94916ea..f0cede3 100644 --- a/bundle/git_syntastic/doc/syntastic.txt +++ b/bundle/git_syntastic/doc/syntastic.txt @@ -355,7 +355,7 @@ The latest dev versions are on github ============================================================================== 7. Changelog *syntastic-changelog* -next +2.3.0 - Add syntastic_loc_list_height option - Allow errors to have a "subtype" that is signed differently to standard errors. Currently geared towards differentiating style errors from @@ -365,9 +365,11 @@ next - haxe (davidB) - ocaml (edwintorok) - pylint (parantapa) + - rust (cjab) - Updates to existing checkers: - jslint + - jshint (gillesruppert) - fortran (bmattern) - sass - html (darcyparker) @@ -378,10 +380,10 @@ next - less (irrationalfab) - php (AD7six, technosophos) - cuda - - python (mitchellh) + - python (mitchellh, pneff) - perl (Anthony Carapetis) - c (naoina, zsprackett) - - puppet + - puppet (frimik) 2.2.0 - only do syntax checks when files are saved (not when first opened) - add @@ -495,6 +497,9 @@ next Thanks to the following people for testing, bug reports, patches etc. They own, hard. + Mikael Fridh (frimik) + Patrice Neff (pneff ) + Gilles Ruppert (gillesruppert) Naoya INADA (naoina) Mitchell Hashimoto (mitchellh) irrationalfab diff --git a/bundle/git_syntastic/plugin/syntastic.vim b/bundle/git_syntastic/plugin/syntastic.vim index 6fb8066..0eb657a 100644 --- a/bundle/git_syntastic/plugin/syntastic.vim +++ b/bundle/git_syntastic/plugin/syntastic.vim @@ -2,8 +2,8 @@ "File: syntastic.vim "Description: vim plugin for on the fly syntax checking "Maintainer: Martin Grenfell -"Version: 2.2.0 -"Last Change: 24 Dec, 2011 +"Version: 2.3.0 +"Last Change: 16 Feb, 2012 "License: This program is free software. It comes without any warranty, " to the extent permitted by applicable law. You can redistribute " it and/or modify it under the terms of the Do What The Fuck You diff --git a/bundle/color_wombat256grf/colors/wombat256grf.vim b/colors/wombat256grf.vim similarity index 100% rename from bundle/color_wombat256grf/colors/wombat256grf.vim rename to colors/wombat256grf.vim diff --git a/bundle/syntax_css/syntax/css.vim b/syntax/css.vim similarity index 100% rename from bundle/syntax_css/syntax/css.vim rename to syntax/css.vim diff --git a/bundle/syntax_mako/syntax/mako.vim b/syntax/mako.vim similarity index 100% rename from bundle/syntax_mako/syntax/mako.vim rename to syntax/mako.vim diff --git a/bundle/syntax_opl/syntax/pd_opl.vim b/syntax/pd_opl.vim similarity index 100% rename from bundle/syntax_opl/syntax/pd_opl.vim rename to syntax/pd_opl.vim diff --git a/bundle/syntax_pentadactyl/syntax/pentadactyl.vim b/syntax/pentadactyl.vim similarity index 100% rename from bundle/syntax_pentadactyl/syntax/pentadactyl.vim rename to syntax/pentadactyl.vim diff --git a/bundle/syntax_python/syntax/python.vim b/syntax/python.vim similarity index 100% rename from bundle/syntax_python/syntax/python.vim rename to syntax/python.vim diff --git a/bundle/syntax_tmux/syntax/tmux.vim b/syntax/tmux.vim similarity index 100% rename from bundle/syntax_tmux/syntax/tmux.vim rename to syntax/tmux.vim