vim: make changes to badwolf and enable

diff --git a/vim/colors/badwolf.vim b/vim/colors/badwolf.vim
index 99f0ce094941a25778992ebc0512f47c45b28cb7..624fe3025507024af0d565a9e33e17f7e485003c 100644 (file)
--- a/vim/colors/badwolf.vim
+++ b/vim/colors/badwolf.vim
@@ -36,7 +36,7 @@ if !has("gui_running") && &t_Co != 88 && &t_Co != 256
 endif
 
 set background=dark
-
+highlight clear
 if exists("syntax_on")
     syntax reset
 endif
@@ -83,7 +83,7 @@ let s:bwc.dalespale = ['fade3e', 221]
 let s:bwc.dirtyblonde = ['f4cf86', 222]
 
 " Delicious, chewy red from Made of Code for the poppiest highlights.
-let s:bwc.taffy = ['ff2c4b', 196]
+let s:bwc.taffy = ['ff2c4b', 178]
 
 " Another chewy accent, but use sparingly!
 let s:bwc.saltwatertaffy = ['8cffba', 121]
@@ -107,6 +107,11 @@ let s:bwc.toffee = ['b88853', 137]
 let s:bwc.coffee    = ['c7915b', 173]
 let s:bwc.darkroast = ['88633f', 95]
 
+" I'm not as creative to name colours
+let s:bwc.green = ['005f00', 22]
+let s:bwc.red   = ['5f0000', 52]
+let s:bwc.lightblue  = ['0000ff', 21]
+let s:bwc.blue  = ['00005f', 17]
 " }}}
 " Highlighting Function {{{
 function! s:HL(group, fg, ...)
@@ -177,48 +182,49 @@ endif
 
 " General/UI {{{
 
-call s:HL('Normal', 'plain', 'blackgravel')
+call s:HL('Normal',       'plain')
 
-call s:HL('Folded', 'mediumgravel', 'bg', 'none')
+" Folded needs a background for some weird reason
+call s:HL('Folded',       'lightgravel',  'darkgravel', 'none')
 
-call s:HL('VertSplit', 'lightgravel', 'bg', 'none')
+call s:HL('VertSplit',    'lightgravel',  '',           'none')
 
-call s:HL('CursorLine',   '', 'darkgravel', 'none')
-call s:HL('CursorColumn', '', 'darkgravel')
-call s:HL('ColorColumn',  '', 'darkgravel')
+call s:HL('CursorLine',   '',             'darkgravel', 'none')
+call s:HL('CursorColumn', '',             'darkgravel')
+call s:HL('ColorColumn',  '',             'darkgravel')
 
-call s:HL('TabLine', 'plain', s:tabline, 'none')
-call s:HL('TabLineFill', 'plain', s:tabline, 'none')
-call s:HL('TabLineSel', 'coal', 'tardis', 'none')
+call s:HL('TabLine',      'plain',        s:tabline,    'none')
+call s:HL('TabLineFill',  'plain',        s:tabline,    'none')
+call s:HL('TabLineSel',   'coal',         'tardis',     'none')
 
-call s:HL('MatchParen', 'dalespale', 'darkgravel', 'bold')
+call s:HL('MatchParen',   'dalespale',    'darkgravel', 'bold')
 
-call s:HL('NonText',    'deepgravel', 'bg')
-call s:HL('SpecialKey', 'deepgravel', 'bg')
+call s:HL('NonText',      'deepgravel',   '')
+call s:HL('SpecialKey',   'deepgravel',   '')
 
-call s:HL('Visual',    '',  'deepgravel')
-call s:HL('VisualNOS', '',  'deepgravel')
+call s:HL('Visual',       '',             'deepgravel')
+call s:HL('VisualNOS',    '',             'deepgravel')
 
-call s:HL('Search',    'coal', 'dalespale', 'bold')
-call s:HL('IncSearch', 'coal', 'tardis',    'bold')
+call s:HL('Search',       'coal',         'dalespale',  'bold')
+call s:HL('IncSearch',    'coal',         'tardis',     'bold')
 
-call s:HL('Underlined', 'fg', '', 'underline')
+call s:HL('Underlined',   'fg',           '',           'underline')
 
-call s:HL('StatusLine',   'coal', 'tardis',     'bold')
-call s:HL('StatusLineNC', 'snow', 'deepgravel', 'bold')
+call s:HL('StatusLine',   'coal',         'tardis',     'bold')
+call s:HL('StatusLineNC', 'snow',         'deepgravel', 'bold')
 
-call s:HL('Directory', 'dirtyblonde', '', 'bold')
+call s:HL('Directory',    'dirtyblonde',  '',           'bold')
 
-call s:HL('Title', 'lime')
+call s:HL('Title',        'lime')
 
-call s:HL('ErrorMsg',   'taffy',       'bg', 'bold')
-call s:HL('MoreMsg',    'dalespale',   '',   'bold')
-call s:HL('ModeMsg',    'dirtyblonde', '',   'bold')
-call s:HL('Question',   'dirtyblonde', '',   'bold')
-call s:HL('WarningMsg', 'dress',       '',   'bold')
+call s:HL('ErrorMsg',     'taffy',        '',           'bold')
+call s:HL('MoreMsg',      'dalespale',    '',           'bold')
+call s:HL('ModeMsg',      'dirtyblonde',  '',           'bold')
+call s:HL('Question',     'dirtyblonde',  '',           'bold')
+call s:HL('WarningMsg',   'dress',        '',           'bold')
 
 " This is a ctags tag, not an HTML one.  'Something you can use c-] on'.
-call s:HL('Tag', '', '', 'bold')
+call s:HL('Tag',            '', '', 'bold')
 
 " hi IndentGuides                  guibg=#373737
 " hi WildMenu        guifg=#66D9EF guibg=#000000
@@ -245,8 +251,8 @@ call s:HL('Special', 'plain')
 
 " Comments are slightly brighter than folds, to make 'headers' easier to see.
 call s:HL('Comment',        'gravel')
-call s:HL('Todo',           'snow', 'bg', 'bold')
-call s:HL('SpecialComment', 'snow', 'bg', 'bold')
+call s:HL('Todo',           'snow', '', 'bold')
+call s:HL('SpecialComment', 'snow', '', 'bold')
 
 " Strings are a nice, pale straw color.  Nothing too fancy.
 call s:HL('String', 'dirtyblonde')
@@ -310,17 +316,17 @@ call s:HL('PmenuThumb', 'brightgravel')
 " }}}
 " Diffs {{{
 
-call s:HL('DiffDelete', 'coal', 'coal')
-call s:HL('DiffAdd',    '',     'deepergravel')
-call s:HL('DiffChange', '',     'darkgravel')
-call s:HL('DiffText',   'snow', 'deepergravel', 'bold')
+call s:HL('DiffDelete', 'coal', 'red')
+call s:HL('DiffAdd',    '',     'green')
+call s:HL('DiffChange', '',     'lightblue')
+call s:HL('DiffText',   'fg',   'blue', 'bold')
 
 " }}}
 " Spelling {{{
 
 if has("spell")
-    call s:HL('SpellCap', 'dalespale', 'bg', 'undercurl,bold', 'dalespale')
-    call s:HL('SpellBad', '', 'bg', 'undercurl', 'dalespale')
+    call s:HL('SpellCap', 'dalespale', '', 'undercurl,bold', 'dalespale')
+    call s:HL('SpellBad', '', '', 'undercurl', 'dalespale')
     call s:HL('SpellLocal', '', '', 'undercurl', 'dalespale')
     call s:HL('SpellRare', '', '', 'undercurl', 'dalespale')
 endif
@@ -336,16 +342,16 @@ endif
     call s:HL('CtrlPNoEntries', 'snow', 'taffy', 'bold')
 
     " the matched pattern
-    call s:HL('CtrlPMatch', 'orange', 'bg', 'none')
+    call s:HL('CtrlPMatch', 'orange', '', 'none')
 
     " the line prefix '>' in the match window
-    call s:HL('CtrlPLinePre', 'deepgravel', 'bg', 'none')
+    call s:HL('CtrlPLinePre', 'deepgravel', '', 'none')
 
     " the prompt’s base
-    call s:HL('CtrlPPrtBase', 'deepgravel', 'bg', 'none')
+    call s:HL('CtrlPPrtBase', 'deepgravel', '', 'none')
 
     " the prompt’s text
-    call s:HL('CtrlPPrtText', 'plain', 'bg', 'none')
+    call s:HL('CtrlPPrtText', 'plain', '', 'none')
 
     " the prompt’s cursor when moving over the text
     call s:HL('CtrlPPrtCursor', 'coal', 'tardis', 'bold')
@@ -369,8 +375,8 @@ endif
 " }}}
 " EasyMotion {{{
 
-call s:HL('EasyMotionTarget', 'tardis',     'bg', 'bold')
-call s:HL('EasyMotionShade',  'deepgravel', 'bg')
+call s:HL('EasyMotionTarget', 'tardis',     '', 'bold')
+call s:HL('EasyMotionShade',  'deepgravel', '')
 
 " }}}
 " Interesting Words {{{
@@ -491,8 +497,8 @@ call s:HL('djangoVarBlock', 'orange', '')
 " HTML {{{
 
 " Punctuation
-call s:HL('htmlTag',    'darkroast', 'bg', 'none')
-call s:HL('htmlEndTag', 'darkroast', 'bg', 'none')
+call s:HL('htmlTag',    'darkroast', '', 'none')
+call s:HL('htmlEndTag', 'darkroast', '', 'none')
 
 " Tag names
 call s:HL('htmlTagName',        'coffee', '', 'bold')
@@ -641,8 +647,8 @@ call s:HL('VimCommentTitle', 'lightgravel', '', 'bold')
 
 call s:HL('VimMapMod',    'dress', '', 'none')
 call s:HL('VimMapModKey', 'dress', '', 'none')
-call s:HL('VimNotation', 'dress', '', 'none')
-call s:HL('VimBracket', 'dress', '', 'none')
+call s:HL('VimNotation',  'dress', '', 'none')
+call s:HL('VimBracket',   'dress', '', 'none')
 
 " }}}
 

diff --git a/vim/vimrc b/vim/vimrc
index 71ad952f7ee9916f6c9a92d39ec02de33a26b134..3c32b642bc335b2464d264cd1aacaf6e1a7f3e6f 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -103,7 +103,7 @@ endif
 
 
 " syntax, highlighting and spelling {{{1
-set background=dark             " Dark background, d'uh!
+colorscheme badwolf
 syntax on
 
 set spelllang=en_gb             " list of accepted languages