Browse Source

Add and apply Zenburn color scheme in URxvt and vim

Alois Mahdal 10 years ago
parent
commit
81bd58b1e4
3 changed files with 623 additions and 50 deletions
  1. 61
    49
      dotfiles/Xdefaults
  2. 561
    0
      dotfiles/vim/colors/zenburn.vim
  3. 1
    1
      dotfiles/vim/vimrc

+ 61
- 49
dotfiles/Xdefaults View File

@@ -1,35 +1,20 @@
1
-! window properties
2
-URxvt.geometry:             90x30
3
-URxvt.preeditType:          OvertheSpot
4
-URxvt.borderLess:           false
5
-URxvt.buffered:             true
6 1
 
7
-! colors
8
-URxvt.reverseVideo: false
9
-URxvt.background:   black
10
-URxvt.foreground:   #DDDDDD
11
-URxvt.colorBD:  yellow
12
-URxvt.colorUL:  white
13
-URxvt.color0:   #000000
14
-URxvt.color1:   #EE0000
15
-URxvt.color2:   #4E9A06
16
-URxvt.color3:   #C4A000
17
-URxvt.color4:   #3465A4
18
-URxvt.color5:   #75507B
19
-URxvt.color6:   #34E2E2
20
-URxvt.color7:   #D3D7CF
21
-URxvt.color8:   #555753
22
-URxvt.color9:   #EF4B4B
23
-URxvt.color10:  #8AE234
24
-URxvt.color11:  #FCE94F
25
-URxvt.color12:  #729FCF
26
-URxvt.color13:  #AD7FA8
27
-URxvt.color14:  #34E2E2
28
-URxvt.color15:  #EEEEEC
29
-URxvt.cursorColor: #888888
30
-URxvt.cursorColor2: #FFFFFF
2
+!## ==== ##
3
+!## main ##
4
+!## ==== ##
31 5
 
32
-! transparency
6
+
7
+URxvt.geometry:             90x24
8
+
9
+!## extensions
10
+URxvt.perl-ext-common:      default,tabbed,selection
11
+URxvt.tabbed.tab-fg:        7
12
+URxvt.tabbed.tab-bg:        0
13
+URxvt.tabbed.tabbar-fg:     4
14
+URxvt.urlLauncher:          www-browser
15
+URxvt.matcher.button:       1
16
+
17
+!## transparency
33 18
 URxvt.inheritPixmap:        true
34 19
 URxvt.tintCddolor:          red
35 20
 URxvt.shading:              25
@@ -40,7 +25,7 @@ URxvt.mouseWheelScrollPage: false
40 25
 URxvt.tripleclickwords:     true
41 26
 URxvt.hold:                 false
42 27
 
43
-! scroll set
28
+!## scroll set
44 29
 URxvt.scrollBar:            true
45 30
 URxvt.scrollBar_right:      true
46 31
 URxvt.scrollBar_floating:   true
@@ -48,25 +33,52 @@ URxvt.scrollstyle:          plain
48 33
 URxvt.scrollWithBuffer:     true
49 34
 URxvt.saveLines:            32767
50 35
 
51
-! font
52
-URxvt.font:     xft:Dejavu Sans Mono:pixelsize=11:antialias=false,xft:WenQuanYi Bitmap Song:pixelsize=11:antialias=false
53
-URxvt.boldFont: xft:Dejavu Sans Mono:pixelsize=11:style=Bold:antialias=false,xft:WenQuanYi Bitmap Song:pixelsize=11:style=Bold:antialias=false
54
-
55
-! Input Method
56
-URxvt.inputMethod:          fcitx
57
-URxvt.imFont:               WenQuanYi Bitmap Song
58
-URxvt.imLocale:             zh_CN.UTF-8
59
-URxvt.override-redirect:    false
60
-
36
+!## font
37
+URxvt.font:     xft:Dejavu Sans Mono:pixelsize=13
38
+URxvt.boldFont: xft:Dejavu Sans Mono:pixelsize=13:style=Bold
61 39
 URxvt.cursorUnderline:      false
62 40
 URxvt.cursorBlink:          true
63
-URxvt.pointerBlank:         false
64 41
 URxvt.pointerBlankDelay:    999999999
65 42
 
66
-! extensions
67
-URxvt.perl-ext-common:      default,tabbed,selection
68
-URxvt.tabbed.tab-fg:        10
69
-URxvt.tabbed.tab-bg:        0
70
-URxvt.tabbed.tabbar-fg:     4
71
-URxvt.urlLauncher:          www-browser
72
-URxvt.matcher.button:       1
43
+
44
+!## ======= ====== ##
45
+!## zenburn colors ##
46
+!## ======= ====== ##
47
+
48
+URxvt.foreground:       #dcdccc
49
+URxvt.background:       #3f3f3f
50
+URxvt.colorUL:          #c5f779
51
+URxvt.underlineColor:   #c5f779
52
+URxvt.color0:           #3f3f3f
53
+URxvt.color1:           #705050
54
+URxvt.color2:           #60b48a
55
+URxvt.color3:           #dfaf8f
56
+URxvt.color4:           #506070
57
+URxvt.color5:           #dc8cc3
58
+URxvt.color6:           #8cd0d3
59
+URxvt.color7:           #DCDCCC
60
+URxvt.color8:           #709080
61
+URxvt.color9:           #cc9393
62
+URxvt.color10:          #7f9f7f
63
+URxvt.color11:          #f0dfaf
64
+URxvt.color12:          #94bff3
65
+URxvt.color13:          #ec93d3
66
+URxvt.color14:          #93e0e3
67
+URxvt.color15:          #ffffff
68
+
69
+xterm.color0:           #353535
70
+xterm.color8:           #666666
71
+xterm.color1:           #AE4747
72
+xterm.color9:           #EE6363
73
+xterm.color2:           #556B2F
74
+xterm.color10:          #9ACD32
75
+xterm.color3:           #DAA520
76
+xterm.color11:          #FFC125
77
+xterm.color4:           #6F99B4
78
+xterm.color12:          #7C96B0
79
+xterm.color5:           #8B7B8B
80
+xterm.color13:          #D8BFD8
81
+xterm.color6:           #A7A15E
82
+xterm.color14:          #F0E68C
83
+xterm.color7:           #DDDDDD
84
+xterm.color15:          #FFFFFF

+ 561
- 0
dotfiles/vim/colors/zenburn.vim View File

@@ -0,0 +1,561 @@
1
+" Vim color file
2
+" Maintainer:   Jani Nurminen <slinky@iki.fi>
3
+" Last Change:  $Id: zenburn.vim,v 2.21 2011/04/26 12:13:41 slinky Exp slinky $
4
+" URL:          http://slinky.imukuppi.org/zenburnpage/
5
+" License:      GNU GPL <http://www.gnu.org/licenses/gpl.html>
6
+"
7
+" Nothing too fancy, just some alien fruit salad to keep you in the zone.
8
+" This syntax file was designed to be used with dark environments and
9
+" low light situations. Of course, if it works during a daybright office, go
10
+" ahead :)
11
+"
12
+" Owes heavily to other Vim color files! With special mentions
13
+" to "BlackDust", "Camo" and "Desert".
14
+"
15
+" To install, copy to ~/.vim/colors directory.
16
+"
17
+" Alternatively, you can use Vimball installation:
18
+"     vim zenburn.vba
19
+"     :so %
20
+"     :q
21
+"
22
+" For details, see :help vimball
23
+"
24
+" After installation, use it with :colorscheme zenburn.
25
+" See also :help syntax
26
+"
27
+" Credits:
28
+"  - Jani Nurminen - original Zenburn, maintainer
29
+"  - Steve Hall & Cream posse - higher-contrast Visual selection
30
+"  - Kurt Maier - 256 color console coloring, low and high contrast toggle,
31
+"                 bug fixing
32
+"  - Charlie - spotted too bright StatusLine in non-high contrast mode
33
+"  - Pablo Castellazzi - CursorLine fix for 256 color mode
34
+"  - Tim Smith - force dark background
35
+"  - John Gabriele - spotted bad Ignore-group handling
36
+"  - Zac Thompson - spotted invisible NonText in low contrast mode
37
+"  - Christophe-Marie Duquesne - suggested making a Vimball,
38
+"    suggested support for ctags_highlighting.vim
39
+"  - Andrew Wagner - noted the CursorColumn bug (guifg was unintentionally set),
40
+"                    unify CursorColumn colour
41
+"  - Martin Langasek - clarify the license, whitespace fixes
42
+"  - Marcin Szamotulski - support autocomplete for Zenburn configuration
43
+"                         parameters
44
+"  - Clayton Parker (claytron) - Convinced by Kurt Maier to use Zenburn. Point
45
+"    out issues with LineNr, fix directory styles, and their usage in MacVim.
46
+"  - Paweł Piekarski - Spotted bad FoldColumn and TabLine. Made better 
47
+"                      FoldColumn colors, fixed TabLine colors.
48
+"
49
+" CONFIGURABLE PARAMETERS:
50
+"
51
+" You can use the default (don't set any parameters), or you can
52
+" set some parameters to tweak the Zenburn colours.
53
+"
54
+" To use them, put them into your .vimrc file before loading the color scheme,
55
+" example:
56
+"    let g:zenburn_high_Contrast=1
57
+"    colors zenburn
58
+"
59
+" You can also do ":let g:zenburn" then hit Ctrl-d or Tab to scroll through the
60
+" list of configurable parameters.
61
+"
62
+" * You can now set a darker background for bright environments. To activate, use:
63
+"   contrast Zenburn, use:
64
+"
65
+"      let g:zenburn_high_Contrast = 1
66
+"
67
+" * For example, Vim help files uses the Ignore-group for the pipes in tags
68
+"   like "|somelink.txt|". By default, the pipes are not visible, as they
69
+"   map to Ignore group. If you wish to enable coloring of the Ignore group,
70
+"   set the following parameter to 1. Warning, it might make some syntax files
71
+"   look strange.
72
+"
73
+"      let g:zenburn_color_also_Ignore = 1
74
+"
75
+" * To get more contrast to the Visual selection, use
76
+"
77
+"      let g:zenburn_alternate_Visual = 1
78
+"
79
+"   Note: this is enabled only if the old-style Visual
80
+"   if used, see g:zenburn_old_Visual
81
+"
82
+" * To use alternate colouring for Error message, use
83
+"
84
+"      let g:zenburn_alternate_Error = 1
85
+"
86
+" * The new default for Include is a duller orange. To use the original
87
+"   colouring for Include, use
88
+"
89
+"      let g:zenburn_alternate_Include = 1
90
+"
91
+" * Work-around to a Vim bug, it seems to misinterpret ctermfg and 234 and 237
92
+"   as light values, and sets background to light for some people. If you have
93
+"   this problem, use:
94
+"
95
+"      let g:zenburn_force_dark_Background = 1
96
+"
97
+" * By default the CursorColumn is of a lighter colour. I find it more readable
98
+"   that way, but some people may want to align it with the darker CursorLine
99
+"   color, for visual uniformity. To do so, use:
100
+"
101
+"      let g:zenburn_unified_CursorColumn = 1
102
+"
103
+"   Note: you can ignore this unless you use
104
+"   ":set cursorline cursorcolumn", since otherwise the effect won't be
105
+"   seen.
106
+"
107
+" * New (dark) Visual coloring has been introduced.
108
+"   The dark Visual is more aligned with the rest of the colour scheme,
109
+"   especially if you use line numbers. If you wish to use the 
110
+"   old Visual coloring, use
111
+"
112
+"      let g:zenburn_old_Visual = 1
113
+"
114
+"   Default is to use the new Visual.
115
+"
116
+"  * EXPERIMENTAL FEATURE: Zenburn will automatically detect if you 
117
+"    have ctags_highlighting.vim (by Al Budden, 
118
+"    http://www.vim.org/scripts/script.php?script_id=2646) enabled, and
119
+"    will set sensible highlight links. Nothing will happen if you do
120
+"    not have ctags_highlighting.vim. If you do not want this feature, you can
121
+"    override the check with:
122
+"
123
+"    let g:zenburn_disable_ctags_highlighting_support = 1
124
+"
125
+" NOTE:
126
+"
127
+" * To turn the parameter(s) back to defaults, use UNLET or set them to 0:
128
+"
129
+"      unlet g:zenburn_alternate_Include
130
+"   or 
131
+"      let g:zenburn_alternate_Include = 0
132
+"
133
+"
134
+" That's it, enjoy!
135
+"
136
+" TODO
137
+"   - Visual alternate color is broken? Try GVim >= 7.0.66 if you have trouble
138
+"   - IME colouring (CursorIM)
139
+
140
+" Set defaults, but keep any parameters already set by the user
141
+if ! exists("g:zenburn_high_Contrast")
142
+    let g:zenburn_high_Contrast = 0
143
+endif
144
+
145
+if ! exists("g:zenburn_color_also_Ignore")
146
+    let g:zenburn_color_also_Ignore = 0
147
+endif
148
+
149
+if ! exists("g:zenburn_alternate_Error")
150
+    let g:zenburn_alternate_Error = 0
151
+endif
152
+
153
+if ! exists("g:zenburn_force_dark_Background")
154
+    let g:zenburn_force_dark_Background = 0
155
+endif
156
+
157
+if ! exists("g:zenburn_alternate_Visual")
158
+    let g:zenburn_alternate_Visual = 0
159
+endif
160
+
161
+if ! exists("g:zenburn_alternate_Include")
162
+    let g:zenburn_alternate_Include = 0
163
+endif
164
+
165
+if ! exists("g:zenburn_unified_CursorColumn")
166
+    let g:zenburn_unified_CursorColumn = 0
167
+endif
168
+
169
+if ! exists("g:zenburn_old_Visual")
170
+    let g:zenburn_old_Visual = 0
171
+endif
172
+
173
+if ! exists("g:zenburn_disable_ctags_highlighting_support")
174
+    " enabled by default
175
+    let g:zenburn_disable_ctags_highlighting_support = 0
176
+endif
177
+
178
+" -----------------------------------------------
179
+
180
+set background=dark
181
+hi clear
182
+if exists("syntax_on")
183
+    syntax reset
184
+endif
185
+let g:colors_name="zenburn"
186
+
187
+" check for ctags-highlighting
188
+if exists("g:loaded_ctags_highlighting") && g:loaded_ctags_highlighting && ! g:zenburn_disable_ctags_highlighting_support
189
+    " internal
190
+    let _zenburn_ctags = 1
191
+endif
192
+
193
+hi Boolean         guifg=#dca3a3
194
+hi Character       guifg=#dca3a3 gui=bold
195
+hi Comment         guifg=#7f9f7f gui=italic
196
+hi Conditional     guifg=#f0dfaf gui=bold
197
+hi Constant        guifg=#dca3a3 gui=bold
198
+hi Cursor          guifg=#000d18 guibg=#8faf9f gui=bold
199
+hi Debug           guifg=#bca3a3 gui=bold
200
+hi Define          guifg=#ffcfaf gui=bold
201
+hi Delimiter       guifg=#8f8f8f
202
+hi DiffAdd         guifg=#709080 guibg=#313c36 gui=bold
203
+hi DiffChange      guibg=#333333
204
+hi DiffDelete      guifg=#333333 guibg=#464646
205
+hi DiffText        guifg=#ecbcbc guibg=#41363c gui=bold
206
+hi Directory       guifg=#9fafaf gui=bold
207
+hi ErrorMsg        guifg=#80d4aa guibg=#2f2f2f gui=bold
208
+hi Exception       guifg=#c3bf9f gui=bold
209
+hi Float           guifg=#c0bed1
210
+hi FoldColumn      guifg=#93b3a3 guibg=#3f4040
211
+hi Folded          guifg=#93b3a3 guibg=#3f4040
212
+hi Function        guifg=#efef8f
213
+hi Identifier      guifg=#efdcbc
214
+hi IncSearch       guibg=#f8f893 guifg=#385f38
215
+hi Keyword         guifg=#f0dfaf gui=bold
216
+hi Label           guifg=#dfcfaf gui=underline
217
+hi Macro           guifg=#ffcfaf gui=bold
218
+hi ModeMsg         guifg=#ffcfaf gui=none
219
+hi MoreMsg         guifg=#ffffff gui=bold
220
+hi Number          guifg=#8cd0d3
221
+hi Operator        guifg=#f0efd0
222
+hi PreCondit       guifg=#dfaf8f gui=bold
223
+hi PreProc         guifg=#ffcfaf gui=bold
224
+hi Question        guifg=#ffffff gui=bold
225
+hi Repeat          guifg=#ffd7a7 gui=bold
226
+hi Search          guifg=#ffffe0 guibg=#284f28
227
+hi SpecialChar     guifg=#dca3a3 gui=bold
228
+hi SpecialComment  guifg=#82a282 gui=bold
229
+hi Special         guifg=#cfbfaf
230
+hi SpecialKey      guifg=#9ece9e
231
+hi Statement       guifg=#e3ceab gui=none
232
+hi StatusLine      guifg=#313633 guibg=#ccdc90
233
+hi StatusLineNC    guifg=#2e3330 guibg=#88b090
234
+hi StorageClass    guifg=#c3bf9f gui=bold
235
+hi String          guifg=#cc9393
236
+hi Structure       guifg=#efefaf gui=bold
237
+hi Tag             guifg=#e89393 gui=bold
238
+hi Title           guifg=#efefef gui=bold
239
+hi Todo            guifg=#dfdfdf guibg=bg gui=bold
240
+hi Typedef         guifg=#dfe4cf gui=bold
241
+hi Type            guifg=#dfdfbf gui=bold
242
+hi Underlined      guifg=#dcdccc gui=underline
243
+hi VertSplit       guifg=#2e3330 guibg=#688060
244
+hi VisualNOS       guifg=#333333 guibg=#f18c96 gui=bold,underline
245
+hi WarningMsg      guifg=#ffffff guibg=#333333 gui=bold
246
+hi WildMenu        guibg=#2c302d guifg=#cbecd0 gui=underline
247
+
248
+hi SpellBad   guisp=#bc6c4c guifg=#dc8c6c
249
+hi SpellCap   guisp=#6c6c9c guifg=#8c8cbc
250
+hi SpellRare  guisp=#bc6c9c guifg=#bc8cbc
251
+hi SpellLocal guisp=#7cac7c guifg=#9ccc9c
252
+
253
+" Entering Kurt zone
254
+if &t_Co > 255
255
+    hi Boolean         ctermfg=181
256
+    hi Character       ctermfg=181   cterm=bold
257
+    hi Comment         ctermfg=108
258
+    hi Conditional     ctermfg=223   cterm=bold
259
+    hi Constant        ctermfg=181   cterm=bold
260
+    hi Cursor          ctermfg=233   ctermbg=109     cterm=bold
261
+    hi Debug           ctermfg=181   cterm=bold
262
+    hi Define          ctermfg=223   cterm=bold
263
+    hi Delimiter       ctermfg=245
264
+    hi DiffAdd         ctermfg=66    ctermbg=237     cterm=bold
265
+    hi DiffChange      ctermbg=236
266
+    hi DiffDelete      ctermfg=236   ctermbg=238
267
+    hi DiffText        ctermfg=217   ctermbg=237     cterm=bold
268
+    hi Directory       ctermfg=109   cterm=bold
269
+    hi ErrorMsg        ctermfg=115   ctermbg=236     cterm=bold
270
+    hi Exception       ctermfg=249   cterm=bold
271
+    hi Float           ctermfg=251
272
+    hi Function        ctermfg=228
273
+    hi Identifier      ctermfg=223
274
+    hi IncSearch       ctermbg=228   ctermfg=238
275
+    hi Keyword         ctermfg=223   cterm=bold
276
+    hi Label           ctermfg=187   cterm=underline
277
+    hi LineNr          ctermfg=248   ctermbg=233
278
+    hi Macro           ctermfg=223   cterm=bold
279
+    hi ModeMsg         ctermfg=223   cterm=none
280
+    hi MoreMsg         ctermfg=15    cterm=bold
281
+    hi Number          ctermfg=116
282
+    hi Operator        ctermfg=230
283
+    hi PreCondit       ctermfg=180   cterm=bold
284
+    hi PreProc         ctermfg=223   cterm=bold
285
+    hi Question        ctermfg=15    cterm=bold
286
+    hi Repeat          ctermfg=223   cterm=bold
287
+    hi Search          ctermfg=230   ctermbg=236
288
+    hi SpecialChar     ctermfg=181   cterm=bold
289
+    hi SpecialComment  ctermfg=108   cterm=bold
290
+    hi Special         ctermfg=181
291
+    hi SpecialKey      ctermfg=151
292
+    hi Statement       ctermfg=187   ctermbg=234     cterm=none
293
+    hi StatusLine      ctermfg=236   ctermbg=186
294
+    hi StatusLineNC    ctermfg=235   ctermbg=108
295
+    hi StorageClass    ctermfg=249   cterm=bold
296
+    hi String          ctermfg=174
297
+    hi Structure       ctermfg=229   cterm=bold
298
+    hi Tag             ctermfg=181   cterm=bold
299
+    hi Title           ctermfg=7     ctermbg=234     cterm=bold
300
+    hi Todo            ctermfg=108   ctermbg=234     cterm=bold
301
+    hi Typedef         ctermfg=253   cterm=bold
302
+    hi Type            ctermfg=187   cterm=bold
303
+    hi Underlined      ctermfg=188   ctermbg=234     cterm=bold
304
+    hi VertSplit       ctermfg=236   ctermbg=65
305
+    hi VisualNOS       ctermfg=236   ctermbg=210     cterm=bold
306
+    hi WarningMsg      ctermfg=15    ctermbg=236     cterm=bold
307
+    hi WildMenu        ctermbg=236   ctermfg=194     cterm=bold
308
+
309
+    " spellchecking, always "bright" background
310
+    hi SpellLocal ctermfg=14  ctermbg=237
311
+    hi SpellBad   ctermfg=9   ctermbg=237
312
+    hi SpellCap   ctermfg=12  ctermbg=237
313
+    hi SpellRare  ctermfg=13  ctermbg=237
314
+
315
+    " pmenu
316
+    hi PMenu      ctermfg=248  ctermbg=0
317
+    hi PMenuSel   ctermfg=223 ctermbg=235
318
+
319
+    if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
320
+        hi Normal ctermfg=188 ctermbg=234
321
+        hi NonText         ctermfg=238
322
+
323
+        if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore
324
+            hi Ignore          ctermfg=238
325
+        endif
326
+
327
+        " hc mode, darker CursorLine, default 236
328
+        hi CursorLine      ctermbg=233   cterm=none
329
+
330
+        if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
331
+            hi CursorColumn      ctermbg=233   cterm=none
332
+        else
333
+            hi CursorColumn      ctermbg=235   cterm=none
334
+        endif
335
+    else
336
+        hi Normal ctermfg=188 ctermbg=237
337
+        hi Cursor          ctermbg=109
338
+        hi diffadd         ctermbg=237
339
+        hi diffdelete      ctermbg=238
340
+        hi difftext        ctermbg=237
341
+        hi errormsg        ctermbg=237
342
+        hi incsearch       ctermbg=228
343
+        hi linenr          ctermbg=235
344
+        hi search          ctermbg=238
345
+        hi statement       ctermbg=237
346
+        hi statusline      ctermbg=144
347
+        hi statuslinenc    ctermbg=108
348
+        hi title           ctermbg=237
349
+        hi todo            ctermbg=237
350
+        hi underlined      ctermbg=237
351
+        hi vertsplit       ctermbg=65
352
+        hi visualnos       ctermbg=210
353
+        hi warningmsg      ctermbg=236
354
+        hi wildmenu        ctermbg=236
355
+        hi NonText         ctermfg=240
356
+
357
+        if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore
358
+            hi Ignore          ctermfg=240
359
+        endif
360
+        
361
+        " normal mode, lighter CursorLine
362
+        hi CursorLine      ctermbg=238   cterm=none
363
+
364
+        if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
365
+            hi CursorColumn      ctermbg=238   cterm=none
366
+        else
367
+            hi CursorColumn      ctermbg=239   cterm=none
368
+        endif
369
+    endif
370
+
371
+    if exists("g:zenburn_alternate_Error") && g:zenburn_alternate_Error
372
+        " use more jumpy Error
373
+        hi Error ctermfg=210 ctermbg=52 gui=bold
374
+    else
375
+        " default is something more zenburn-compatible
376
+        hi Error ctermfg=228 ctermbg=95 gui=bold
377
+    endif
378
+endif
379
+
380
+if exists("g:zenburn_force_dark_Background") && g:zenburn_force_dark_Background
381
+    " Force dark background, because of a bug in VIM:  VIM sets background
382
+    " automatically during "hi Normal ctermfg=X"; it misinterprets the high
383
+    " value (234 or 237 above) as a light color, and wrongly sets background to
384
+    " light.  See ":help highlight" for details.
385
+    set background=dark
386
+endif
387
+
388
+if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
389
+    " use new darker background
390
+    hi Normal          guifg=#dcdccc guibg=#1f1f1f
391
+    hi CursorLine      guibg=#121212 gui=bold
392
+    if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
393
+        hi CursorColumn    guibg=#121212 gui=bold
394
+    else
395
+        hi CursorColumn    guibg=#2b2b2b
396
+    endif
397
+    hi Pmenu           guibg=#242424 guifg=#ccccbc
398
+    hi PMenuSel        guibg=#353a37 guifg=#ccdc90 gui=bold
399
+    hi PmenuSbar       guibg=#2e3330 guifg=#000000
400
+    hi PMenuThumb      guibg=#a0afa0 guifg=#040404
401
+    hi MatchParen      guifg=#f0f0c0 guibg=#383838 gui=bold
402
+    hi SignColumn      guifg=#9fafaf guibg=#181818 gui=bold
403
+    hi TabLineFill     guifg=#cfcfaf guibg=#181818 gui=bold
404
+    hi TabLineSel      guifg=#efefef guibg=#1c1c1b gui=bold
405
+    hi TabLine         guifg=#b6bf98 guibg=#181818 gui=bold
406
+    hi NonText         guifg=#404040 gui=bold
407
+    
408
+    hi LineNr          guifg=#9fafaf guibg=#161616
409
+else
410
+    " Original, lighter background
411
+    hi Normal          guifg=#dcdccc guibg=#3f3f3f
412
+    hi CursorLine      guibg=#434443
413
+    if exists("g:zenburn_unified_CursorColumn") && g:zenburn_unified_CursorColumn
414
+        hi CursorColumn    guibg=#434343
415
+    else
416
+        hi CursorColumn    guibg=#4f4f4f
417
+    endif
418
+    hi Pmenu           guibg=#2c2e2e guifg=#9f9f9f
419
+    hi PMenuSel        guibg=#242424 guifg=#d0d0a0 gui=bold
420
+    hi PmenuSbar       guibg=#2e3330 guifg=#000000
421
+    hi PMenuThumb      guibg=#a0afa0 guifg=#040404
422
+    hi MatchParen      guifg=#b2b2a0 guibg=#2e2e2e gui=bold
423
+    hi SignColumn      guifg=#9fafaf guibg=#343434 gui=bold
424
+    hi TabLineFill     guifg=#cfcfaf guibg=#353535 gui=bold
425
+    hi TabLineSel      guifg=#efefef guibg=#3a3a39 gui=bold
426
+    hi TabLine         guifg=#b6bf98 guibg=#353535 gui=bold
427
+    hi NonText         guifg=#5b605e gui=bold
428
+    
429
+    hi LineNr          guifg=#9fafaf guibg=#262626
430
+endif
431
+
432
+if exists("g:zenburn_old_Visual") && g:zenburn_old_Visual
433
+    if exists("g:zenburn_alternate_Visual") && g:zenburn_alternate_Visual
434
+        " Visual with more contrast, thanks to Steve Hall & Cream posse
435
+        " gui=none fixes weird highlight problem in at least GVim 7.0.66, thanks to Kurt Maier
436
+        hi Visual          guifg=#000000 guibg=#71d3b4 gui=none
437
+        hi VisualNOS       guifg=#000000 guibg=#71d3b4 gui=none
438
+    else
439
+        " use default visual
440
+        hi Visual          guifg=#233323 guibg=#71d3b4 gui=none
441
+        hi VisualNOS       guifg=#233323 guibg=#71d3b4 gui=none
442
+    endif
443
+else
444
+    " new Visual style
445
+    if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
446
+        " high contrast
447
+        "hi Visual        guibg=#304a3d
448
+        "hi VisualNos     guibg=#304a3d
449
+        "TODO no nice greenish in console, 65 is closest. use full black instead,
450
+        "although i like the green..!
451
+        hi Visual        guibg=#0f0f0f
452
+        hi VisualNos     guibg=#0f0f0f
453
+        if &t_Co > 255
454
+            hi Visual ctermbg=0
455
+        endif
456
+    else
457
+        " low contrast
458
+        hi Visual        guibg=#2f2f2f
459
+        hi VisualNOS     guibg=#2f2f2f
460
+
461
+        if &t_Co > 255
462
+            hi Visual    ctermbg=235
463
+            hi VisualNOS ctermbg=235
464
+        endif
465
+    endif
466
+endif
467
+
468
+if exists("g:zenburn_alternate_Error") && g:zenburn_alternate_Error
469
+    " use more jumpy Error
470
+    hi Error        guifg=#e37170 guibg=#664040 gui=bold
471
+else
472
+    " default is something more zenburn-compatible
473
+    hi Error        guifg=#e37170 guibg=#3d3535 gui=none
474
+endif
475
+
476
+if exists("g:zenburn_alternate_Include") && g:zenburn_alternate_Include
477
+    " original setting
478
+    hi Include      guifg=#ffcfaf gui=bold
479
+else
480
+    " new, less contrasted one
481
+    hi Include      guifg=#dfaf8f gui=bold
482
+endif
483
+
484
+if exists("g:zenburn_color_also_Ignore") && g:zenburn_color_also_Ignore
485
+    " color the Ignore groups
486
+    " note: if you get strange coloring for your files, turn this off (unlet)
487
+    hi Ignore guifg=#545a4f
488
+endif
489
+
490
+" new tabline and fold column
491
+if exists("g:zenburn_high_Contrast") && g:zenburn_high_Contrast
492
+    hi FoldColumn    guibg=#161616
493
+    hi Folded        guibg=#161616
494
+    hi TabLine       guifg=#88b090 guibg=#313633 gui=none
495
+    hi TabLineSel    guifg=#ccd990 guibg=#222222
496
+    hi TabLineFill   guifg=#88b090 guibg=#313633 gui=none
497
+    
498
+    hi SpecialKey    guibg=#242424
499
+    
500
+    if &t_Co > 255
501
+        hi FoldColumn    ctermbg=233 ctermfg=109
502
+        hi Folded        ctermbg=233 ctermfg=109
503
+        hi TabLine       ctermbg=236 ctermfg=108 cterm=none
504
+        hi TabLineSel    ctermbg=235 ctermfg=186 cterm=bold
505
+        hi TabLineFill   ctermbg=236 ctermfg=236
506
+    endif
507
+else
508
+    hi FoldColumn    guibg=#333333
509
+    hi Folded        guibg=#333333
510
+    hi TabLine       guifg=#d0d0b8 guibg=#222222 gui=none
511
+    hi TabLineSel    guifg=#f0f0b0 guibg=#333333 gui=bold
512
+    hi TabLineFill   guifg=#dccdcc guibg=#101010 gui=none
513
+    
514
+    hi SpecialKey    guibg=#444444
515
+
516
+    if &t_Co > 255
517
+        hi FoldColumn    ctermbg=236 ctermfg=109
518
+        hi Folded        ctermbg=236 ctermfg=109
519
+        hi TabLine       ctermbg=235 ctermfg=187 cterm=none
520
+        hi TabLineSel    ctermbg=236 ctermfg=229 cterm=bold
521
+        hi TabLineFill   ctermbg=233 ctermfg=233
522
+    endif
523
+endif
524
+
525
+" EXPERIMENTAL ctags_highlighting support
526
+" link/set sensible defaults here;
527
+"
528
+" For now I mostly link to subset of Zenburn colors, the linkage is based
529
+" on appearance, not semantics. In later versions I might define more new colours.
530
+"
531
+" HELP NEEDED to make this work properly.
532
+if exists("_zenburn_ctags") && _zenburn_ctags
533
+
534
+        " Highlighter seems to think a lot of things are global variables even
535
+        " though they're not. Example: python method-local variable is
536
+        " coloured as a global variable. They should not be global, since
537
+        " they're not visible outside the method.
538
+        " If this is some very bright colour group then things look bad.
539
+    	hi link CTagsGlobalVariable    Identifier
540
+        
541
+        hi CTagsClass             guifg=#acd0b3
542
+        if &t_Co > 255
543
+            hi CTagsClass         ctermfg=115
544
+        endif
545
+
546
+        hi link CTagsImport       Statement
547
+        hi link CTagsMember       Function
548
+
549
+    	hi link CTagsGlobalConstant    Constant
550
+  
551
+        " These do not yet have support, I can't get them to appear
552
+        hi link EnumerationValue  Float
553
+        hi link EnumerationName   Identifier
554
+        hi link DefinedName       WarningMsg
555
+    	hi link LocalVariable     WarningMsg
556
+    	hi link Structure         WarningMsg
557
+    	hi link Union             WarningMsg
558
+endif
559
+
560
+" TODO check for more obscure syntax groups that they're ok
561
+

+ 1
- 1
dotfiles/vim/vimrc View File

@@ -84,7 +84,7 @@ set expandtab
84 84
 let g:local_vimrc=".vimrc_local.vim"
85 85
 
86 86
 " for gvim
87
-colorscheme torte
87
+colorscheme zenburn
88 88
 set gfn=Droid\ Sans\ Mono\ 9
89 89
 
90 90
 set fileencodings=ucs-bom,utf-8,cp1250,latin1