# HG changeset patch # User Steve Losh # Date 1298931033 18000 # Node ID 3269b4a6ff1f4407924a1d8ce28224bf153f4c5e # Parent 5c4a99127ef92d9eebdb68a3679de27c4f25b216 vim: colors and more diff -r 5c4a99127ef9 -r 3269b4a6ff1f vim/.vimrc --- a/vim/.vimrc Fri Feb 25 15:17:11 2011 -0500 +++ b/vim/.vimrc Mon Feb 28 17:10:33 2011 -0500 @@ -76,7 +76,7 @@ let maplocalleader = "\\" " }}} -" Color scheme (terminal) {{{ +" Color scheme {{{ syntax on set background=dark @@ -281,9 +281,6 @@ " Formatting, TextMate-style nnoremap q gqip -" Faster Make -nnoremap m :make - " Easier linewise reselection nnoremap v V`] @@ -521,7 +518,7 @@ highlight SpellBad term=underline gui=undercurl guisp=Orange - set fillchars=vert:┃ + set fillchars=vert:│ set guicursor=n-c:block-Cursor-blinkon0 set guicursor+=v:block-vCursor-blinkon0 diff -r 5c4a99127ef9 -r 3269b4a6ff1f vim/colors/molokai.vim --- a/vim/colors/molokai.vim Fri Feb 25 15:17:11 2011 -0500 +++ b/vim/colors/molokai.vim Mon Feb 28 17:10:33 2011 -0500 @@ -13,14 +13,14 @@ set background=dark let g:colors_name="molokai" -hi Normal guifg=#F8F8F2 guibg=#1B1D1E -hi Folded guifg=#666666 guibg=#1B1D1E +hi Normal guifg=#F8F8F2 guibg=#1C1E1F +hi Folded guifg=#666666 guibg=#1C1E1F hi Comment guifg=#5c7176 hi CursorLine guibg=#232728 hi CursorColumn guibg=#232728 hi ColorColumn guibg=#232728 -hi LineNr guifg=#AAAAAA guibg=#1B1D1E -hi FoldColumn guifg=#AAAAAA guibg=#1B1D1E +hi LineNr guifg=#AAAAAA guibg=#1C1E1F +hi FoldColumn guifg=#AAAAAA guibg=#1C1E1F hi Boolean guifg=#AE81FF hi Character guifg=#E6DB74 @@ -47,7 +47,7 @@ hi Function guifg=#A6E22E hi Identifier guifg=#FD971F hi Ignore guifg=#808080 guibg=bg -hi IncSearch guifg=#C4BE89 guibg=#000000 +hi IncSearch guibg=#000000 guifg=#FF8D00 hi Keyword guifg=#F92672 gui=bold hi Label guifg=#E6DB74 gui=none @@ -60,16 +60,16 @@ hi Operator guifg=#F92672 " complete menu -hi Pmenu guifg=#66D9EF guibg=#000000 -hi PmenuSel guibg=#808080 -hi PmenuSbar guibg=#080808 -hi PmenuThumb guifg=#66D9EF +hi Pmenu guifg=#cccccc guibg=#232728 +hi PmenuSel guifg=#000000 guibg=#AAF412 +hi PmenuSbar guibg=#131414 +hi PmenuThumb guifg=#777777 hi PreCondit guifg=#A6E22E gui=bold hi PreProc guifg=#A6E22E hi Question guifg=#66D9EF hi Repeat guifg=#F92672 gui=bold -hi Search guifg=#FFFFFF guibg=#455354 +hi Search guifg=#000000 guibg=#E4E500 " marks column hi SignColumn guifg=#A6E22E guibg=#151617 @@ -96,18 +96,18 @@ hi Type guifg=#66D9EF gui=none hi Underlined guifg=#808080 gui=underline -hi VertSplit guifg=#AAAAAA guibg=#151617 gui=none +hi VertSplit guifg=#AAAAAA guibg=bg gui=none hi VisualNOS guibg=#403D3D hi Visual guibg=#403D3D hi WarningMsg guifg=#FFFFFF guibg=#333333 gui=bold hi WildMenu guifg=#66D9EF guibg=#000000 -hi MyTagListFileName guifg=#F92672 guibg=#1B1D1E gui=bold +hi MyTagListFileName guifg=#F92672 guibg=#1C1E1F gui=bold " Invisible character colors -highlight NonText guifg=#444444 guibg=#1B1D1E -highlight SpecialKey guifg=#444444 guibg=#1B1D1E +highlight NonText guifg=#444444 guibg=#1C1E1F +highlight SpecialKey guifg=#444444 guibg=#1C1E1F " " Support for 256-color terminal diff -r 5c4a99127ef9 -r 3269b4a6ff1f vim/colors/mustang.vim --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vim/colors/mustang.vim Mon Feb 28 17:10:33 2011 -0500 @@ -0,0 +1,60 @@ +" Maintainer: Henrique C. Alves (hcarvalhoalves@gmail.com) +" Version: 1.0 +" Last Change: September 25 2008 + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "mustang" + +" Vim >= 7.0 specific colors +if version >= 700 + hi CursorLine guibg=#2d2d2d ctermbg=236 + hi ColorColumn guibg=#2d2d2d ctermbg=236 + hi CursorColumn guibg=#2D2D2D ctermbg=236 + hi MatchParen guifg=#d0ffc0 guibg=#2f2f2f gui=bold ctermfg=157 ctermbg=237 cterm=bold + hi Pmenu guifg=#ffffff guibg=#444444 ctermfg=255 ctermbg=238 + hi PmenuSel guifg=#000000 guibg=#b1d631 ctermfg=0 ctermbg=148 +endif + +" General colors +hi Cursor guifg=NONE guibg=#626262 gui=none ctermbg=241 +hi Normal guifg=#e2e2e5 guibg=#202020 gui=none ctermfg=253 ctermbg=234 +hi NonText guifg=#808080 guibg=#202020 gui=none ctermfg=244 ctermbg=235 +hi LineNr guifg=#808080 guibg=#000000 gui=none ctermfg=244 ctermbg=232 +hi StatusLine guifg=#d3d3d5 guibg=#444444 gui=italic ctermfg=253 ctermbg=238 cterm=italic +hi StatusLineNC guifg=#939395 guibg=#444444 gui=none ctermfg=246 ctermbg=238 +hi VertSplit guifg=#444444 guibg=#444444 gui=none ctermfg=238 ctermbg=238 +hi Folded guibg=#202020 guifg=#808080 gui=none ctermbg=4 ctermfg=248 +hi Title guifg=#f6f3e8 guibg=NONE gui=bold ctermfg=254 cterm=bold +hi Visual guifg=#faf4c6 guibg=#3c414c gui=none ctermfg=254 ctermbg=4 +hi SpecialKey guifg=#808080 guibg=#202020 gui=none ctermfg=244 ctermbg=236 + +" Syntax highlighting +hi Comment guifg=#606060 gui=italic ctermfg=244 +hi Todo guifg=#8f8f8f gui=italic ctermfg=245 +hi Boolean guifg=#b1d631 gui=none ctermfg=148 +hi String guifg=#b1d631 gui=italic ctermfg=148 +hi Identifier guifg=#b1d631 gui=none ctermfg=148 +hi Function guifg=#ffffff gui=bold ctermfg=255 +hi Type guifg=#7e8aa2 gui=none ctermfg=103 +hi Statement guifg=#7e8aa2 gui=none ctermfg=103 +hi Keyword guifg=#ff9800 gui=none ctermfg=208 +hi Constant guifg=#ff9800 gui=none ctermfg=208 +hi Number guifg=#ff9800 gui=none ctermfg=208 +hi Special guifg=#ff9800 gui=none ctermfg=208 +hi PreProc guifg=#faf4c6 gui=none ctermfg=230 +hi Todo guifg=#000000 guibg=#e6ea50 gui=italic + +" Code-specific colors +hi pythonOperator guifg=#7e8aa2 gui=none ctermfg=103 + +" Cursor Colors +hi Cursor guifg=#000000 guibg=#F35FBC +hi iCursor guifg=#000000 guibg=#FDFF00 +hi vCursor guifg=#000000 guibg=#AAF412 diff -r 5c4a99127ef9 -r 3269b4a6ff1f vim/colors/vitamins.vim --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vim/colors/vitamins.vim Mon Feb 28 17:10:33 2011 -0500 @@ -0,0 +1,55 @@ +" Maintainer: Henrique C. Alves (hcarvalhoalves@gmail.com) +" Version: 1.1 +" Last Change: September 23 2008 + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "vitamins" + +" Vim >= 7.0 specific colors +if version >= 700 + hi CursorLine guibg=#2d2d2d ctermbg=236 + hi ColorColumn guibg=#2d2d2d ctermbg=236 + hi CursorColumn guibg=#2d2d2d ctermbg=236 + hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold ctermbg=59 + hi Pmenu guifg=#f6f3e8 guibg=#444444 ctermbg=242 + hi PmenuSel guifg=#000000 guibg=#cdd129 ctermfg=0 ctermbg=184 +endif + +" General colors +hi Cursor guifg=NONE guibg=#656565 gui=none ctermbg=0x241 +hi Normal guifg=#f6f3f0 guibg=#212121 gui=none ctermfg=254 ctermbg=235 +hi NonText guifg=#808080 guibg=#212121 gui=none ctermfg=242 ctermbg=237 +hi LineNr guifg=#5c5a4f guibg=#000000 gui=none ctermfg=239 ctermbg=232 +hi StatusLine guifg=#f6f3e8 guibg=#444444 gui=italic +hi StatusLineNC guifg=#857b6f guibg=#444444 gui=none +hi VertSplit guifg=#777777 guibg=#212121 gui=none +hi Folded guibg=#212121 guifg=#777777 gui=none +hi Title guifg=#f6f3e8 guibg=NONE gui=bold +hi Visual guifg=#ffffd7 guibg=#444444 gui=none ctermfg=186 ctermbg=238 +hi SpecialKey guifg=#808080 guibg=#212121 gui=none + +" Syntax highlighting +hi Comment guifg=#aaaaaa gui=italic ctermfg=244 +hi Todo guifg=#8f8f8f gui=italic ctermfg=245 +hi Constant guifg=#acf0f2 gui=none ctermfg=159 +hi String guifg=#ff5d28 gui=italic ctermfg=202 +hi Identifier guifg=#ff5d28 gui=none ctermfg=202 +hi Function guifg=#cdd129 gui=none ctermfg=184 +hi Type guifg=#cdd129 gui=none ctermfg=184 +hi Statement guifg=#af5f5f gui=none ctermfg=131 +hi Keyword guifg=#cdd129 gui=none ctermfg=184 +hi PreProc guifg=#ede39e gui=none ctermfg=187 +hi Number guifg=#ede39e gui=none ctermfg=187 +hi Special guifg=#acf0f2 gui=none ctermfg=159 + +" Cursor Colors +hi Cursor guifg=#000000 guibg=#AAF412 +hi iCursor guifg=#000000 guibg=#FDFF00 +hi vCursor guifg=#000000 guibg=#FDFF00