Permalink
Browse files

.vimrc: Explicitly use the Molokai theme

  • Loading branch information...
1 parent 4a7f8a5 commit 79e87d60349c6040b42cfe22d9a7d023314d98b4 @mathiasbynens committed Feb 22, 2014
Showing with 95 additions and 29 deletions.
  1. +92 −29 .vim/colors/molokai.vim
  2. +3 −0 .vimrc
@@ -1,8 +1,9 @@
" Vim color file
"
" Author: Tomas Restrepo <tomas@winterdom.com>
+" https://github.com/tomasr/molokai
"
-" Note: Based on the monokai theme for TextMate
+" Note: Based on the Monokai theme for TextMate
" by Wimer Hazenberg and its darker variant
" by Hamish Stuart Macpherson
"
@@ -11,28 +12,30 @@ hi clear
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
+ " 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="molokai"
if exists("g:molokai_original")
- let s:molokai_original = g:molokai_original
+ let s:molokai_original = g:molokai_original
else
- let s:molokai_original = 0
+ let s:molokai_original = 0
endif
+
hi Boolean guifg=#AE81FF
hi Character guifg=#E6DB74
hi Number guifg=#AE81FF
hi String guifg=#E6DB74
hi Conditional guifg=#F92672 gui=bold
hi Constant guifg=#AE81FF gui=bold
hi Cursor guifg=#000000 guibg=#F8F8F0
+hi iCursor guifg=#000000 guibg=#F8F8F0
hi Debug guifg=#BCA3A3 gui=bold
hi Define guifg=#66D9EF
hi Delimiter guifg=#8F8F8F
@@ -42,7 +45,7 @@ hi DiffDelete guifg=#960050 guibg=#1E0010
hi DiffText guibg=#4C4745 gui=italic,bold
hi Directory guifg=#A6E22E gui=bold
-hi Error guifg=#960050 guibg=#1E0010
+hi Error guifg=#E6DB74 guibg=#1E0010
hi ErrorMsg guifg=#F92672 guibg=#232526 gui=bold
hi Exception guifg=#A6E22E gui=bold
hi Float guifg=#AE81FF
@@ -74,12 +77,11 @@ hi PreProc guifg=#A6E22E
hi Question guifg=#66D9EF
hi Repeat guifg=#F92672 gui=bold
hi Search guifg=#FFFFFF guibg=#455354
-" marks column
+" marks
hi SignColumn guifg=#A6E22E guibg=#232526
hi SpecialChar guifg=#F92672 gui=bold
-hi SpecialComment guifg=#465457 gui=bold
+hi SpecialComment guifg=#7E8E91 gui=bold
hi Special guifg=#66D9EF guibg=bg gui=italic
-hi SpecialKey guifg=#888A85 gui=italic
if has("spell")
hi SpellBad guisp=#FF0000 gui=undercurl
hi SpellCap guisp=#7070F0 gui=undercurl
@@ -105,26 +107,44 @@ hi Visual guibg=#403D3D
hi WarningMsg guifg=#FFFFFF guibg=#333333 gui=bold
hi WildMenu guifg=#66D9EF guibg=#000000
+hi TabLineFill guifg=#1B1D1E guibg=#1B1D1E
+hi TabLine guibg=#1B1D1E guifg=#808080 gui=none
+
if s:molokai_original == 1
hi Normal guifg=#F8F8F2 guibg=#272822
hi Comment guifg=#75715E
hi CursorLine guibg=#3E3D32
+ hi CursorLineNr guifg=#FD971F gui=none
hi CursorColumn guibg=#3E3D32
+ hi ColorColumn guibg=#3B3A32
hi LineNr guifg=#BCBCBC guibg=#3B3A32
- hi NonText guifg=#BCBCBC guibg=#3B3A32
+ hi NonText guifg=#75715E
+ hi SpecialKey guifg=#75715E
else
hi Normal guifg=#F8F8F2 guibg=#1B1D1E
- hi Comment guifg=#465457
+ hi Comment guifg=#7E8E91
hi CursorLine guibg=#293739
+ hi CursorLineNr guifg=#FD971F gui=none
hi CursorColumn guibg=#293739
- hi LineNr guifg=#BCBCBC guibg=#232526
- hi NonText guifg=#BCBCBC guibg=#232526
+ hi ColorColumn guibg=#232526
+ hi LineNr guifg=#465457 guibg=#232526
+ hi NonText guifg=#465457
+ hi SpecialKey guifg=#465457
end
"
" Support for 256-color terminal
"
if &t_Co > 255
+ if s:molokai_original == 1
+ hi Normal ctermbg=234
+ hi CursorLine ctermbg=235 cterm=none
+ hi CursorLineNr ctermfg=208 cterm=none
+ else
+ hi Normal ctermfg=252 ctermbg=233
+ hi CursorLine ctermbg=234 cterm=none
+ hi CursorLineNr ctermfg=208 cterm=none
+ endif
hi Boolean ctermfg=135
hi Character ctermfg=144
hi Number ctermfg=135
@@ -149,23 +169,23 @@ if &t_Co > 255
hi FoldColumn ctermfg=67 ctermbg=16
hi Folded ctermfg=67 ctermbg=16
hi Function ctermfg=118
- hi Identifier ctermfg=208
+ hi Identifier ctermfg=208 cterm=none
hi Ignore ctermfg=244 ctermbg=232
hi IncSearch ctermfg=193 ctermbg=16
- hi Keyword ctermfg=161 cterm=bold
+ hi keyword ctermfg=161 cterm=bold
hi Label ctermfg=229 cterm=none
hi Macro ctermfg=193
hi SpecialKey ctermfg=81
- hi MatchParen ctermfg=16 ctermbg=208 cterm=bold
+ hi MatchParen ctermfg=208 ctermbg=233 cterm=bold
hi ModeMsg ctermfg=229
hi MoreMsg ctermfg=229
hi Operator ctermfg=161
" complete menu
hi Pmenu ctermfg=81 ctermbg=16
- hi PmenuSel ctermbg=244
+ hi PmenuSel ctermfg=81 ctermbg=244
hi PmenuSbar ctermbg=232
hi PmenuThumb ctermfg=81
@@ -179,9 +199,13 @@ if &t_Co > 255
hi SignColumn ctermfg=118 ctermbg=235
hi SpecialChar ctermfg=161 cterm=bold
hi SpecialComment ctermfg=245 cterm=bold
- hi Special ctermfg=81 ctermbg=232
- hi SpecialKey ctermfg=245
-
+ hi Special ctermfg=81
+ if has("spell")
+ hi SpellBad ctermbg=52
+ hi SpellCap ctermbg=17
+ hi SpellLocal ctermbg=17
+ hi SpellRare ctermfg=none ctermbg=none cterm=reverse
+ endif
hi Statement ctermfg=161 cterm=bold
hi StatusLine ctermfg=238 ctermbg=253
hi StatusLineNC ctermfg=244 ctermbg=232
@@ -201,10 +225,49 @@ if &t_Co > 255
hi WarningMsg ctermfg=231 ctermbg=238 cterm=bold
hi WildMenu ctermfg=81 ctermbg=16
- hi Normal ctermfg=252 ctermbg=233
hi Comment ctermfg=59
- hi CursorLine ctermbg=234 cterm=none
- hi CursorColumn ctermbg=234
- hi LineNr ctermfg=250 ctermbg=234
- hi NonText ctermfg=250 ctermbg=234
+ hi CursorColumn ctermbg=236
+ hi ColorColumn ctermbg=236
+ hi LineNr ctermfg=250 ctermbg=236
+ hi NonText ctermfg=59
+
+ hi SpecialKey ctermfg=59
+
+ if exists("g:rehash256") && g:rehash256 == 1
+ hi Normal ctermfg=252 ctermbg=234
+ hi CursorLine ctermbg=236 cterm=none
+ hi CursorLineNr ctermfg=208 cterm=none
+
+ hi Boolean ctermfg=141
+ hi Character ctermfg=222
+ hi Number ctermfg=141
+ hi String ctermfg=222
+ hi Conditional ctermfg=197 cterm=bold
+ hi Constant ctermfg=141 cterm=bold
+
+ hi DiffDelete ctermfg=125 ctermbg=233
+
+ hi Directory ctermfg=154 cterm=bold
+ hi Error ctermfg=222 ctermbg=233
+ hi Exception ctermfg=154 cterm=bold
+ hi Float ctermfg=141
+ hi Function ctermfg=154
+ hi Identifier ctermfg=208
+
+ hi Keyword ctermfg=197 cterm=bold
+ hi Operator ctermfg=197
+ hi PreCondit ctermfg=154 cterm=bold
+ hi PreProc ctermfg=154
+ hi Repeat ctermfg=197 cterm=bold
+
+ hi Statement ctermfg=197 cterm=bold
+ hi Tag ctermfg=197
+ hi Title ctermfg=203
+ hi Visual ctermbg=238
+
+ hi Comment ctermfg=244
+ hi LineNr ctermfg=239 ctermbg=235
+ hi NonText ctermfg=239
+ hi SpecialKey ctermfg=239
+ endif
end
View
@@ -1,3 +1,6 @@
+" Use the Molokai theme (originally created for TextMate by Wimer Hazenberg)
+colorscheme molokai
+
" Make Vim more useful
set nocompatible
" Use the OS clipboard by default (on versions compiled with `+clipboard`)

0 comments on commit 79e87d6

Please sign in to comment.