summaryrefslogtreecommitdiffstats
path: root/vim
diff options
context:
space:
mode:
authorStefan Ritter <xeno@thehappy.de>2011-03-24 14:41:43 +0100
committerStefan Ritter <xeno@thehappy.de>2011-03-24 14:41:43 +0100
commit9bd1062ac410f3ce2007e995b8ea09a8a381ae49 (patch)
treef9b42f2f09d389009b61c6ed7f026a37564e6bba /vim
parent5fe650b0c8eb3f8495b554b4b885042810e756a3 (diff)
Some vim cleanup
Diffstat (limited to 'vim')
-rw-r--r--vim/Mustang_Vim_Colorscheme_by_hcalves.vim55
-rw-r--r--vim/desert256.vim338
-rw-r--r--vim/vimrc4
-rw-r--r--vim/vitamins.vim (renamed from vim/Vitamins_Vim_Colorscheme_by_hcalves.vim)0
-rw-r--r--vim/wombat.vim51
-rw-r--r--vim/xeno.vim23
6 files changed, 53 insertions, 418 deletions
diff --git a/vim/Mustang_Vim_Colorscheme_by_hcalves.vim b/vim/Mustang_Vim_Colorscheme_by_hcalves.vim
deleted file mode 100644
index 715605a..0000000
--- a/vim/Mustang_Vim_Colorscheme_by_hcalves.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-" 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 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=#303030 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=#384048 guifg=#a0a8b0 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=#343434 gui=none ctermfg=244 ctermbg=236
-
-" Syntax highlighting
-hi Comment guifg=#808080 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
-
diff --git a/vim/desert256.vim b/vim/desert256.vim
deleted file mode 100644
index 7a97742..0000000
--- a/vim/desert256.vim
+++ /dev/null
@@ -1,338 +0,0 @@
-" Vim color file
-" Maintainer: Henry So, Jr. <henryso@panix.com>
-
-" These are the colors of the "desert" theme by Hans Fugal with a few small
-" modifications (namely that I lowered the intensity of the normal white and
-" made the normal and nontext backgrounds black), modified to work with 88-
-" and 256-color xterms.
-"
-" The original "desert" theme is available as part of the vim distribution or
-" at http://hans.fugal.net/vim/colors/.
-"
-" The real feature of this color scheme, with a wink to the "inkpot" theme, is
-" the programmatic approximation of the gui colors to the palettes of 88- and
-" 256- color xterms. The functions that do this (folded away, for
-" readability) are calibrated to the colors used for Thomas E. Dickey's xterm
-" (version 200), which is available at http://dickey.his.com/xterm/xterm.html.
-"
-" I struggled with trying to parse the rgb.txt file to avoid the necessity of
-" converting color names to #rrggbb form, but decided it was just not worth
-" the effort. Maybe someone seeing this may decide otherwise...
-
-set background=dark
-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="desert256"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
- " functions {{{
- " returns an approximate grey index for the given grey level
- fun <SID>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 <SID>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 <SID>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 <SID>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 <SID>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 <SID>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 <SID>color(r, g, b)
- " get the closest grey
- let l:gx = <SID>grey_number(a:r)
- let l:gy = <SID>grey_number(a:g)
- let l:gz = <SID>grey_number(a:b)
-
- " get the closest color
- let l:x = <SID>rgb_number(a:r)
- let l:y = <SID>rgb_number(a:g)
- let l:z = <SID>rgb_number(a:b)
-
- if l:gx == l:gy && l:gy == l:gz
- " there are two possibilities
- let l:dgr = <SID>grey_level(l:gx) - a:r
- let l:dgg = <SID>grey_level(l:gy) - a:g
- let l:dgb = <SID>grey_level(l:gz) - a:b
- let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
- let l:dr = <SID>rgb_level(l:gx) - a:r
- let l:dg = <SID>rgb_level(l:gy) - a:g
- let l:db = <SID>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 <SID>grey_color(l:gx)
- else
- " use the color
- return <SID>rgb_color(l:x, l:y, l:z)
- endif
- else
- " only one possibility
- return <SID>rgb_color(l:x, l:y, l:z)
- endif
- endfun
-
- " returns the palette index to approximate the 'rrggbb' hex string
- fun <SID>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 <SID>color(l:r, l:g, l:b)
- endfun
-
- " sets the highlighting for the given group
- fun <SID>X(group, fg, bg, attr)
- if a:fg != ""
- exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
- endif
- if a:bg != ""
- exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
- endif
- if a:attr != ""
- exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
- endif
- endfun
- " }}}
-
- call <SID>X("Normal", "cccccc", "000000", "")
-
- " highlight groups
- call <SID>X("Cursor", "708090", "f0e68c", "")
- "CursorIM
- "Directory
- "DiffAdd
- "DiffChange
- "DiffDelete
- "DiffText
- "ErrorMsg
- call <SID>X("VertSplit", "c2bfa5", "7f7f7f", "reverse")
- call <SID>X("Folded", "ffd700", "4d4d4d", "")
- call <SID>X("FoldColumn", "d2b48c", "4d4d4d", "")
- call <SID>X("IncSearch", "708090", "f0e68c", "")
- "LineNr
- call <SID>X("ModeMsg", "daa520", "", "")
- call <SID>X("MoreMsg", "2e8b57", "", "")
- call <SID>X("NonText", "addbe7", "000000", "bold")
- call <SID>X("Question", "00ff7f", "", "")
- call <SID>X("Search", "f5deb3", "cd853f", "")
- call <SID>X("SpecialKey", "9acd32", "", "")
- call <SID>X("StatusLine", "c2bfa5", "000000", "reverse")
- call <SID>X("StatusLineNC", "c2bfa5", "7f7f7f", "reverse")
- call <SID>X("Title", "cd5c5c", "", "")
- call <SID>X("Visual", "6b8e23", "f0e68c", "reverse")
- "VisualNOS
- call <SID>X("WarningMsg", "fa8072", "", "")
- "WildMenu
- "Menu
- "Scrollbar
- "Tooltip
-
- " syntax highlighting groups
- call <SID>X("Comment", "87ceeb", "", "")
- call <SID>X("Constant", "ffa0a0", "", "")
- call <SID>X("Identifier", "98fb98", "", "none")
- call <SID>X("Statement", "f0e68c", "", "bold")
- call <SID>X("PreProc", "cd5c5c", "", "")
- call <SID>X("Type", "bdb76b", "", "bold")
- call <SID>X("Special", "ffdead", "", "")
- "Underlined
- call <SID>X("Ignore", "666666", "", "")
- "Error
- call <SID>X("Todo", "ff4500", "eeee00", "")
-
- " delete functions {{{
- delf <SID>X
- delf <SID>rgb
- delf <SID>color
- delf <SID>rgb_color
- delf <SID>rgb_level
- delf <SID>rgb_number
- delf <SID>grey_color
- delf <SID>grey_level
- delf <SID>grey_number
- " }}}
-else
- " color terminal definitions
- hi SpecialKey ctermfg=darkgreen
- hi NonText cterm=bold ctermfg=darkblue
- hi Directory ctermfg=darkcyan
- hi ErrorMsg cterm=bold ctermfg=7 ctermbg=1
- hi IncSearch cterm=NONE ctermfg=yellow ctermbg=green
- hi Search cterm=NONE ctermfg=grey ctermbg=blue
- hi MoreMsg ctermfg=darkgreen
- hi ModeMsg cterm=NONE ctermfg=brown
- hi LineNr ctermfg=3
- hi Question ctermfg=green
- hi StatusLine cterm=bold,reverse
- hi StatusLineNC cterm=reverse
- hi VertSplit cterm=reverse
- hi Title ctermfg=5
- hi Visual cterm=reverse
- hi VisualNOS cterm=bold,underline
- hi WarningMsg ctermfg=1
- hi WildMenu ctermfg=0 ctermbg=3
- hi Folded ctermfg=darkgrey ctermbg=NONE
- hi FoldColumn ctermfg=darkgrey ctermbg=NONE
- hi DiffAdd ctermbg=4
- hi DiffChange ctermbg=5
- hi DiffDelete cterm=bold ctermfg=4 ctermbg=6
- hi DiffText cterm=bold ctermbg=1
- hi Comment ctermfg=darkcyan
- hi Constant ctermfg=brown
- hi Special ctermfg=5
- hi Identifier ctermfg=6
- hi Statement ctermfg=3
- hi PreProc ctermfg=5
- hi Type ctermfg=2
- hi Underlined cterm=underline ctermfg=5
- hi Ignore ctermfg=darkgrey
- hi Error cterm=bold ctermfg=7 ctermbg=1
-endif
-
-" vim: set fdl=0 fdm=marker:
diff --git a/vim/vimrc b/vim/vimrc
index 5ab6dea..f87dc73 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,8 +1,8 @@
syntax on
-colorscheme Vitamins_Vim_Colorscheme_by_hcalves
filetype plugin indent on
+set t_Co=256
+colorscheme vitamins
-set t_Co=88
set ls=0
set number
set noerrorbells
diff --git a/vim/Vitamins_Vim_Colorscheme_by_hcalves.vim b/vim/vitamins.vim
index 3bfe068..3bfe068 100644
--- a/vim/Vitamins_Vim_Colorscheme_by_hcalves.vim
+++ b/vim/vitamins.vim
diff --git a/vim/wombat.vim b/vim/wombat.vim
new file mode 100644
index 0000000..9ad1e56
--- /dev/null
+++ b/vim/wombat.vim
@@ -0,0 +1,51 @@
+" 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/xeno.vim b/vim/xeno.vim
deleted file mode 100644
index 9f69d03..0000000
--- a/vim/xeno.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-" Vim color file
-" Maintainer: Stefan Ritter <xeno@thehappy.de>
-" Last Change: 2009 Jul 29
-
-set background=dark
-hi clear
-if exists("syntax_on")
- syntax reset
-endif
-let g:colors_name = "xeno"
-
-hi Normal ctermfg=white ctermbg=black
-hi comment ctermfg=grey ctermbg=black
-hi LineNr ctermfg=darkred ctermbg=black
-hi constant ctermfg=red ctermbg=black
-hi statement ctermfg=white ctermbg=black
-hi identifier ctermfg=grey ctermbg=black
-hi preproc ctermfg=grey ctermbg=black
-hi type ctermfg=grey ctermbg=black
-hi special ctermfg=grey ctermbg=black
-hi operator ctermfg=red ctermbg=black
-hi label ctermfg=red ctermbg=black
-hi Todo ctermfg=black ctermbg=red