Skip to content

Commit e541dcb

Browse files
committed
Merge branch 'pade'
2 parents cced057 + 3ee444f commit e541dcb

3 files changed

Lines changed: 110 additions & 6 deletions

File tree

‎_vim/colors/wombat-custom.vim‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
" Maintainer: Lars H. Nielsen (dengmao@gmail.com)
2+
" Last Change: January 22 2007
3+
4+
set background=dark
5+
6+
hi clear
7+
8+
if exists("syntax_on")
9+
syntax reset
10+
endif
11+
12+
let colors_name = "wombat"
13+
14+
15+
" Vim >= 7.0 specific colors
16+
if version >= 700
17+
hi CursorLine guibg=#2d2d2d
18+
hi CursorColumn guibg=#2d2d2d
19+
hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold
20+
hi Pmenu guifg=#f6f3e8 guibg=#444444
21+
hi PmenuSel guifg=#000000 guibg=#cae682
22+
endif
23+
24+
" General colors
25+
hi Cursor guifg=NONE guibg=#656565 gui=none
26+
"hi Normal guifg=#f6f3e8 guibg=#242424 gui=none
27+
hi Normal guifg=#f6f3e8 guibg=#000000 gui=none
28+
"hi NonText guifg=#808080 guibg=#303030 gui=none
29+
hi NonText guifg=#1e0079 guibg=#000000 gui=none
30+
hi LineNr guifg=#857b6f guibg=#000000 gui=none
31+
hi StatusLine guifg=#f6f3e8 guibg=#444444 gui=italic
32+
hi StatusLineNC guifg=#857b6f guibg=#444444 gui=none
33+
hi VertSplit guifg=#444444 guibg=#444444 gui=none
34+
hi Folded guibg=#384048 guifg=#a0a8b0 gui=none
35+
hi Title guifg=#f6f3e8 guibg=NONE gui=bold
36+
hi Visual guifg=#f6f3e8 guibg=#444444 gui=none
37+
"hi SpecialKey guifg=#808080 guibg=#343434 gui=none
38+
hi SpecialKey guifg=#1e0079 guibg=#000000 gui=none
39+
40+
" Syntax highlighting
41+
hi Comment guifg=#99968b gui=italic
42+
hi Todo guifg=#8f8f8f gui=italic
43+
hi Constant guifg=#e5786d gui=none
44+
hi String guifg=#95e454 gui=italic
45+
hi Identifier guifg=#cae682 gui=none
46+
hi Function guifg=#cae682 gui=none
47+
hi Type guifg=#cae682 gui=none
48+
hi Statement guifg=#8ac6f2 gui=none
49+
hi Keyword guifg=#8ac6f2 gui=none
50+
hi PreProc guifg=#e5786d gui=none
51+
hi Number guifg=#e5786d gui=none
52+
hi Special guifg=#e7f6da gui=none
53+
54+

‎_vim/colors/wombat.vim‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
" Maintainer: Lars H. Nielsen (dengmao@gmail.com)
2+
" Last Change: January 22 2007
3+
4+
set background=dark
5+
6+
hi clear
7+
8+
if exists("syntax_on")
9+
syntax reset
10+
endif
11+
12+
let colors_name = "wombat"
13+
14+
15+
" Vim >= 7.0 specific colors
16+
if version >= 700
17+
hi CursorLine guibg=#2d2d2d
18+
hi CursorColumn guibg=#2d2d2d
19+
hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold
20+
hi Pmenu guifg=#f6f3e8 guibg=#444444
21+
hi PmenuSel guifg=#000000 guibg=#cae682
22+
endif
23+
24+
" General colors
25+
hi Cursor guifg=NONE guibg=#656565 gui=none
26+
hi Normal guifg=#f6f3e8 guibg=#242424 gui=none
27+
hi NonText guifg=#808080 guibg=#303030 gui=none
28+
hi LineNr guifg=#857b6f guibg=#000000 gui=none
29+
hi StatusLine guifg=#f6f3e8 guibg=#444444 gui=italic
30+
hi StatusLineNC guifg=#857b6f guibg=#444444 gui=none
31+
hi VertSplit guifg=#444444 guibg=#444444 gui=none
32+
hi Folded guibg=#384048 guifg=#a0a8b0 gui=none
33+
hi Title guifg=#f6f3e8 guibg=NONE gui=bold
34+
hi Visual guifg=#f6f3e8 guibg=#444444 gui=none
35+
hi SpecialKey guifg=#808080 guibg=#343434 gui=none
36+
37+
" Syntax highlighting
38+
hi Comment guifg=#99968b gui=italic
39+
hi Todo guifg=#8f8f8f gui=italic
40+
hi Constant guifg=#e5786d gui=none
41+
hi String guifg=#95e454 gui=italic
42+
hi Identifier guifg=#cae682 gui=none
43+
hi Function guifg=#cae682 gui=none
44+
hi Type guifg=#cae682 gui=none
45+
hi Statement guifg=#8ac6f2 gui=none
46+
hi Keyword guifg=#8ac6f2 gui=none
47+
hi PreProc guifg=#e5786d gui=none
48+
hi Number guifg=#e5786d gui=none
49+
hi Special guifg=#e7f6da gui=none
50+
51+

‎_vim/vimrc‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,11 @@ set incsearch " Incrementally search while typing a /regex
236236

237237
"""" Display
238238
if has("gui_running")
239-
colorscheme darkblue
240-
hi CursorLine term=underline cterm=underline ctermfg=9 gui=underline guifg=NONE guibg=NONE
241-
hi SpecialKey term=bold ctermfg=1 guifg=#0030ff
239+
"colorscheme darkblue
240+
"hi CursorLine term=underline cterm=underline ctermfg=9 gui=underline guifg=NONE guibg=NONE
241+
"hi SpecialKey term=bold ctermfg=1 guifg=#0030ff
242+
colorscheme wombat-custom
243+
set guifont=Inconsolata\ 10
242244
else
243245
colorscheme default
244246
endif
@@ -247,9 +249,6 @@ endif
247249
" Paste from clipboard
248250
map <leader>p "+p
249251
250-
" Quit window on <leader>q
251-
nnoremap <leader>q :q<CR>
252-
253252
" hide matches on <leader>space
254253
nnoremap <leader><space> :nohlsearch<cr>
255254

0 commit comments

Comments
 (0)