summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Ritter <xeno@thehappy.de>2011-09-22 15:24:19 +0200
committerStefan Ritter <xeno@thehappy.de>2011-09-22 15:24:19 +0200
commit40ba6afeb03d85860973f8888af5c7f290a1489e (patch)
treefc5632979224eb50a6d6692617cfa19aaff9e236
parent55dd15fe4a3c853ea253f0815d4d2e2f331d2a80 (diff)
Some new colors and switch to soruby
Diffstat (limited to '')
-rw-r--r--vim/colors/corn.vim72
-rw-r--r--vim/vimrc6
-rw-r--r--vim/vitamins.vim53
-rw-r--r--vim/wombat.vim51
-rw-r--r--vim/zenburn.vim330
5 files changed, 3 insertions, 509 deletions
diff --git a/vim/colors/corn.vim b/vim/colors/corn.vim
deleted file mode 100644
index 64c3fef..0000000
--- a/vim/colors/corn.vim
+++ /dev/null
@@ -1,72 +0,0 @@
-" Vim colorscheme
-" Author: Charles <cherry_avium@yahoo.com>
-" Version: 0.01
-" Date: 07 December 2005
-
-set background=dark
-hi clear
-if exists("syntax_on")
- syntax reset
-endif
-
-" multiple scheme method
-" - one for C like language
-" - one for markup language
-" - one for style language (properties) -> property more outstanding than
-" object
-
-let colors_name = "Corn"
-" set mouseshape+=i:arrow
-
-" Window elements
-hi Cursor guifg=#000000 guibg=#F0F0F0
-hi Folded guifg=#C0C0C0 guibg=#808080
-hi LineNr guifg=#CCCCCC
-hi NonText guifg=#CCCCCC
-hi Normal guifg=#E0E0E0 guibg=#333333
-hi StatusLine guifg=#B8860B guibg=#E5E5E5
-hi StatusLineNC guifg=#C0C0C0 guibg=#000000
-hi Visual guifg=#C0C0C0 guibg=#000000
-
-" Main groups
-hi Comment guifg=#BBCCEE
-hi Constant guifg=#EEDDAA gui=none
-hi Statement guifg=#CCEE00 gui=italic
-hi StatementU guifg=#CCEE00 gui=underline
-hi Keyword guifg=#CCEE00
-hi Underlined guifg=#E0E0E0 gui=underline
-hi Error guifg=#FFFFFF guibg=#FF0000
-
-" Tag syntax
-hi Attribute guifg=#CCCCCC gui=italic
-
-hi! link String Constant
-hi! link Character Constant
-hi! link Number Constant
-hi! link Boolean Constant
-hi! link Float Constant
-
-hi! link Identifier Normal
-hi! link Function Statement
-
-hi! link Operator Keyword
-hi! link Preproc Keyword
-hi! link Type Keyword
-
-hi! link Special Keyword
-hi! link Ignore Normal
-hi! link Todo Error
-
-hi! link Title Normal
-
-
-hi! link phpDefine StatementU
-
-hi! link HtmlArg Attribute
-hi! link HtmlSpecialChar Statement
-
-hi! link xmlTagName Keyword
-hi! link xmlEndTag Keyword
-hi! link xmlEntity Statement
-hi! link xmlCData Comment
-hi! link xmlAttrib Attribute
diff --git a/vim/vimrc b/vim/vimrc
index 8ef06b5..ad6a597 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,7 +1,7 @@
syntax on
filetype plugin indent on
set t_Co=256
-colorscheme BusyBee
+colorscheme soruby
set tw=0
set sw=4
set ts=4
@@ -16,10 +16,10 @@ set shiftround
set modeline
set nobackup
set nohlsearch
-set colorcolumn=80
-highlight ColorColumn ctermbg=darkred guibg=darkred
set foldenable
set listchars=tab:»·
+set colorcolumn=80
+highlight ColorColumn ctermbg=darkred guibg=darkred
autocmd bufnewfile *.py so ~/etc/vim/header_python
autocmd bufnewfile *.html so ~/etc/vim/header_html
diff --git a/vim/vitamins.vim b/vim/vitamins.vim
deleted file mode 100644
index 3bfe068..0000000
--- a/vim/vitamins.vim
+++ /dev/null
@@ -1,53 +0,0 @@
-" 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 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=#242424 gui=none ctermfg=254
-"ctermbg=232
-hi NonText guifg=#808080 guibg=#303030 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=#444444 guibg=#444444 gui=none
-hi Folded guibg=#384048 guifg=#a0a8b0 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=#343434 gui=none
-
-" Syntax highlighting
-hi Comment guifg=#808080 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
-
diff --git a/vim/wombat.vim b/vim/wombat.vim
deleted file mode 100644
index 9ad1e56..0000000
--- a/vim/wombat.vim
+++ /dev/null
@@ -1,51 +0,0 @@
-" Maintainer: Lars H. Nielsen (dengmao@gmail.com)
-" Last Change: January 22 2007
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
- syntax reset
-endif
-
-let colors_name = "wombat"
-
-
-" Vim >= 7.0 specific colors
-if version >= 700
- hi CursorLine guibg=#2d2d2d
- hi CursorColumn guibg=#2d2d2d
- hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold
- hi Pmenu guifg=#f6f3e8 guibg=#444444
- hi PmenuSel guifg=#000000 guibg=#cae682
-endif
-
-" General colors
-hi Cursor guifg=NONE guibg=#656565 gui=none
-hi Normal guifg=#f6f3e8 guibg=#242424 gui=none
-hi NonText guifg=#808080 guibg=#303030 gui=none
-hi LineNr guifg=#857b6f guibg=#000000 gui=none
-hi StatusLine guifg=#f6f3e8 guibg=#444444 gui=italic
-hi StatusLineNC guifg=#857b6f guibg=#444444 gui=none
-hi VertSplit guifg=#444444 guibg=#444444 gui=none
-hi Folded guibg=#384048 guifg=#a0a8b0 gui=none
-hi Title guifg=#f6f3e8 guibg=NONE gui=bold
-hi Visual guifg=#f6f3e8 guibg=#444444 gui=none
-hi SpecialKey guifg=#808080 guibg=#343434 gui=none
-
-" Syntax highlighting
-hi Comment guifg=#99968b gui=italic
-hi Todo guifg=#8f8f8f gui=italic
-hi Constant guifg=#e5786d gui=none
-hi String guifg=#95e454 gui=italic
-hi Identifier guifg=#cae682 gui=none
-hi Function guifg=#cae682 gui=none
-hi Type guifg=#cae682 gui=none
-hi Statement guifg=#8ac6f2 gui=none
-hi Keyword guifg=#8ac6f2 gui=none
-hi PreProc guifg=#e5786d gui=none
-hi Number guifg=#e5786d gui=none
-hi Special guifg=#e7f6da gui=none
-
-
diff --git a/vim/zenburn.vim b/vim/zenburn.vim
deleted file mode 100644
index d86ce44..0000000
--- a/vim/zenburn.vim
+++ /dev/null
@@ -1,330 +0,0 @@
-" Vim color file
-" Maintainer: Jani Nurminen <slinky@iki.fi>
-" Last Change: $Id: zenburn.vim,v 2.8 2009/09/07 20:06:44 slinky Exp $
-" URL: http://slinky.imukuppi.org/zenburnpage/
-" License: 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. Then :colorscheme zenburn.
-" See also :help syntax
-"
-" Credits:
-" - Jani Nurminen - original Zenburn
-" - 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
-"
-" 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 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
-"
-" * 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
-"
-" NOTE:
-"
-" * To turn the parameter(s) back to defaults, use UNLET:
-"
-" unlet g:zenburn_alternate_Include
-"
-" Setting to 0 won't work!
-"
-" That's it, enjoy!
-"
-" TODO
-" - Visual alternate color is broken? Try GVim >= 7.0.66 if you have trouble
-" - IME colouring (CursorIM)
-
-set background=dark
-hi clear
-if exists("syntax_on")
- syntax reset
-endif
-let g:colors_name="zenburn"
-
-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=#dcdccc 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 LineNr guifg=#9fafaf guibg=#262626
-hi Macro guifg=#ffcfaf gui=bold
-hi ModeMsg guifg=#ffcfaf gui=none
-hi MoreMsg guifg=#ffffff gui=bold
-hi NonText guifg=#404040
-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=188 cterm=bold
- hi ErrorMsg ctermfg=115 ctermbg=236 cterm=bold
- hi Exception ctermfg=249 cterm=bold
- hi Float ctermfg=251
- hi FoldColumn ctermfg=109 ctermbg=238
- hi Folded ctermfg=109 ctermbg=238
- 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=235
- hi Macro ctermfg=223 cterm=bold
- hi ModeMsg ctermfg=223 cterm=none
- hi MoreMsg ctermfg=15 cterm=bold
- hi NonText ctermfg=238
- 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
- hi CursorLine ctermbg=236 cterm=none
-
- " 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")
- hi Normal ctermfg=188 ctermbg=234
-
- if exists("g:zenburn_color_also_Ignore")
- hi Ignore ctermfg=238
- 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 foldcolumn ctermbg=238
- hi folded ctermbg=238
- hi incsearch ctermbg=228
- hi linenr ctermbg=238
- 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
-
- if exists("g:zenburn_color_also_Ignore")
- hi Ignore ctermfg=240
- endif
- endif
-endif
-
-if exists("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")
- " use new darker background
- hi Normal guifg=#dcdccc guibg=#1f1f1f
- hi CursorLine guibg=#121212 gui=bold
- 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 CursorColumn guifg=#dcdccc guibg=#2b2b2b
-else
- " Original, lighter background
- hi Normal guifg=#dcdccc guibg=#3f3f3f
- hi CursorLine guibg=#434443
- 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 CursorColumn guifg=#dcdccc guibg=#4f4f4f
-endif
-
-
-if exists("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
-
-if exists("g:zenburn_alternate_Error")
- " use a bit different Error
- hi Error guifg=#ef9f9f guibg=#201010 gui=bold
-else
- " default
- hi Error guifg=#e37170 guibg=#332323 gui=none
-endif
-
-if exists("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")
- " color the Ignore groups
- " note: if you get strange coloring for your files, turn this off (unlet)
- hi Ignore guifg=#545a4f
-endif
-
-" TODO check for more obscure syntax groups that they're ok