Permalink
Browse files

switch to github vim color scheme

  • Loading branch information...
1 parent fdc8afc commit de071e9c34db3fdbddcc4c330d5e10f0f6cfd048 @croaky croaky committed Dec 4, 2011
Showing with 78 additions and 173 deletions.
  1. +77 −0 vim/colors/github.vim
  2. +0 −172 vim/colors/vividchalk.vim
  3. +1 −1 vimrc
View
@@ -0,0 +1,77 @@
+" Vim color file
+" This file was generated by Palette
+" http://rubygems.org/gems/palette
+"
+" Author: Compiled from a handful of different themes
+" Notes: Github color scheme (light)
+
+hi clear
+if version > 580
+ if exists("syntax_on")
+ syntax reset
+ endif
+endif
+
+let colors_name="github"
+
+if has("gui_running")
+ set background=light
+endif
+
+hi Normal guifg=#000000 ctermfg=16 guibg=#F8F8FF ctermbg=231 gui=NONE cterm=NONE
+hi DiffAdd guifg=#003300 ctermfg=22 guibg=#DDFFDD ctermbg=194 gui=NONE cterm=NONE
+hi DiffChange guibg=#ECECEC ctermbg=255 gui=NONE cterm=NONE
+hi DiffText guifg=#000033 ctermfg=17 guibg=#DDDDFF ctermbg=189 gui=NONE cterm=NONE
+hi DiffDelete guifg=#DDCCCC ctermfg=252 guibg=#FFDDDD ctermbg=224 gui=NONE cterm=NONE
+hi Folded guifg=#808080 ctermfg=244 guibg=#ECECEC ctermbg=255 gui=NONE cterm=NONE
+hi LineNr guifg=#BBBBBB ctermfg=250 guibg=#ECECEC ctermbg=255 gui=NONE cterm=NONE
+hi NonText guifg=#808080 ctermfg=244 guibg=#ECECEC ctermbg=255 gui=NONE cterm=NONE
+hi VertSplit guifg=#BBBBBB ctermfg=250 guibg=#BBBBBB ctermbg=250 gui=NONE cterm=NONE
+hi StatusLine guifg=#404040 ctermfg=238 guibg=#BBBBBB ctermbg=250 gui=BOLD cterm=BOLD
+hi StatusLineNC guifg=#BBBBBB ctermfg=250 guibg=#ECECEC ctermbg=255 gui=ITALIC cterm=NONE
+hi ModeMsg guifg=#990000 ctermfg=88 gui=NONE cterm=NONE
+hi MoreMsg guifg=#990000 ctermfg=88 gui=NONE cterm=NONE
+hi Title guifg=#EF5939 ctermfg=203 gui=NONE cterm=NONE
+hi WarningMsg guifg=#EF5939 ctermfg=203 gui=NONE cterm=NONE
+hi SpecialKey guifg=#FFFFFF ctermfg=231 guibg=#FF1100 ctermbg=196 gui=ITALIC cterm=NONE
+hi MatchParen guifg=#000000 ctermfg=16 guibg=#CDCDFD ctermbg=189 gui=NONE cterm=NONE
+hi Underlined guifg=#000000 ctermfg=16 gui=UNDERLINE cterm=UNDERLINE
+hi Directory guifg=#990000 ctermfg=88 gui=NONE cterm=NONE
+hi Visual guifg=#FFFFFF ctermfg=231 guibg=#3465A4 ctermbg=61 gui=NONE cterm=NONE
+hi VisualNOS guifg=#FFFFFF ctermfg=231 guibg=#204A87 ctermbg=24 gui=NONE cterm=NONE
+hi IncSearch guifg=#000000 ctermfg=16 guibg=#CDCDFD ctermbg=189 gui=ITALIC cterm=NONE
+hi Search guifg=#000000 ctermfg=16 guibg=#CDCDFD ctermbg=189 gui=ITALIC cterm=NONE
+hi Ignore guifg=#808080 ctermfg=244 gui=NONE cterm=NONE
+hi Identifier guifg=#0086B3 ctermfg=31 gui=NONE cterm=NONE
+hi PreProc guifg=#A0A0A0 ctermfg=247 gui=BOLD cterm=BOLD
+hi Comment guifg=#AAAAAA ctermfg=248 gui=ITALIC cterm=NONE
+hi Constant guifg=#177F80 ctermfg=30 gui=NONE cterm=NONE
+hi String guifg=#D81745 ctermfg=161 gui=NONE cterm=NONE
+hi Function guifg=#990000 ctermfg=88 gui=BOLD cterm=BOLD
+hi Statement guifg=#000000 ctermfg=16 gui=BOLD cterm=BOLD
+hi Type guifg=#445588 ctermfg=60 gui=BOLD cterm=BOLD
+hi Number guifg=#1C9898 ctermfg=30 gui=NONE cterm=NONE
+hi Todo guifg=#FFFFFF ctermfg=231 guibg=#990000 ctermbg=88 gui=BOLD cterm=BOLD
+hi Special guifg=#159828 ctermfg=28 gui=BOLD cterm=BOLD
+hi rubySymbol guifg=#960B73 ctermfg=89 gui=NONE cterm=NONE
+hi Error guifg=#F8F8FF ctermfg=231 guibg=#FF1100 ctermbg=196 gui=NONE cterm=NONE
+hi Todo guifg=#F8F8FF ctermfg=231 guibg=#FF1100 ctermbg=196 gui=UNDERLINE cterm=UNDERLINE
+hi Label guifg=#000000 ctermfg=16 gui=BOLD cterm=BOLD
+hi StorageClass guifg=#000000 ctermfg=16 gui=BOLD cterm=BOLD
+hi Structure guifg=#000000 ctermfg=16 gui=BOLD cterm=BOLD
+hi TypeDef guifg=#000000 ctermfg=16 gui=BOLD cterm=BOLD
+hi WildMenu guifg=#7FBDFF ctermfg=111 guibg=#425C78 ctermbg=60 gui=NONE cterm=NONE
+hi Pmenu guifg=#FFFFFF ctermfg=231 guibg=#808080 ctermbg=244 gui=BOLD cterm=BOLD
+hi PmenuSel guifg=#000000 ctermfg=16 guibg=#CDCDFD ctermbg=189 gui=ITALIC cterm=NONE
+hi PmenuSbar guifg=#444444 ctermfg=238 guibg=#000000 ctermbg=16 gui=NONE cterm=NONE
+hi PmenuThumb guifg=#AAAAAA ctermfg=248 guibg=#AAAAAA ctermbg=248 gui=NONE cterm=NONE
+hi TabLine guifg=#404040 ctermfg=238 guibg=#DDDDDD ctermbg=253 gui=NONE cterm=NONE
+hi TabLineFill guifg=#404040 ctermfg=238 guibg=#DDDDDD ctermbg=253 gui=NONE cterm=NONE
+hi TabLineSel guifg=#404040 ctermfg=238 gui=BOLD cterm=BOLD
+hi cucumberTags guifg=#333333 ctermfg=236 guibg=#FFFF66 ctermbg=227 gui=BOLD cterm=BOLD
+hi htmlTagN gui=BOLD cterm=BOLD
+hi Cursor guifg=#F8F8FF ctermfg=231 guibg=#444454 ctermbg=238 gui=NONE cterm=NONE
+hi CursorLine guibg=#D8D8DD ctermbg=253 gui=NONE cterm=NONE
+hi CursorColumn guibg=#D8D8DD ctermbg=253 gui=NONE cterm=NONE
+
+hi link rubyStringDelimiter String
View
@@ -1,172 +0,0 @@
-" Vim color scheme
-" Name: vividchalk.vim
-" Author: Tim Pope <vimNOSPAM@tpope.info>
-" GetLatestVimScripts: 1891 1 :AutoInstall: vividchalk.vim
-" $Id: vividchalk.vim,v 1.8 2007-07-11 18:50:16 tpope Exp $
-
-" Based on the Vibrank Ink theme for TextMate
-" Distributable under the same terms as Vim itself (see :help license)
-
-if has("gui_running")
- set background=dark
-endif
-hi clear
-if exists("syntax_on")
- syntax reset
-endif
-
-let colors_name = "vividchalk"
-
-" First two functions adapted from inkpot.vim
-
-" map a urxvt cube number to an xterm-256 cube number
-fun! s:M(a)
- return strpart("0245", a:a, 1) + 0
-endfun
-
-" map a urxvt colour to an xterm-256 colour
-fun! s: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 + s:M(l:x) + (6 * s:M(l:y)) + (36 * s:M(l:z))
- endif
- endif
-endfun
-
-function! E2T(a)
- return s:X(a:a)
-endfunction
-
-function! s:choose(mediocre,good)
- if &t_Co != 88 && &t_Co != 256
- return a:mediocre
- else
- return s:X(a:good)
- endif
-endfunction
-
-function! s:hifg(group,guifg,first,second,...)
- if a:0 && &t_Co == 256
- let ctermfg = a:1
- else
- let ctermfg = s:choose(a:first,a:second)
- endif
- exe "highlight ".a:group." guifg=".a:guifg." ctermfg=".ctermfg
-endfunction
-
-function! s:hibg(group,guibg,first,second)
- let ctermbg = s:choose(a:first,a:second)
- exe "highlight ".a:group." guibg=".a:guibg." ctermbg=".ctermbg
-endfunction
-
-hi link railsMethod PreProc
-hi link rubyDefine Keyword
-hi link rubySymbol Constant
-hi link rubyAccess rubyMethod
-hi link rubyAttribute rubyMethod
-hi link rubyEval rubyMethod
-hi link rubyException rubyMethod
-hi link rubyInclude rubyMethod
-hi link rubyStringDelimiter rubyString
-hi link rubyRegexp Regexp
-hi link rubyRegexpDelimiter rubyRegexp
-"hi link rubyConstant Variable
-"hi link rubyGlobalVariable Variable
-"hi link rubyClassVariable Variable
-"hi link rubyInstanceVariable Variable
-hi link javascriptRegexpString Regexp
-hi link javascriptNumber Number
-hi link javascriptNull Constant
-
-call s:hifg("Normal","#EEEEEE","White",87)
-if &background == "light" || has("gui_running")
- hi Normal guibg=Black ctermbg=Black
-else
- hi Normal guibg=Black ctermbg=NONE
-endif
-highlight StatusLine guifg=Black guibg=#aabbee gui=bold ctermfg=Black ctermbg=White cterm=bold
-highlight StatusLineNC guifg=#444444 guibg=#aaaaaa gui=none ctermfg=Black ctermbg=Grey cterm=none
-"if &t_Co == 256
- "highlight StatusLine ctermbg=117
-"else
- "highlight StatusLine ctermbg=43
-"endif
-highlight WildMenu guifg=Black guibg=#ffff00 gui=bold ctermfg=Black ctermbg=Yellow cterm=bold
-highlight Cursor guifg=Black guibg=White ctermfg=Black ctermbg=White
-highlight CursorLine guibg=#333333 guifg=NONE
-highlight CursorColumn guibg=#333333 guifg=NONE
-highlight NonText guifg=#404040 ctermfg=8
-highlight SpecialKey guifg=#404040 ctermfg=8
-highlight Directory none
-high link Directory Identifier
-highlight ErrorMsg guibg=Red ctermbg=DarkRed guifg=NONE ctermfg=NONE
-highlight Search guifg=NONE ctermfg=NONE gui=none cterm=none
-call s:hibg("Search" ,"#555555","Black",81)
-highlight IncSearch guifg=White guibg=Black ctermfg=White ctermbg=Black
-highlight MoreMsg guifg=#00AA00 ctermfg=Green
-highlight LineNr guifg=#DDEEFF ctermfg=White
-call s:hibg("LineNr" ,"#222222","DarkBlue",80)
-highlight Question none
-high link Question MoreMsg
-highlight Title guifg=Magenta ctermfg=Magenta
-highlight VisualNOS gui=none cterm=none
-call s:hibg("Visual" ,"#555577","LightBlue",83)
-call s:hibg("VisualNOS" ,"#444444","DarkBlue",81)
-highlight WarningMsg guifg=Red ctermfg=Red
-highlight Folded guibg=#1100aa ctermbg=DarkBlue
-call s:hibg("Folded" ,"#110077","DarkBlue",17)
-call s:hifg("Folded" ,"#aaddee","LightCyan",63)
-highlight FoldColumn none
-high link FoldColumn Folded
-highlight Pmenu guifg=White ctermfg=White gui=bold cterm=bold
-highlight PmenuSel guifg=White ctermfg=White gui=bold cterm=bold
-call s:hibg("Pmenu" ,"#000099","Blue",18)
-call s:hibg("PmenuSel" ,"#5555ff","DarkCyan",39)
-highlight PmenuSbar guibg=Grey ctermbg=Grey
-highlight PmenuThumb guibg=White ctermbg=White
-highlight TabLine gui=underline cterm=underline
-call s:hifg("TabLine" ,"#bbbbbb","LightGrey",85)
-call s:hibg("TabLine" ,"#333333","DarkGrey",80)
-highlight TabLineSel guifg=White guibg=Black ctermfg=White ctermbg=Black
-highlight TabLineFill gui=underline cterm=underline
-call s:hifg("TabLineFill","#bbbbbb","LightGrey",85)
-call s:hibg("TabLineFill","#808080","Grey",83)
-
-hi Type gui=none
-hi Statement gui=none
-if !has("gui_mac")
- " Mac GUI degrades italics to ugly underlining.
- hi Comment gui=italic
- hi railsUserClass gui=italic
- hi railsUserMethod gui=italic
-endif
-hi Identifier cterm=none
-" Commented numbers at the end are *old* 256 color values
-"highlight PreProc guifg=#EDF8F9
-call s:hifg("Comment" ,"#9933CC","DarkMagenta",34) " 92
-" 26 instead?
-call s:hifg("Constant" ,"#339999","DarkCyan",21) " 30
-call s:hifg("rubyNumber" ,"#CCFF33","Yellow",60) " 190
-call s:hifg("String" ,"#66FF00","LightGreen",44,82) " 82
-call s:hifg("Identifier" ,"#FFCC00","Yellow",72) " 220
-call s:hifg("Statement" ,"#FF6600","Brown",68) " 202
-call s:hifg("PreProc" ,"#AAFFFF","LightCyan",47) " 213
-call s:hifg("railsUserMethod","#AACCFF","LightCyan",27)
-call s:hifg("Type" ,"#AAAA77","Grey",57) " 101
-call s:hifg("railsUserClass" ,"#AAAAAA","Grey",7) " 101
-call s:hifg("Special" ,"#33AA00","DarkGreen",24) " 7
-call s:hifg("Regexp" ,"#44B4CC","DarkCyan",21) " 74
-call s:hifg("rubyMethod" ,"#DDE93D","Yellow",77) " 191
-"highlight railsMethod guifg=#EE1122 ctermfg=1
View
2 vimrc
@@ -49,7 +49,7 @@ if executable("ack")
endif
" Color scheme
-colorscheme vividchalk
+colorscheme github
highlight NonText guibg=#060606
highlight Folded guibg=#0A0A0A guifg=#9090D0

0 comments on commit de071e9

Please sign in to comment.