From: Samir Benmendil Date: Mon, 21 Sep 2015 21:28:28 +0000 (+0100) Subject: vim: replace badwolf with badfox X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/485933001d2f0ec0b99fb70e6e7d053e5da16123?ds=inline vim: replace badwolf with badfox --- diff --git a/vim/colors/badwolf.vim b/vim/colors/badfox.vim similarity index 79% rename from vim/colors/badwolf.vim rename to vim/colors/badfox.vim index 74eb5ba..7b33b93 100644 --- a/vim/colors/badwolf.vim +++ b/vim/colors/badfox.vim @@ -1,32 +1,4 @@ -" _ _ _ __ -" | |__ __ _ __| | __ _____ | |/ _| -" | '_ \ / _` |/ _` | \ \ /\ / / _ \| | |_ -" | |_) | (_| | (_| | \ V V / (_) | | _| -" |_.__/ \__,_|\__,_| \_/\_/ \___/|_|_| -" -" I am the Bad Wolf. I create myself. -" I take the words. I scatter them in time and space. -" A message to lead myself here. -" -" A Vim colorscheme pieced together by Steve Losh. -" Available at http://stevelosh.com/projects/badwolf/ -" -" Why? {{{ -" -" After using Molokai for quite a long time, I started longing for -" a replacement. -" -" I love Molokai's high contrast and gooey, saturated tones, but it can be -" a little inconsistent at times. -" -" Also it's winter here in Rochester, so I wanted a color scheme that's a bit -" warmer. A little less blue and a bit more red. -" -" And so Bad Wolf was born. I'm no designer, but designers have been scattering -" beautiful colors through time and space long before I came along. I took -" advantage of that and reused some of my favorites to lead me to this scheme. -" -" }}} +" A Vim colorscheme pieced forked from Badwolf by Steve Losh. " Supporting code ------------------------------------------------------------- " Preamble {{{ @@ -41,14 +13,14 @@ if exists("syntax_on") syntax reset endif -let colors_name = "badwolf" +let colors_name = "badfox" -if !exists("g:badwolf_html_link_underline") " {{{ - let g:badwolf_html_link_underline = 1 +if !exists("g:badfox_html_link_underline") " {{{ + let g:badfox_html_link_underline = 1 endif " }}} -if !exists("g:badwolf_css_props_highlight") " {{{ - let g:badwolf_css_props_highlight = 0 +if !exists("g:badfox_css_props_highlight") " {{{ + let g:badfox_css_props_highlight = 0 endif " }}} " }}} @@ -107,15 +79,20 @@ let s:bwc.toffee = ['b88853', 137] let s:bwc.coffee = ['c7915b', 173] let s:bwc.darkroast = ['88633f', 95] +let s:bwc.deadgrass = ['3b543b', 65] +let s:bwc.cartoonblood = ['8c3535', 167] +let s:bwc.grapemilk = ['008787', 30] +let s:bwc.muddygrapemilk = ['5f5f87', 60] + " 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] +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, ...) - " Arguments: group, guifg, guibg, gui, guisp + " Arguments: group, guifg/ctermfg, guibg/ctermbg, gui/cterm, guisp let histring = 'hi ' . a:group . ' ' @@ -153,20 +130,26 @@ endfunction " }}} " Configuration Options {{{ -if exists('g:badwolf_darkgutter') && g:badwolf_darkgutter +if exists('g:badfox_darkgutter') && g:badfox_darkgutter let s:gutter = 'blackestgravel' else let s:gutter = 'blackgravel' endif -if exists('g:badwolf_tabline') - if g:badwolf_tabline == 0 +if exists('g:badfox_darkcolorcolumn') && g:badfox_darkcolorcolumn + let s:darkcolorcolumn = 'blackestgravel' +else + let s:darkcolorcolumn = 'blackgravel' +endif + +if exists('g:badfox_tabline') + if g:badfox_tabline == 0 let s:tabline = 'blackestgravel' - elseif g:badwolf_tabline == 1 + elseif g:badfox_tabline == 1 let s:tabline = 'blackgravel' - elseif g:badwolf_tabline == 2 + elseif g:badfox_tabline == 2 let s:tabline = 'darkgravel' - elseif g:badwolf_tabline == 3 + elseif g:badfox_tabline == 3 let s:tabline = 'deepgravel' else let s:tabline = 'blackestgravel' @@ -182,49 +165,53 @@ endif " General/UI {{{ -call s:HL('Normal', 'plain') +call s:HL('Normal', 'plain', 'blackestgravel') + +" When you do hi Normal the background option is changed based on the value of +" Normal. Most values except #000000 force "light", set background=dark should +" come after Normal because if it doesn't it will most likely be changed anyway: +set background=dark -" Folded needs a background for some weird reason -call s:HL('Folded', 'lightgravel', 'darkgravel', 'none') +call s:HL('Folded', 'lightgravel', 'darkgravel', 'none') -call s:HL('VertSplit', 'lightgravel', '', 'none') +call s:HL('VertSplit', 'deepgravel', 'bg', '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', '', 'blackestgravel') -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', '') -call s:HL('SpecialKey', 'dress', '') +call s:HL('NonText', 'deepgravel', '') +call s:HL('SpecialKey', 'dress', '') -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', '', '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 @@ -250,12 +237,12 @@ call s:HL('iCursor', 'coal', 'tardis', 'none') 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', '', 'bold') -call s:HL('SpecialComment', 'snow', '', 'bold') +call s:HL('Comment', 'gravel', '', 'italic') +call s:HL('Todo', 'snow', 'bg', 'bold') +call s:HL('SpecialComment', 'snow', 'bg', 'bold') " Strings are a nice, pale straw color. Nothing too fancy. -call s:HL('String', 'dirtyblonde') +call s:HL('String', 'dirtyblonde', '', 'italic') " Control flow stuff is taffy. call s:HL('Statement', 'taffy', '', 'bold') @@ -316,17 +303,17 @@ call s:HL('PmenuThumb', 'brightgravel') " }}} " Diffs {{{ -call s:HL('DiffDelete', 'coal', 'red') -call s:HL('DiffAdd', '', 'green') -call s:HL('DiffChange', '', 'lightblue') -call s:HL('DiffText', 'fg', 'blue', 'bold') +call s:HL('DiffAdd', '', 'green') +call s:HL('DiffDelete', 'coal', 'red') +call s:HL('DiffChange', '', 'lightblue' ) +call s:HL('DiffText', 'fg', 'blue', 'bold') " }}} " Spelling {{{ if has("spell") call s:HL('SpellCap', 'dalespale', '', 'undercurl,bold', 'dalespale') - call s:HL('SpellBad', '', '', 'undercurl', 'dalespale') + call s:HL('SpellBad', 'snow', 'red', 'undercurl', 'dalespale') call s:HL('SpellLocal', '', '', 'undercurl', 'dalespale') call s:HL('SpellRare', '', '', 'undercurl', 'dalespale') endif @@ -375,8 +362,8 @@ endif " }}} " EasyMotion {{{ -call s:HL('EasyMotionTarget', 'tardis', '', 'bold') -call s:HL('EasyMotionShade', 'deepgravel', '') +call s:HL('EasyMotionTarget', 'tardis', 'bg', 'bold') +call s:HL('EasyMotionShade', 'deepgravel', 'bg') " }}} " Interesting Words {{{ @@ -425,6 +412,27 @@ call s:HL('ShowMarksHLu', 'tardis', 'blackgravel') call s:HL('ShowMarksHLo', 'tardis', 'blackgravel') call s:HL('ShowMarksHLm', 'tardis', 'blackgravel') +" }}} +" IndentGuides {{{ + +call s:HL('IndentGuidesOdd', '', 'blackgravel') +call s:HL('IndentGuidesEven', '', 'blackestgravel') + +" }}} +" Signify {{{ + +call s:HL('SignifySignAdd', 'lime', s:gutter) +call s:HL('SignifySignDelete', 'taffy', s:gutter) +call s:HL('SignifySignChange', 'orange', s:gutter) + +" }}} +"GitGutter {{{ + +call s:HL('GitGutterAdd', 'lime', s:gutter) +call s:HL('GitGutterDelete', 'taffy', s:gutter) +call s:HL('GitGutterChange', 'orange', s:gutter) +call s:HL('GitGutterChangeDelete', 'taffy', s:gutter) + " }}} " }}} @@ -451,7 +459,7 @@ call s:HL('clojureAnonArg', 'snow', '', 'bold') " }}} " CSS {{{ -if g:badwolf_css_props_highlight +if g:badfox_css_props_highlight call s:HL('cssColorProp', 'dirtyblonde', '', 'none') call s:HL('cssBoxProp', 'dirtyblonde', '', 'none') call s:HL('cssTextProp', 'dirtyblonde', '', 'none') @@ -497,8 +505,8 @@ call s:HL('djangoVarBlock', 'orange', '') " HTML {{{ " Punctuation -call s:HL('htmlTag', 'darkroast', '', 'none') -call s:HL('htmlEndTag', 'darkroast', '', 'none') +call s:HL('htmlTag', 'darkroast', 'bg', 'none') +call s:HL('htmlEndTag', 'darkroast', 'bg', 'none') " Tag names call s:HL('htmlTagName', 'coffee', '', 'bold') @@ -510,7 +518,7 @@ call s:HL('htmlArg', 'coffee', '', 'none') " Stuff inside an tag -if g:badwolf_html_link_underline +if g:badfox_html_link_underline call s:HL('htmlLink', 'lightgravel', '', 'underline') else call s:HL('htmlLink', 'lightgravel', '', 'none') @@ -545,7 +553,7 @@ call s:HL('texComment', 'darkroast', '', 'none') call s:HL('texDelimiter', 'orange', '', 'none') call s:HL('texZone', 'brightgravel', '', 'none') -augroup badwolf_tex +augroup badfox_tex au! au BufRead,BufNewFile *.tex syn region texMathZoneV start="\\(" end="\\)\|%stopzone\>" keepend contains=@texMathZoneGroup @@ -647,8 +655,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 2eb44cd..6ac05a3 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -19,7 +19,6 @@ Plugin 'bling/vim-airline' Plugin 'derekwyatt/vim-fswitch' Plugin 'elzr/vim-json' Plugin 'firef0x/pkgbuild.vim' -Plugin 'flazz/vim-colorschemes' Plugin 'junegunn/vim-easy-align' Plugin 'justinmk/vim-sneak' Plugin 'klen/python-mode' @@ -42,6 +41,9 @@ Plugin 'valloric/youcompleteme' Plugin 'vim-scripts/replacewithregister' Plugin 'vim-scripts/yankring.vim' +" colorschemes +Plugin 'flazz/vim-colorschemes' + " snippets Plugin 'sirver/ultisnips' Plugin 'honza/vim-snippets' @@ -85,7 +87,7 @@ filetype plugin indent on " colorscheme {{{1 syntax on -colorscheme badwolf +colorscheme badfox " options {{{1 " moving around, searching and patterns {{{2