diff --git a/.vim/bundle/go-explorer b/.vim/bundle/go-explorer index 6a82202..cbf2b4f 160000 --- a/.vim/bundle/go-explorer +++ b/.vim/bundle/go-explorer @@ -1 +1 @@ -Subproject commit 6a82202d18e3b4a4a06b6c22769ee9511335e6ae +Subproject commit cbf2b4ff6714f0c76f8a08d772cc97c8748efc15 diff --git a/.vim/bundle/nofrils/README.md b/.vim/bundle/nofrils/README.md index ee48132..e89dc4a 100644 --- a/.vim/bundle/nofrils/README.md +++ b/.vim/bundle/nofrils/README.md @@ -4,27 +4,50 @@ To use: - :colo nofrils-dark - :colo nofrils-light - :colo nofrils-sepia +- :colo nofrils-acme **NEW** To customize: - :let g:nofrils\_strbackgrounds=1 to turn highlighted string backgrounds, for languages where strings are a major part of them - :let g:nofrils\_heavycomments=1 to turn on high contrast comments rather than the default faded style, for projects where the comments are not deceit and lies - :let g:nofrils\_heavylinenumbers=1 to turn on brighter line numbers, for people who use relative line numbers to hop around +Commands (once theme is loaded): +- :NofrilsDark use dark theme +- :NofrilsLight use light theme +- :NofrilsSepia use sepia theme +- :NofrilsAcme use acme theme +- :NofrilsFocusNormal reset back to normal settings +- :NofrilsFocusCode focus only code, fade everything else +- :NofrilsFocusComments focus only comments, fade everything else + The only highlighted elements are spelling, errors, comments, vim features (diff, etc) and *optionally* string backgrounds **Click for non-fuzzified versions** -![Sepia Version](http://i.imgur.com/AU06II7.gif) -**let g:nofrils_heavylinenumbers=1**, **:let g:nofrils_strbackgrounds=1** and **:let g:nofrils_heavycomments=1** +*nofrils-dark*: **let g:nofrils_heavylinenumbers=1**, **:let g:nofrils_strbackgrounds=1** and **:let g:nofrils_heavycomments=1** +![Dark Version](http://i.imgur.com/1lUx2hY.png) -![Dark Version](http://i.imgur.com/fjlOpKp.gif) -*let g:nofrils_heavylinenumbers=0*, **:let g:nofrils_strbackgrounds=1** and **:let g:nofrils_heavycomments=1** +---- + +*nofrils-acme*: **let g:nofrils_heavylinenumbers=0**, **:let g:nofrils_strbackgrounds=0** and **:let g:nofrils_heavycomments=0** +![Acme Version](http://i.imgur.com/yn7OJrY.png) + +---- + +*nofrils-sepia*: **let g:nofrils_heavylinenumbers=1**, **:let g:nofrils_strbackgrounds=0** and **:let g:nofrils_heavycomments=1** +![Sepia Version](http://i.imgur.com/zwW5kir.png) + +---- + +*nofrils-light*: **let g:nofrils_heavylinenumbers=0**, **:let g:nofrils_strbackgrounds=0** and **:let g:nofrils_heavycomments=1** +![Light Version](http://i.imgur.com/XXoxztJ.png) + +---- + +*nofrils-acme*: **let g:nofrils_heavylinenumbers=0**, **:let g:nofrils_strbackgrounds=0** and **:let g:nofrils_heavycomments=0** +![Diffs Arcme Version](http://i.imgur.com/cLcbq7M.png) -![Light Version](http://i.imgur.com/RSYLnKd.gif) -*let g:nofrils_heavylinenumbers=0*, *:let g:nofrils_strbackgrounds=0* and *:let g:nofrils_heavycomments=0* -![Diffs Dark Version](https://i.imgur.com/AkgERzz.gif) -*let g:nofrils_heavylinenumbers=0*, *:let g:nofrils_strbackgrounds=0* and *:let g:nofrils_heavycomments=0* ---- diff --git a/.vim/bundle/nofrils/colors/nofrils-acme.vim b/.vim/bundle/nofrils/colors/nofrils-acme.vim new file mode 100644 index 0000000..7d3046b --- /dev/null +++ b/.vim/bundle/nofrils/colors/nofrils-acme.vim @@ -0,0 +1,189 @@ +" Name: No Frils Acme Colorscheme +" Author: robertmeta (on Github) +" URL: https://github.com/robertmeta/nofrils +" (see this url for latest release & screenshots) +" License: OSI approved MIT license + +hi clear +if exists("syntax_on") + syntax reset +endif + +let g:colors_name = "nofrils-acme" + +if !exists("g:nofrils_strbackgrounds") + let g:nofrils_strbackgrounds = 0 +endif +if !exists("g:nofrils_heavycomments") + let g:nofrils_heavycomments = 0 +endif +if !exists("g:nofrils_heavylinenumbers") + let g:nofrils_heavylinenumbers = 0 +endif + +set background=light + +" Baseline +hi Normal term=NONE cterm=NONE ctermfg=black ctermbg=230 gui=NONE guifg=#000000 guibg=#ffffd7 + +" Faded +hi ColorColumn term=NONE cterm=NONE ctermfg=NONE ctermbg=253 gui=NONE guifg=NONE guibg=#dadada +hi Comment term=NONE cterm=NONE ctermfg=136 ctermbg=NONE gui=NONE guifg=#af8700 guibg=NONE +hi FoldColumn term=NONE cterm=NONE ctermfg=136 ctermbg=NONE gui=NONE guifg=#af8700 guibg=NONE +hi Folded term=NONE cterm=NONE ctermfg=240 ctermbg=NONE gui=NONE guifg=#585858 guibg=NONE +hi LineNr term=NONE cterm=NONE ctermfg=136 ctermbg=bg gui=NONE guifg=#af8700 guibg=NONE +hi NonText term=NONE cterm=NONE ctermfg=136 ctermbg=NONE gui=NONE guifg=#af8700 guibg=NONE +hi SignColumn term=NONE cterm=NONE ctermfg=240 ctermbg=bg gui=NONE guifg=#585858 guibg=bg +hi SpecialKey term=NONE cterm=NONE ctermfg=240 ctermbg=bg gui=NONE guifg=#585858 guibg=bg +hi StatusLineNC term=NONE cterm=NONE ctermfg=fg ctermbg=195 gui=NONE guifg=fg guibg=#d7ffff +hi VertSplit term=NONE cterm=NONE ctermfg=fg ctermbg=195 gui=NONE guifg=fg guibg=#d7ffff + +" Highlight +hi CursorColumn term=NONE cterm=NONE ctermfg=NONE ctermbg=228 gui=NONE guifg=NONE guibg=#ffff87 +hi CursorIM term=NONE cterm=NONE ctermfg=fg ctermbg=4 gui=NONE guifg=fg guibg=#00ffff +hi CursorLineNr term=NONE cterm=NONE ctermfg=0 ctermbg=228 gui=NONE guifg=NONE guibg=#ffff87 +hi CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=228 gui=NONE guifg=NONE guibg=#ffff87 +hi Cursor term=NONE cterm=NONE ctermfg=fg ctermbg=4 gui=NONE guifg=fg guibg=#00ffff +hi Directory term=NONE cterm=NONE ctermfg=53 ctermbg=NONE gui=NONE guifg=#5f005f guibg=NONE +hi ErrorMsg term=NONE cterm=NONE ctermfg=9 ctermbg=white gui=NONE guifg=#ff5555 guibg=white +hi Error term=NONE cterm=NONE ctermfg=9 ctermbg=white gui=NONE guifg=#ff5555 guibg=white +hi IncSearch term=NONE cterm=NONE ctermfg=white ctermbg=2 gui=NONE guifg=white guibg=#008000 +hi Search term=NONE cterm=NONE ctermfg=white ctermbg=2 gui=NONE guifg=white guibg=#008000 +hi MatchParen term=NONE cterm=NONE ctermfg=15 ctermbg=4 gui=NONE guifg=#ffffff guibg=#000080 +hi ModeMsg term=NONE cterm=NONE ctermfg=53 ctermbg=NONE gui=NONE guifg=#5f005f guibg=NONE +hi MoreMsg term=NONE cterm=NONE ctermfg=53 ctermbg=NONE gui=NONE guifg=#5f005f guibg=NONE +hi PmenuSel term=NONE cterm=NONE ctermfg=fg ctermbg=13 gui=NONE guifg=fg guibg=#ff00ff +hi Question term=NONE cterm=NONE ctermfg=53 ctermbg=NONE gui=NONE guifg=#5f005f guibg=NONE +hi StatusLine term=NONE cterm=NONE ctermbg=183 ctermfg=fg gui=NONE guifg=white guibg=#000000 +hi Todo term=NONE cterm=NONE ctermfg=2 ctermbg=NONE gui=NONE guifg=#008000 guibg=NONE +hi WarningMsg term=NONE cterm=NONE ctermfg=9 ctermbg=white gui=NONE guifg=#ff5555 guibg=white +hi WildMenu term=NONE cterm=NONE ctermbg=fg ctermfg=183 gui=NONE guifg=#000000 guibg=white +hi Visual term=NONE cterm=NONE ctermfg=fg ctermbg=222 gui=NONE guifg=NONE guibg=#ffd787 +hi VisualNOS term=underline cterm=underline ctermfg=fg ctermbg=222 gui=underline guifg=NONE guibg=#ffd787 + +" Reversed +hi PmenuSbar term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE +hi Pmenu term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE +hi PmenuThumb term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE +hi TabLineSel term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE + +" Diff +hi DiffAdd term=NONE cterm=NONE ctermfg=2 ctermbg=NONE gui=NONE guifg=#008000 guibg=NONE +hi DiffChange term=NONE cterm=NONE ctermfg=94 ctermbg=NONE gui=NONE guifg=#875f00 guibg=NONE +hi DiffDelete term=NONE cterm=NONE ctermfg=1 ctermbg=NONE gui=NONE guifg=#800000 guibg=NONE +hi DiffText term=NONE cterm=NONE ctermfg=4 ctermbg=NONE gui=NONE guifg=#000080 guibg=NONE + +" Spell +hi SpellBad term=underline cterm=underline ctermfg=5 ctermbg=NONE gui=underline guifg=#cd00cd guibg=NONE +hi SpellCap term=underline cterm=underline ctermfg=5 ctermbg=NONE gui=underline guifg=#cd00cd guibg=NONE +hi SpellLocal term=underline cterm=underline ctermfg=5 ctermbg=NONE gui=underline guifg=#cd00cd guibg=NONE +hi SpellRare term=underline cterm=underline ctermfg=5 ctermbg=NONE gui=underline guifg=#cd00cd guibg=NONE + +" Vim Features +hi Menu term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Scrollbar term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi TabLineFill term=NONE cterm=NONE ctermfg=fg ctermbg=136 gui=NONE guifg=fg guibg=#af8700 +hi TabLine term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Tooltip term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + +" Syntax Highsepiaing (or lack there of) +hi Boolean term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Conceal term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Conditional term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Constant term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Debug term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Define term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Delimiter term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Directive term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Exception term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Float term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Format term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Function term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Identifier term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Ignore term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Include term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Keyword term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Label term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Macro term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Number term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Operator term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi PreCondit term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi PreProc term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Repeat term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi SpecialChar term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi SpecialComment term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Special term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Statement term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi StorageClass term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Structure term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Tag term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Title term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Typedef term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Type term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE +hi Underlined term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + +" Sneak +hi SneakLabelMask term=NONE cterm=NONE ctermfg=black ctermbg=195 gui=NONE guifg=black guibg=#d7ffff +hi SneakTarget term=NONE cterm=NONE ctermfg=black ctermbg=195 gui=NONE guifg=black guibg=#d7ffff +hi SneakLabelTarget term=NONE cterm=NONE ctermfg=black ctermbg=183 gui=NONE guifg=black guibg=#d7afff +hi SneakScope term=NONE cterm=NONE ctermfg=black ctermbg=183 gui=NONE guifg=black guibg=#d7afff + +" Helper Functions +function! NofrilsFocusComments() + hi Comment term=NONE cterm=NONE ctermfg=black ctermbg=NONE gui=NONE guifg=#af8700 guibg=NONE + hi Normal term=NONE cterm=NONE ctermfg=136 ctermbg=230 gui=NONE guifg=#000000 guibg=#ffffd7 + hi LineNr term=NONE cterm=NONE ctermfg=136 ctermbg=bg gui=NONE guifg=#af8700 guibg=NONE + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + + if g:nofrils_heavycomments + hi Comment term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005F guibg=NONE + end +endfunction + +function! NofrilsFocusCode() + hi Comment term=NONE cterm=NONE ctermfg=136 ctermbg=NONE gui=NONE guifg=#af8700 guibg=NONE + hi Normal term=NONE cterm=NONE ctermfg=black ctermbg=230 gui=NONE guifg=#000000 guibg=#ffffd7 + hi LineNr term=NONE cterm=NONE ctermfg=136 ctermbg=bg gui=NONE guifg=#af8700 guibg=NONE + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + + if g:nofrils_strbackgrounds + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=223 gui=NONE guifg=NONE guibg=#ffd7af + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=223 gui=NONE guifg=NONE guibg=#ffd7af + end +endfunction + +function! NofrilsNormal() + hi Comment term=NONE cterm=NONE ctermfg=136 ctermbg=NONE gui=NONE guifg=#af8700 guibg=NONE + hi Normal term=NONE cterm=NONE ctermfg=black ctermbg=230 gui=NONE guifg=#000000 guibg=#ffffd7 + hi LineNr term=NONE cterm=NONE ctermfg=136 ctermbg=bg gui=NONE guifg=#af8700 guibg=NONE + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + + " Optional Syntax Features + if g:nofrils_strbackgrounds + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=223 gui=NONE guifg=NONE guibg=#ffd7af + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=223 gui=NONE guifg=NONE guibg=#ffd7af + end + if g:nofrils_heavycomments + hi Comment term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005f guibg=NONE + end + if g:nofrils_heavylinenumbers + hi LineNr term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005f guibg=NONE + end +endfunction + +" Command mappings +command! NofrilsDark :colo nofrils-dark +command! NofrilsLight :colo nofrils-light +command! NofrilsSepia :colo nofrils-sepia +command! NofrilsAcme :colo nofrils-acme +command! NofrilsFocusNormal :call NofrilsNormal() +command! NofrilsFocusCode :call NofrilsFocusCode() +command! NofrilsFocusComments :call NofrilsFocusComments() + +" Setup normal settings +call NofrilsNormal() diff --git a/.vim/bundle/nofrils/colors/nofrils-dark.vim b/.vim/bundle/nofrils/colors/nofrils-dark.vim index da08aba..5d3cb39 100644 --- a/.vim/bundle/nofrils/colors/nofrils-dark.vim +++ b/.vim/bundle/nofrils/colors/nofrils-dark.vim @@ -21,6 +21,8 @@ if !exists("g:nofrils_heavylinenumbers") let g:nofrils_heavylinenumbers = 0 endif +set background=dark + " Baseline hi Normal term=NONE cterm=NONE ctermfg=255 ctermbg=235 gui=NONE guifg=#eeeeee guibg=#262626 @@ -37,10 +39,10 @@ hi StatusLineNC term=NONE cterm=NONE ctermfg=fg ctermbg=242 gui=NONE guifg=fg gu hi VertSplit term=NONE cterm=NONE ctermfg=black ctermbg=242 gui=NONE guifg=black guibg=#6C6C6C " Highlighted -hi CursorColumn term=NONE cterm=NONE ctermfg=NONE ctermbg=black gui=NONE guifg=NONE guibg=black +hi CursorColumn term=NONE cterm=NONE ctermfg=NONE ctermbg=236 gui=NONE guifg=NONE guibg=#303030 hi CursorIM term=NONE cterm=NONE ctermfg=black ctermbg=4 gui=NONE guifg=black guibg=#00FFFF hi CursorLineNr term=NONE cterm=NONE ctermfg=NONE ctermbg=black gui=NONE guifg=NONE guibg=black -hi CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=black gui=NONE guifg=NONE guibg=black +hi CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=236 gui=NONE guifg=NONE guibg=#303030 hi Cursor term=NONE cterm=NONE ctermfg=black ctermbg=4 gui=NONE guifg=black guibg=#00FFFF hi Directory term=NONE cterm=NONE ctermfg=69 ctermbg=NONE gui=NONE guifg=#5F87FF guibg=NONE hi ErrorMsg term=NONE cterm=NONE ctermfg=fg ctermbg=52 gui=NONE guifg=fg guibg=#5F0000 @@ -54,8 +56,8 @@ hi Question term=NONE cterm=NONE ctermfg=69 ctermbg=NONE gui=NONE guifg=#5F87FF hi Search term=NONE cterm=NONE ctermfg=black ctermbg=6 gui=NONE guifg=black guibg=#00CDCD hi StatusLine term=NONE cterm=NONE ctermfg=black ctermbg=fg gui=NONE guifg=black guibg=fg hi Todo term=NONE cterm=NONE ctermfg=10 ctermbg=NONE gui=NONE guifg=#00FF00 guibg=black -hi VisualNOS term=NONE cterm=NONE ctermfg=NONE ctermbg=69 gui=NONE guifg=NONE guibg=#5F87FF hi WarningMsg term=NONE cterm=NONE ctermfg=fg ctermbg=52 gui=NONE guifg=fg guibg=#5F0000 +hi WildMenu term=NONE cterm=NONE ctermfg=fg ctermbg=black gui=NONE guifg=fg guibg=black " Reversed hi PmenuSbar term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE @@ -63,7 +65,7 @@ hi Pmenu term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg= hi PmenuThumb term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE hi TabLineSel term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE hi Visual term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE -hi WildMenu term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE +hi VisualNOS term=reverse,underline cterm=reverse,underline ctermfg=NONE ctermbg=NONE gui=reverse,underline guifg=NONE guibg=NONE " Diff hi DiffAdd term=NONE cterm=NONE ctermfg=2 ctermbg=NONE gui=NONE guifg=#008000 guibg=NONE @@ -123,19 +125,65 @@ hi Type term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg hi Underlined term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE " Sneak -hi SneakPluginScope term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE -hi SneakStreakMask term=NONE cterm=NONE ctermfg=black ctermbg=darkgreen gui=NONE guifg=black guibg=darkgreen -hi SneakStreakStatusLine term=NONE cterm=NONE ctermfg=black ctermbg=darkgreen gui=NONE guifg=black guibg=darkgreen -hi SneakStreakTarget term=NONE cterm=NONE ctermfg=black ctermbg=green gui=NONE guifg=black guibg=green +hi SneakLabelMask term=NONE cterm=NONE ctermfg=black ctermbg=195 gui=NONE guifg=black guibg=#d7ffff +hi SneakTarget term=NONE cterm=NONE ctermfg=black ctermbg=195 gui=NONE guifg=black guibg=#d7ffff +hi SneakLabelTarget term=NONE cterm=NONE ctermfg=black ctermbg=183 gui=NONE guifg=black guibg=#d7afff +hi SneakScope term=NONE cterm=NONE ctermfg=black ctermbg=183 gui=NONE guifg=black guibg=#d7afff -" Optional Syntax Features -if g:nofrils_strbackgrounds - hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=233 gui=NONE guifg=NONE guibg=#121212 - hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=233 gui=NONE guifg=NONE guibg=#121212 -end -if g:nofrils_heavycomments - hi Comment term=NONE cterm=NONE ctermfg=135 ctermbg=NONE gui=NONE guifg=#AF5FFF guibg=NONE -end -if g:nofrils_heavylinenumbers - hi LineNr term=NONE cterm=NONE ctermfg=135 ctermbg=NONE gui=NONE guifg=#AF5FFF guibg=NONE -end +" Helper Functions +function! NofrilsFocusComments() + hi Comment term=NONE cterm=NONE ctermfg=255 ctermbg=235 gui=NONE guifg=#eeeeee guibg=#262626 + hi Normal term=NONE cterm=NONE ctermfg=242 ctermbg=235 gui=NONE guifg=#eeeeee guibg=#262626 + hi LineNr term=NONE cterm=NONE ctermfg=8 ctermbg=bg gui=NONE guifg=#808080 guibg=bg + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + + if g:nofrils_heavycomments + hi Comment term=NONE cterm=NONE ctermfg=135 ctermbg=NONE gui=NONE guifg=#AF5FFF guibg=NONE + end +endfunction + +function! NofrilsFocusCode() + hi Comment term=NONE cterm=NONE ctermfg=242 ctermbg=235 gui=NONE guifg=#eeeeee guibg=#262626 + hi Normal term=NONE cterm=NONE ctermfg=255 ctermbg=235 gui=NONE guifg=#eeeeee guibg=#262626 + hi LineNr term=NONE cterm=NONE ctermfg=8 ctermbg=bg gui=NONE guifg=#808080 guibg=bg + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + + if g:nofrils_strbackgrounds + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=233 gui=NONE guifg=NONE guibg=#121212 + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=233 gui=NONE guifg=NONE guibg=#121212 + end +endfunction + +function! NofrilsNormal() + hi Comment term=NONE cterm=NONE ctermfg=242 ctermbg=NONE gui=NONE guifg=#6C6C6C guibg=NONE + hi Normal term=NONE cterm=NONE ctermfg=255 ctermbg=235 gui=NONE guifg=#eeeeee guibg=#262626 + hi LineNr term=NONE cterm=NONE ctermfg=8 ctermbg=bg gui=NONE guifg=#808080 guibg=bg + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + + " Optional Syntax Features + if g:nofrils_strbackgrounds + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=233 gui=NONE guifg=NONE guibg=#121212 + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=233 gui=NONE guifg=NONE guibg=#121212 + end + if g:nofrils_heavycomments + hi Comment term=NONE cterm=NONE ctermfg=135 ctermbg=NONE gui=NONE guifg=#AF5FFF guibg=NONE + end + if g:nofrils_heavylinenumbers + hi LineNr term=NONE cterm=NONE ctermfg=135 ctermbg=NONE gui=NONE guifg=#AF5FFF guibg=NONE + end +endfunction + +" Command mappings +command! NofrilsDark :colo nofrils-dark +command! NofrilsLight :colo nofrils-light +command! NofrilsSepia :colo nofrils-sepia +command! NofrilsAcme :colo nofrils-acme +command! NofrilsFocusNormal :call NofrilsNormal() +command! NofrilsFocusCode :call NofrilsFocusCode() +command! NofrilsFocusComments :call NofrilsFocusComments() + +" Setup normal settings +call NofrilsNormal() diff --git a/.vim/bundle/nofrils/colors/nofrils-light.vim b/.vim/bundle/nofrils/colors/nofrils-light.vim index a832602..787e3bb 100644 --- a/.vim/bundle/nofrils/colors/nofrils-light.vim +++ b/.vim/bundle/nofrils/colors/nofrils-light.vim @@ -21,6 +21,8 @@ if !exists("g:nofrils_heavylinenumbers") let g:nofrils_heavylinenumbers = 0 endif +set background=light + " Baseline hi Normal term=NONE cterm=NONE ctermfg=black ctermbg=255 gui=NONE guifg=#000000 guibg=#E4E4E4 @@ -37,10 +39,10 @@ hi StatusLineNC term=NONE cterm=NONE ctermfg=fg ctermbg=248 gui=NONE guifg=fg gu hi VertSplit term=NONE cterm=NONE ctermfg=fg ctermbg=248 gui=NONE guifg=fg guibg=#A8A8A8 " Highlighted -hi CursorColumn term=NONE cterm=NONE ctermfg=NONE ctermbg=white gui=NONE guifg=NONE guibg=white +hi CursorColumn term=NONE cterm=NONE ctermfg=NONE ctermbg=253 gui=NONE guifg=NONE guibg=#DADADA hi CursorIM term=NONE cterm=NONE ctermfg=fg ctermbg=4 gui=NONE guifg=fg guibg=#00FFFF hi CursorLineNr term=NONE cterm=NONE ctermfg=NONE ctermbg=white gui=NONE guifg=NONE guibg=white -hi CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=white gui=NONE guifg=NONE guibg=white +hi CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=253 gui=NONE guifg=NONE guibg=#DADADA hi Cursor term=NONE cterm=NONE ctermfg=fg ctermbg=4 gui=NONE guifg=fg guibg=#00FFFF hi Directory term=NONE cterm=NONE ctermfg=53 ctermbg=NONE gui=NONE guifg=#5F005F guibg=NONE hi ErrorMsg term=NONE cterm=NONE ctermfg=9 ctermbg=white gui=NONE guifg=#FF5555 guibg=white @@ -54,8 +56,8 @@ hi Question term=NONE cterm=NONE ctermfg=53 ctermbg=NONE gui=NONE guifg=#5F005F hi Search term=NONE cterm=NONE ctermfg=white ctermbg=6 gui=NONE guifg=white guibg=#00CDCD hi StatusLine term=NONE cterm=NONE ctermfg=white ctermbg=black gui=NONE guifg=white guibg=#000000 hi Todo term=NONE cterm=NONE ctermfg=2 ctermbg=NONE gui=NONE guifg=#008000 guibg=NONE -hi VisualNOS term=NONE cterm=NONE ctermfg=NONE ctermbg=53 gui=NONE guifg=NONE guibg=#5F005F hi WarningMsg term=NONE cterm=NONE ctermfg=9 ctermbg=white gui=NONE guifg=#FF5555 guibg=white +hi WildMenu term=NONE cterm=NONE ctermfg=black ctermbg=white gui=NONE guifg=#000000 guibg=white " Reversed hi PmenuSbar term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE @@ -63,7 +65,7 @@ hi Pmenu term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg= hi PmenuThumb term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE hi TabLineSel term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE hi Visual term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE -hi WildMenu term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE +hi VisualNOS term=reverse,underline cterm=reverse,underline ctermfg=NONE ctermbg=NONE gui=reverse,underline guifg=NONE guibg=NONE " Diff hi DiffAdd term=NONE cterm=NONE ctermfg=2 ctermbg=NONE gui=NONE guifg=#008000 guibg=NONE @@ -123,19 +125,65 @@ hi Type term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg hi Underlined term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE " Sneak -hi SneakPluginScope term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE -hi SneakStreakMask term=NONE cterm=NONE ctermfg=black ctermbg=darkgreen gui=NONE guifg=black guibg=darkgreen -hi SneakStreakStatusLine term=NONE cterm=NONE ctermfg=black ctermbg=darkgreen gui=NONE guifg=black guibg=darkgreen -hi SneakStreakTarget term=NONE cterm=NONE ctermfg=black ctermbg=green gui=NONE guifg=black guibg=green +hi SneakLabelMask term=NONE cterm=NONE ctermfg=black ctermbg=195 gui=NONE guifg=black guibg=#d7ffff +hi SneakTarget term=NONE cterm=NONE ctermfg=black ctermbg=195 gui=NONE guifg=black guibg=#d7ffff +hi SneakLabelTarget term=NONE cterm=NONE ctermfg=black ctermbg=183 gui=NONE guifg=black guibg=#d7afff +hi SneakScope term=NONE cterm=NONE ctermfg=black ctermbg=183 gui=NONE guifg=black guibg=#d7afff -" Optional Syntax Features -if g:nofrils_strbackgrounds - hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=253 gui=NONE guifg=NONE guibg=#DADADA - hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=253 gui=NONE guifg=NONE guibg=#DADADA -end -if g:nofrils_heavycomments - hi Comment term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005F guibg=NONE -end -if g:nofrils_heavylinenumbers - hi LineNr term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005F guibg=NONE -end +" Helper Functions +function! NofrilsFocusComments() + hi Comment term=NONE cterm=NONE ctermfg=black ctermbg=NONE gui=NONE guifg=#A8A8A8 guibg=NONE + hi Normal term=NONE cterm=NONE ctermfg=248 ctermbg=255 gui=NONE guifg=#000000 guibg=#E4E4E4 + hi LineNr term=NONE cterm=NONE ctermfg=248 ctermbg=bg gui=NONE guifg=#A8A8A8 guibg=NONE + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + + if g:nofrils_heavycomments + hi Comment term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005F guibg=NONE + end +endfunction + +function! NofrilsFocusCode() + hi Comment term=NONE cterm=NONE ctermfg=248 ctermbg=NONE gui=NONE guifg=#A8A8A8 guibg=NONE + hi Normal term=NONE cterm=NONE ctermfg=black ctermbg=255 gui=NONE guifg=#000000 guibg=#E4E4E4 + hi LineNr term=NONE cterm=NONE ctermfg=248 ctermbg=bg gui=NONE guifg=#A8A8A8 guibg=NONE + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + + if g:nofrils_strbackgrounds + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=253 gui=NONE guifg=NONE guibg=#DADADA + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=253 gui=NONE guifg=NONE guibg=#DADADA + end +endfunction + +function! NofrilsNormal() + hi Comment term=NONE cterm=NONE ctermfg=248 ctermbg=NONE gui=NONE guifg=#A8A8A8 guibg=NONE + hi Normal term=NONE cterm=NONE ctermfg=black ctermbg=255 gui=NONE guifg=#000000 guibg=#E4E4E4 + hi LineNr term=NONE cterm=NONE ctermfg=248 ctermbg=bg gui=NONE guifg=#A8A8A8 guibg=NONE + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + + " Optional Syntax Features + if g:nofrils_strbackgrounds + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=253 gui=NONE guifg=NONE guibg=#DADADA + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=253 gui=NONE guifg=NONE guibg=#DADADA + end + if g:nofrils_heavycomments + hi Comment term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005F guibg=NONE + end + if g:nofrils_heavylinenumbers + hi LineNr term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005F guibg=NONE + end +endfunction + +" Command mappings +command! NofrilsDark :colo nofrils-dark +command! NofrilsLight :colo nofrils-light +command! NofrilsSepia :colo nofrils-sepia +command! NofrilsAcme :colo nofrils-acme +command! NofrilsFocusNormal :call NofrilsNormal() +command! NofrilsFocusCode :call NofrilsFocusCode() +command! NofrilsFocusComments :call NofrilsFocusComments() + +" Setup normal settings +call NofrilsNormal() diff --git a/.vim/bundle/nofrils/colors/nofrils-sepia.vim b/.vim/bundle/nofrils/colors/nofrils-sepia.vim index 0194b8d..f84aa7d 100644 --- a/.vim/bundle/nofrils/colors/nofrils-sepia.vim +++ b/.vim/bundle/nofrils/colors/nofrils-sepia.vim @@ -21,6 +21,8 @@ if !exists("g:nofrils_heavylinenumbers") let g:nofrils_heavylinenumbers = 0 endif +set background=light + " Baseline hi Normal term=NONE cterm=NONE ctermfg=black ctermbg=223 gui=NONE guifg=#000000 guibg=#ffdfaf @@ -37,10 +39,10 @@ hi StatusLineNC term=NONE cterm=NONE ctermfg=fg ctermbg=136 gui=NONE guifg=fg gu hi VertSplit term=NONE cterm=NONE ctermfg=fg ctermbg=136 gui=NONE guifg=fg guibg=#af8700 " Highlight -hi CursorColumn term=NONE cterm=NONE ctermfg=NONE ctermbg=224 gui=NONE guifg=NONE guibg=#ffdfdf +hi CursorColumn term=NONE cterm=NONE ctermfg=NONE ctermbg=225 gui=NONE guifg=NONE guibg=#ffdfff hi CursorIM term=NONE cterm=NONE ctermfg=fg ctermbg=4 gui=NONE guifg=fg guibg=#00FFFF -hi CursorLineNr term=NONE cterm=NONE ctermfg=NONE ctermbg=224 gui=NONE guifg=NONE guibg=#ffdfdf -hi CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=224 gui=NONE guifg=NONE guibg=#ffdfdf +hi CursorLineNr term=NONE cterm=NONE ctermfg=NONE ctermbg=225 gui=NONE guifg=NONE guibg=#ffdfff +hi CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=225 gui=NONE guifg=NONE guibg=#ffdfff hi Cursor term=NONE cterm=NONE ctermfg=fg ctermbg=4 gui=NONE guifg=fg guibg=#00FFFF hi Directory term=NONE cterm=NONE ctermfg=53 ctermbg=NONE gui=NONE guifg=#5F005F guibg=NONE hi ErrorMsg term=NONE cterm=NONE ctermfg=9 ctermbg=white gui=NONE guifg=#FF5555 guibg=white @@ -54,8 +56,8 @@ hi Question term=NONE cterm=NONE ctermfg=53 ctermbg=NONE gui=NONE guifg=#5F005F hi Search term=NONE cterm=NONE ctermfg=white ctermbg=6 gui=NONE guifg=white guibg=#00CDCD hi StatusLine term=NONE cterm=NONE ctermfg=white ctermbg=fg gui=NONE guifg=white guibg=#000000 hi Todo term=NONE cterm=NONE ctermfg=2 ctermbg=NONE gui=NONE guifg=#008000 guibg=NONE -hi VisualNOS term=NONE cterm=NONE ctermfg=NONE ctermbg=53 gui=NONE guifg=NONE guibg=#5F005F hi WarningMsg term=NONE cterm=NONE ctermfg=9 ctermbg=white gui=NONE guifg=#FF5555 guibg=white +hi WildMenu term=NONE cterm=NONE ctermfg=fg ctermbg=white gui=NONE guifg=#000000 guibg=white " Reversed hi PmenuSbar term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE @@ -63,7 +65,7 @@ hi Pmenu term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg= hi PmenuThumb term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE hi TabLineSel term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE hi Visual term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE -hi WildMenu term=reverse cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE +hi VisualNOS term=reverse,underline cterm=reverse,underline ctermfg=NONE ctermbg=NONE gui=reverse,underline guifg=NONE guibg=NONE " Diff hi DiffAdd term=NONE cterm=NONE ctermfg=2 ctermbg=NONE gui=NONE guifg=#008000 guibg=NONE @@ -123,19 +125,65 @@ hi Type term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg hi Underlined term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE " Sneak -hi SneakPluginScope term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE -hi SneakStreakMask term=NONE cterm=NONE ctermfg=fg ctermbg=darkgreen gui=NONE guifg=black guibg=darkgreen -hi SneakStreakStatusLine term=NONE cterm=NONE ctermfg=fg ctermbg=darkgreen gui=NONE guifg=black guibg=darkgreen -hi SneakStreakTarget term=NONE cterm=NONE ctermfg=fg ctermbg=green gui=NONE guifg=black guibg=green +hi SneakLabelMask term=NONE cterm=NONE ctermfg=black ctermbg=195 gui=NONE guifg=black guibg=#d7ffff +hi SneakTarget term=NONE cterm=NONE ctermfg=black ctermbg=195 gui=NONE guifg=black guibg=#d7ffff +hi SneakLabelTarget term=NONE cterm=NONE ctermfg=black ctermbg=183 gui=NONE guifg=black guibg=#d7afff +hi SneakScope term=NONE cterm=NONE ctermfg=black ctermbg=183 gui=NONE guifg=black guibg=#d7afff -" Optional Syntax Features -if g:nofrils_strbackgrounds - hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=222 gui=NONE guifg=NONE guibg=#DADADA - hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=222 gui=NONE guifg=NONE guibg=#DADADA -end -if g:nofrils_heavycomments - hi Comment term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005F guibg=NONE -end -if g:nofrils_heavylinenumbers - hi LineNr term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005F guibg=NONE -end +" Helper Functions +function! NofrilsFocusComments() + hi Comment term=NONE cterm=NONE ctermfg=black ctermbg=NONE gui=NONE guifg=#af8700 guibg=NONE + hi Normal term=NONE cterm=NONE ctermfg=136 ctermbg=223 gui=NONE guifg=#000000 guibg=#ffdfaf + hi LineNr term=NONE cterm=NONE ctermfg=136 ctermbg=bg gui=NONE guifg=#af8700 guibg=NONE + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + + if g:nofrils_heavycomments + hi Comment term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005F guibg=NONE + end +endfunction + +function! NofrilsFocusCode() + hi Comment term=NONE cterm=NONE ctermfg=136 ctermbg=NONE gui=NONE guifg=#af8700 guibg=NONE + hi Normal term=NONE cterm=NONE ctermfg=black ctermbg=223 gui=NONE guifg=#000000 guibg=#ffdfaf + hi LineNr term=NONE cterm=NONE ctermfg=136 ctermbg=bg gui=NONE guifg=#af8700 guibg=NONE + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + + if g:nofrils_strbackgrounds + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=222 gui=NONE guifg=NONE guibg=#ffdf87 + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=222 gui=NONE guifg=NONE guibg=#ffdf87 + end +endfunction + +function! NofrilsNormal() + hi Comment term=NONE cterm=NONE ctermfg=136 ctermbg=NONE gui=NONE guifg=#af8700 guibg=NONE + hi Normal term=NONE cterm=NONE ctermfg=black ctermbg=223 gui=NONE guifg=#000000 guibg=#ffdfaf + hi LineNr term=NONE cterm=NONE ctermfg=136 ctermbg=bg gui=NONE guifg=#af8700 guibg=NONE + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE + + " Optional Syntax Features + if g:nofrils_strbackgrounds + hi Character term=NONE cterm=NONE ctermfg=NONE ctermbg=222 gui=NONE guifg=NONE guibg=#DADADA + hi String term=NONE cterm=NONE ctermfg=NONE ctermbg=222 gui=NONE guifg=NONE guibg=#ffdf87 + end + if g:nofrils_heavycomments + hi Comment term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005F guibg=NONE + end + if g:nofrils_heavylinenumbers + hi LineNr term=NONE cterm=NONE ctermfg=89 ctermbg=NONE gui=NONE guifg=#87005F guibg=NONE + end +endfunction + +" Command mappings +command! NofrilsDark :colo nofrils-dark +command! NofrilsLight :colo nofrils-light +command! NofrilsSepia :colo nofrils-sepia +command! NofrilsAcme :colo nofrils-acme +command! NofrilsFocusNormal :call NofrilsNormal() +command! NofrilsFocusCode :call NofrilsFocusCode() +command! NofrilsFocusComments :call NofrilsFocusComments() + +" Setup normal settings +call NofrilsNormal() diff --git a/.vim/bundle/nofrils/generate_colors.go b/.vim/bundle/nofrils/generate_colors.go new file mode 100644 index 0000000..7f9f424 --- /dev/null +++ b/.vim/bundle/nofrils/generate_colors.go @@ -0,0 +1,458 @@ +package main + +import ( + "html/template" + "log" + "os" +) + +func main() { + tmpl := template.New("schemes.tmpl") + template.Must(tmpl.ParseFiles("schemes.tmpl")) + + cursorLineRow := vimColorRow{FG: colors["NONE"], BG: colors["White"], Attr: "NONE"} + cursorRow := vimColorRow{FG: colors["Aqua"], BG: colors["FG"], Attr: "NONE"} + diffAddRow := vimColorRow{FG: colors["Green1"], BG: colors["NONE"], Attr: "NONE"} + diffChangeRow := vimColorRow{FG: colors["Orange4"], BG: colors["NONE"], Attr: "NONE"} + diffDeleteRow := vimColorRow{FG: colors["Maroon"], BG: colors["NONE"], Attr: "NONE"} + diffTextRow := vimColorRow{FG: colors["Navy"], BG: colors["NONE"], Attr: "NONE"} + directoryRow := vimColorRow{FG: colors["DeepPink7"], BG: colors["NONE"], Attr: "NONE"} + errorRow := vimColorRow{FG: colors["Red1"], BG: colors["White"], Attr: "NONE"} + fadedRow := vimColorRow{FG: colors["SandyBrown"], BG: colors["NONE"], Attr: "NONE"} + foldedRow := vimColorRow{FG: colors["Grey35"], BG: colors["NONE"], Attr: "NONE"} + matchParenRow := vimColorRow{FG: colors["White"], BG: colors["Navy"], Attr: "NONE"} + noneRow := vimColorRow{FG: colors["NONE"], BG: colors["NONE"], Attr: "NONE"} + normalRow := vimColorRow{FG: colors["Black"], BG: colors["Cornsilk"], Attr: "NONE"} + searchRow := vimColorRow{FG: colors["White"], BG: colors["Green1"], Attr: "NONE"} + spellRow := vimColorRow{FG: colors["Purple2"], BG: colors["NONE"], Attr: "underline"} + statusLineRow := vimColorRow{FG: colors["Black"], BG: colors["Plum2"], Attr: "NONE"} + vertSplitRow := vimColorRow{FG: colors["Black"], BG: colors["LightCyan2"], Attr: "NONE"} + visualSelectRow := vimColorRow{FG: colors["FG"], BG: colors["LightGoldenrod5"], Attr: "NONE"} + heavyCommentRow := vimColorRow{FG: colors["DeepPink8"], BG: colors["NONE"], Attr: "NONE"} + heavyStringRow := vimColorRow{FG: colors["Grey100"], BG: colors["NONE"], Attr: "NONE"} + heavyLineRow := vimColorRow{FG: colors["DeepPink8"], BG: colors["NONE"], Attr: "NONE"} + + pmenuRow := reverse(normalRow) + visualNOSRow := reverse(directoryRow) + commentRow := reverse(visualSelectRow) + + nft := nofrilsTheme{ + Name: "No Frils Acme", + Slug: "nofrils-acme", + FadedRow: fadedRow, + NoneRow: noneRow, + NormalRow: normalRow, + CommentRow: commentRow, + HeavyCommentRow: heavyCommentRow, + HeavyStringRow: heavyStringRow, + HeavyLineRow: heavyLineRow, + + Rows: []vimColorRow{ + withName("Normal", normalRow), + withName("ColorColumn", cursorLineRow), + withName("MatchParen", matchParenRow), + withName("PmenuSel", statusLineRow), + withName("Visual", visualSelectRow), + withName("VisualNOS", visualNOSRow), + withName("Todo", diffAddRow), + + withName("Comment", commentRow), + + withName("FoldColumn", fadedRow), + withName("LineNr", fadedRow), + withName("NonText", fadedRow), + + withName("Folded", foldedRow), + withName("SignColumn", foldedRow), + withName("SpecialKey", foldedRow), + + withName("TabLineFill", vertSplitRow), + withName("TabLine", vertSplitRow), + withName("StatusLineNC", vertSplitRow), + withName("VertSplit", vertSplitRow), + + withName("TabLineSel", statusLineRow), + withName("StatusLine", statusLineRow), + withName("SneakLabelTarget", statusLineRow), + withName("SneakScope", statusLineRow), + + withName("CursorColumn", cursorLineRow), + withName("CursorLineNr", cursorLineRow), + withName("CursorLine", cursorLineRow), + + withName("CursorIM", cursorRow), + withName("Cursor", cursorRow), + + withName("Directory", directoryRow), + withName("ModeMsg", directoryRow), + withName("MoreMsg", directoryRow), + withName("Question", directoryRow), + + withName("Error", errorRow), + withName("ErrorMsg", errorRow), + withName("WarningMsg", errorRow), + + withName("IncSearch", searchRow), + withName("Search", searchRow), + + withName("PmenuSbar", pmenuRow), + withName("Pmenu", pmenuRow), + withName("PmenuThumb", pmenuRow), + withName("WildMenu", pmenuRow), + + withName("DiffAdd", diffAddRow), + withName("DiffChange", diffChangeRow), + withName("DiffDelete", diffDeleteRow), + withName("DiffText", diffTextRow), + + withName("SpellBad", spellRow), + withName("SpellCap", spellRow), + withName("SpellLocal", spellRow), + withName("SpellRare", spellRow), + + withName("SneakLabelMask", vertSplitRow), + withName("SneakTarget", vertSplitRow), + + withName("Menu", noneRow), + withName("Scrollbar", noneRow), + withName("Tooltip", noneRow), + withName("Boolean", noneRow), + withName("Character", noneRow), + withName("Conceal", noneRow), + withName("Conditional", noneRow), + withName("Constant", noneRow), + withName("Debug", noneRow), + withName("Define", noneRow), + withName("Delimiter", noneRow), + withName("Directive", noneRow), + withName("Exception", noneRow), + withName("Float", noneRow), + withName("Format", noneRow), + withName("Function", noneRow), + withName("Identifier", noneRow), + withName("Ignore", noneRow), + withName("Include", noneRow), + withName("Keyword", noneRow), + withName("Label", noneRow), + withName("Macro", noneRow), + withName("Number", noneRow), + withName("Operator", noneRow), + withName("PreCondit", noneRow), + withName("PreProc", noneRow), + withName("Repeat", noneRow), + withName("SpecialChar", noneRow), + withName("SpecialComment", noneRow), + withName("Special", noneRow), + withName("Statement", noneRow), + withName("StorageClass", noneRow), + withName("String", noneRow), + withName("Structure", noneRow), + withName("Tag", noneRow), + withName("Title", noneRow), + withName("Typedef", noneRow), + withName("Type", noneRow), + withName("Underlined", noneRow), + }, + } + err := tmpl.Execute(os.Stdout, nft) + if err != nil { + log.Fatal(err) + } +} + +func withName(name string, vcr vimColorRow) vimColorRow { + vcr.Name = name + return vcr +} + +func reverse(vcr vimColorRow) vimColorRow { + vcr.BG, vcr.FG = vcr.FG, vcr.BG + return vcr +} + +type color struct { + TermCode string + GuiCode string +} + +type vimColorRow struct { + Name string + BG color + FG color + Attr string // only used for underline currently +} + +type nofrilsTheme struct { + Name string + Slug string + FadedRow vimColorRow + NoneRow vimColorRow + NormalRow vimColorRow + CommentRow vimColorRow + HeavyCommentRow vimColorRow + HeavyStringRow vimColorRow + HeavyLineRow vimColorRow + Rows []vimColorRow +} + +var colors = map[string]color{ + "Aqua": color{"14", "#00ffff"}, + "Aquamarine1": color{"122", "#87ffd7"}, + "Aquamarine2": color{"86", "#5fffd7"}, + "Aquamarine3": color{"79", "#5fd7af"}, + "Black": color{"0", "#000000"}, + "Blue1": color{"12", "#0000ff"}, + "Blue2": color{"21", "#0000ff"}, + "Blue3": color{"19", "#0000af"}, + "Blue4": color{"20", "#0000d7"}, + "BlueViolet": color{"57", "#5f00ff"}, + "CadetBlue1": color{"72", "#5faf87"}, + "CadetBlue2": color{"73", "#5fafaf"}, + "Chartreuse1": color{"118", "#87ff00"}, + "Chartreuse2": color{"112", "#87d700"}, + "Chartreuse3": color{"82", "#5fff00"}, + "Chartreuse4": color{"70", "#5faf00"}, + "Chartreuse5": color{"76", "#5fd700"}, + "Chartreuse6": color{"64", "#5f8700"}, + "CornflowerBlue": color{"69", "#5f87ff"}, + "Cornsilk": color{"230", "#ffffd7"}, + "Cyan1": color{"51", "#00ffff"}, + "Cyan2": color{"50", "#00ffd7"}, + "Cyan3": color{"43", "#00d7af"}, + "DarkBlue": color{"18", "#000087"}, + "DarkCyan": color{"36", "#00af87"}, + "DarkGoldenrod": color{"136", "#af8700"}, + "DarkGreen": color{"22", "#005f00"}, + "DarkKhaki": color{"143", "#afaf5f"}, + "DarkMagenta1": color{"90", "#870087"}, + "DarkMagenta2": color{"91", "#8700af"}, + "DarkOliveGreen1": color{"191", "#d7ff5f"}, + "DarkOliveGreen2": color{"192", "#d7ff87"}, + "DarkOliveGreen3": color{"155", "#afff5f"}, + "DarkOliveGreen4": color{"107", "#87af5f"}, + "DarkOliveGreen5": color{"113", "#87d75f"}, + "DarkOliveGreen6": color{"149", "#afd75f"}, + "DarkOrange1": color{"208", "#ff8700"}, + "DarkOrange2": color{"130", "#af5f00"}, + "DarkOrange3": color{"166", "#d75f00"}, + "DarkRed1": color{"52", "#5f0000"}, + "DarkRed2": color{"88", "#870000"}, + "DarkSeaGreen1": color{"108", "#87af87"}, + "DarkSeaGreen2": color{"158", "#afffd7"}, + "DarkSeaGreen3": color{"193", "#d7ffaf"}, + "DarkSeaGreen4": color{"151", "#afd7af"}, + "DarkSeaGreen5": color{"157", "#afffaf"}, + "DarkSeaGreen6": color{"115", "#87d7af"}, + "DarkSeaGreen7": color{"150", "#afd787"}, + "DarkSeaGreen8": color{"65", "#5f875f"}, + "DarkSeaGreen9": color{"71", "#5faf5f"}, + "DarkSlateGray1": color{"123", "#87ffff"}, + "DarkSlateGray2": color{"87", "#5fffff"}, + "DarkSlateGray3": color{"116", "#87d7d7"}, + "DarkTurquoise": color{"44", "#00d7d7"}, + "DarkViolet1": color{"128", "#af00d7"}, + "DarkViolet2": color{"92", "#8700d7"}, + "DeepPink1": color{"198", "#ff0087"}, + "DeepPink2": color{"199", "#ff00af"}, + "DeepPink3": color{"197", "#ff005f"}, + "DeepPink4": color{"161", "#d7005f"}, + "DeepPink5": color{"162", "#d70087"}, + "DeepPink6": color{"125", "#af005f"}, + "DeepPink7": color{"53", "#5f005f"}, + "DeepPink8": color{"89", "#87005f"}, + "DeepSkyBlue1": color{"39", "#00afff"}, + "DeepSkyBlue2": color{"38", "#00afd7"}, + "DeepSkyBlue3": color{"31", "#0087af"}, + "DeepSkyBlue4": color{"32", "#0087d7"}, + "DeepSkyBlue5": color{"23", "#005f5f"}, + "DeepSkyBlue6": color{"24", "#005f87"}, + "DeepSkyBlue7": color{"25", "#005faf"}, + "DodgerBlue1": color{"33", "#0087ff"}, + "DodgerBlue2": color{"27", "#005fff"}, + "DodgerBlue3": color{"26", "#005fd7"}, + "Fuchsia": color{"13", "#ff00ff"}, + "Gold1": color{"220", "#ffd700"}, + "Gold2": color{"142", "#afaf00"}, + "Gold3": color{"178", "#d7af00"}, + "Green1": color{"2", "#008000"}, + "Green2": color{"46", "#00ff00"}, + "Green3": color{"34", "#00af00"}, + "Green4": color{"40", "#00d700"}, + "Green5": color{"28", "#008700"}, + "GreenYellow": color{"154", "#afff00"}, + "Grey1": color{"8", "#808080"}, + "Grey0": color{"16", "#000000"}, + "Grey100": color{"231", "#ffffff"}, + "Grey11": color{"234", "#1c1c1c"}, + "Grey15": color{"235", "#262626"}, + "Grey19": color{"236", "#303030"}, + "Grey23": color{"237", "#3a3a3a"}, + "Grey27": color{"238", "#444444"}, + "Grey3": color{"232", "#080808"}, + "Grey30": color{"239", "#4e4e4e"}, + "Grey35": color{"240", "#585858"}, + "Grey37": color{"59", "#5f5f5f"}, + "Grey39": color{"241", "#626262"}, + "Grey42": color{"242", "#6c6c6c"}, + "Grey46": color{"243", "#767676"}, + "Grey50": color{"244", "#808080"}, + "Grey53": color{"102", "#878787"}, + "Grey54": color{"245", "#8a8a8a"}, + "Grey58": color{"246", "#949494"}, + "Grey62": color{"247", "#9e9e9e"}, + "Grey63": color{"139", "#af87af"}, + "Grey66": color{"248", "#a8a8a8"}, + "Grey69": color{"145", "#afafaf"}, + "Grey7": color{"233", "#121212"}, + "Grey70": color{"249", "#b2b2b2"}, + "Grey74": color{"250", "#bcbcbc"}, + "Grey78": color{"251", "#c6c6c6"}, + "Grey82": color{"252", "#d0d0d0"}, + "Grey84": color{"188", "#d7d7d7"}, + "Grey85": color{"253", "#dadada"}, + "Grey89": color{"254", "#e4e4e4"}, + "Grey93": color{"255", "#eeeeee"}, + "Honeydew": color{"194", "#d7ffd7"}, + "HotPink1": color{"205", "#ff5faf"}, + "HotPink2": color{"206", "#ff5fd7"}, + "HotPink3": color{"169", "#d75faf"}, + "HotPink4": color{"132", "#af5f87"}, + "HotPink5": color{"168", "#d75f87"}, + "IndianRed1": color{"131", "#af5f5f"}, + "IndianRed2": color{"167", "#d75f5f"}, + "IndianRed3": color{"203", "#ff5f5f"}, + "IndianRed4": color{"204", "#ff5f87"}, + "Khaki1": color{"228", "#ffff87"}, + "Khaki2": color{"185", "#d7d75f"}, + "LightCoral": color{"210", "#ff8787"}, + "LightCyan2": color{"195", "#d7ffff"}, + "LightCyan3": color{"152", "#afd7d7"}, + "LightGoldenrod1": color{"227", "#ffff5f"}, + "LightGoldenrod2": color{"186", "#d7d787"}, + "LightGoldenrod3": color{"221", "#ffd75f"}, + "LightGoldenrod4": color{"222", "#ffd787"}, + "LightGoldenrod5": color{"179", "#d7af5f"}, + "LightGreen1": color{"119", "#87ff5f"}, + "LightGreen2": color{"120", "#87ff87"}, + "LightPink1": color{"217", "#ffafaf"}, + "LightPink2": color{"174", "#d78787"}, + "LightPink3": color{"95", "#875f5f"}, + "LightSalmon1": color{"216", "#ffaf87"}, + "LightSalmon2": color{"137", "#af875f"}, + "LightSalmon3": color{"173", "#d7875f"}, + "LightSeaGreen": color{"37", "#00afaf"}, + "LightSkyBlue1": color{"153", "#afd7ff"}, + "LightSkyBlue2": color{"109", "#87afaf"}, + "LightSkyBlue3": color{"110", "#87afd7"}, + "LightSlateBlue": color{"105", "#8787ff"}, + "LightSlateGrey": color{"103", "#8787af"}, + "LightSteelBlue1": color{"147", "#afafff"}, + "LightSteelBlue2": color{"189", "#d7d7ff"}, + "LightSteelBlue3": color{"146", "#afafd7"}, + "LightYellow": color{"187", "#d7d7af"}, + "Lime": color{"10", "#00ff00"}, + "Magenta1": color{"201", "#ff00ff"}, + "Magenta2": color{"165", "#d700ff"}, + "Magenta3": color{"200", "#ff00d7"}, + "Magenta4": color{"127", "#af00af"}, + "Magenta5": color{"163", "#d700af"}, + "Magenta6": color{"164", "#d700d7"}, + "Maroon": color{"1", "#800000"}, + "MediumOrchid1": color{"134", "#af5fd7"}, + "MediumOrchid2": color{"171", "#d75fff"}, + "MediumOrchid3": color{"207", "#ff5fff"}, + "MediumOrchid4": color{"133", "#af5faf"}, + "MediumPurple1": color{"104", "#8787d7"}, + "MediumPurple2": color{"141", "#af87ff"}, + "MediumPurple3": color{"135", "#af5fff"}, + "MediumPurple4": color{"140", "#af87d7"}, + "MediumPurple5": color{"97", "#875faf"}, + "MediumPurple6": color{"98", "#875fd7"}, + "MediumPurple7": color{"60", "#5f5f87"}, + "MediumSpringGreen": color{"49", "#00ffaf"}, + "MediumTurquoise": color{"80", "#5fd7d7"}, + "MediumVioletRed": color{"126", "#af0087"}, + "MistyRose1": color{"224", "#ffd7d7"}, + "MistyRose2": color{"181", "#d7afaf"}, + "NavajoWhite1": color{"223", "#ffd7af"}, + "NavajoWhite2": color{"144", "#afaf87"}, + "Navy": color{"4", "#000080"}, + "NavyBlue": color{"17", "#00005f"}, + "Olive": color{"3", "#808000"}, + "Orange1": color{"214", "#ffaf00"}, + "Orange2": color{"172", "#d78700"}, + "Orange3": color{"58", "#5f5f00"}, + "Orange4": color{"94", "#875f00"}, + "OrangeRed": color{"202", "#ff5f00"}, + "Orchid1": color{"170", "#d75fd7"}, + "Orchid2": color{"213", "#ff87ff"}, + "Orchid3": color{"212", "#ff87d7"}, + "PaleGreen1": color{"121", "#87ffaf"}, + "PaleGreen2": color{"156", "#afff87"}, + "PaleGreen3": color{"114", "#87d787"}, + "PaleGreen4": color{"77", "#5fd75f"}, + "PaleTurquoise1": color{"159", "#afffff"}, + "PaleTurquoise2": color{"66", "#5f8787"}, + "PaleVioletRed": color{"211", "#ff87af"}, + "Pink1": color{"218", "#ffafd7"}, + "Pink2": color{"175", "#d787af"}, + "Plum1": color{"219", "#ffafff"}, + "Plum2": color{"183", "#d7afff"}, + "Plum3": color{"176", "#d787d7"}, + "Plum4": color{"96", "#875f87"}, + "Purple1": color{"129", "#af00ff"}, + "Purple2": color{"5", "#800080"}, + "Purple3": color{"93", "#8700ff"}, + "Purple4": color{"56", "#5f00d7"}, + "Purple5": color{"54", "#5f0087"}, + "Purple6": color{"55", "#5f00af"}, + "Red1": color{"9", "#ff0000"}, + "Red2": color{"196", "#ff0000"}, + "Red3": color{"124", "#af0000"}, + "Red4": color{"160", "#d70000"}, + "RosyBrown": color{"138", "#af8787"}, + "RoyalBlue": color{"63", "#5f5fff"}, + "Salmon": color{"209", "#ff875f"}, + "SandyBrown": color{"215", "#ffaf5f"}, + "SeaGreen1": color{"84", "#5fff87"}, + "SeaGreen2": color{"85", "#5fffaf"}, + "SeaGreen3": color{"83", "#5fff5f"}, + "SeaGreen4": color{"78", "#5fd787"}, + "Silver": color{"7", "#c0c0c0"}, + "SkyBlue1": color{"117", "#87d7ff"}, + "SkyBlue2": color{"111", "#87afff"}, + "SkyBlue3": color{"74", "#5fafd7"}, + "SlateBlue1": color{"99", "#875fff"}, + "SlateBlue2": color{"61", "#5f5faf"}, + "SlateBlue3": color{"62", "#5f5fd7"}, + "SpringGreen1": color{"48", "#00ff87"}, + "SpringGreen2": color{"42", "#00d787"}, + "SpringGreen3": color{"47", "#00ff5f"}, + "SpringGreen4": color{"35", "#00af5f"}, + "SpringGreen5": color{"41", "#00d75f"}, + "SpringGreen6": color{"29", "#00875f"}, + "SteelBlue1": color{"67", "#5f87af"}, + "SteelBlue2": color{"75", "#5fafff"}, + "SteelBlue3": color{"81", "#5fd7ff"}, + "SteelBlue4": color{"68", "#5f87d7"}, + "Tan": color{"180", "#d7af87"}, + "Teal": color{"6", "#008080"}, + "Thistle1": color{"225", "#ffd7ff"}, + "Thistle2": color{"182", "#d7afd7"}, + "Turquoise1": color{"45", "#00d7ff"}, + "Turquoise2": color{"30", "#008787"}, + "Violet": color{"177", "#d787ff"}, + "Wheat1": color{"229", "#ffffaf"}, + "Wheat2": color{"101", "#87875f"}, + "White": color{"15", "#ffffff"}, + "Yellow1": color{"11", "#ffff00"}, + "Yellow2": color{"226", "#ffff00"}, + "Yellow3": color{"190", "#d7ff00"}, + "Yellow4": color{"148", "#afd700"}, + "Yellow5": color{"184", "#d7d700"}, + "Yellow6": color{"100", "#878700"}, + "Yellow7": color{"106", "#87af00"}, + "FG": color{"fg", "fg"}, + "BG": color{"bg", "bg"}, + "NONE": color{"NONE", "NONE"}, +} diff --git a/.vim/bundle/nofrils/schemes.tmpl b/.vim/bundle/nofrils/schemes.tmpl new file mode 100644 index 0000000..948f7e9 --- /dev/null +++ b/.vim/bundle/nofrils/schemes.tmpl @@ -0,0 +1,86 @@ +" Name: {{.Name}} Colorscheme +" Author: robertmeta (on Github) +" URL: https://github.com/robertmeta/nofrils +" (see this url for latest release & screenshots) +" License: OSI approved MIT license + +hi clear +if exists("syntax_on") + syntax reset +endif + +let g:colors_name = "{{.Slug}}" + +if !exists("g:nofrils_strbackgrounds") + let g:nofrils_strbackgrounds = 0 +endif +if !exists("g:nofrils_heavycomments") + let g:nofrils_heavycomments = 0 +endif +if !exists("g:nofrils_heavylinenumbers") + let g:nofrils_heavylinenumbers = 0 +endif + +" Baseline{{range .Rows}} +hi {{.Name}} {{if .FG.TermCode}}ctermfg={{.FG.TermCode}} {{end}}{{if .BG.TermCode}}ctermbg={{.BG.TermCode}} {{end}}{{if .FG.GuiCode}}guifg={{.FG.GuiCode}} {{end}}{{if .BG.GuiCode}}guibg={{.BG.GuiCode}} {{end}}{{if .Attr}}term={{.Attr}} cterm={{.Attr}} gui={{.Attr}}{{end}}{{end}} + +" Helper Functions +function! NofrilsFocusComments() + hi Comment {{if .NormalRow.FG.TermCode}}ctermfg={{.NormalRow.FG.TermCode}} {{end}}{{if .NormalRow.BG.TermCode}}ctermbg={{.NormalRow.BG.TermCode}} {{end}}{{if .NormalRow.FG.GuiCode}}guifg={{.NormalRow.FG.GuiCode}} {{end}}{{if .NormalRow.BG.GuiCode}}guibg={{.NormalRow.BG.GuiCode}} {{end}}{{if .NormalRow.Attr}}term={{.NormalRow.Attr}} cterm={{.NormalRow.Attr}} gui={{.NormalRow.Attr}}{{end}} + if g:nofrils_heavycomments + hi Comment {{if .HeavyCommentRow.FG.TermCode}}ctermfg={{.HeavyCommentRow.FG.TermCode}} {{end}}{{if .HeavyCommentRow.BG.TermCode}}ctermbg={{.HeavyCommentRow.BG.TermCode}} {{end}}{{if .HeavyCommentRow.FG.GuiCode}}guifg={{.HeavyCommentRow.FG.GuiCode}} {{end}}{{if .HeavyCommentRow.BG.GuiCode}}guibg={{.HeavyCommentRow.BG.GuiCode}} {{end}}{{if .HeavyCommentRow.Attr}}term={{.HeavyCommentRow.Attr}} cterm={{.HeavyCommentRow.Attr}} gui={{.HeavyCommentRow.Attr}}{{end}} + end + + hi Normal {{if .FadedRow.FG.TermCode}}ctermfg={{.FadedRow.FG.TermCode}} {{end}}{{if .FadedRow.BG.TermCode}}ctermbg={{.FadedRow.BG.TermCode}} {{end}}{{if .FadedRow.FG.GuiCode}}guifg={{.FadedRow.FG.GuiCode}} {{end}}{{if .FadedRow.BG.GuiCode}}guibg={{.FadedRow.BG.GuiCode}} {{end}}{{if .FadedRow.Attr}}term={{.FadedRow.Attr}} cterm={{.FadedRow.Attr}} gui={{.FadedRow.Attr}}{{end}} + hi LineNr {{if .FadedRow.FG.TermCode}}ctermfg={{.FadedRow.FG.TermCode}} {{end}}{{if .FadedRow.BG.TermCode}}ctermbg={{.FadedRow.BG.TermCode}} {{end}}{{if .FadedRow.FG.GuiCode}}guifg={{.FadedRow.FG.GuiCode}} {{end}}{{if .FadedRow.BG.GuiCode}}guibg={{.FadedRow.BG.GuiCode}} {{end}}{{if .FadedRow.Attr}}term={{.FadedRow.Attr}} cterm={{.FadedRow.Attr}} gui={{.FadedRow.Attr}}{{end}} + hi Character {{if .FadedRow.FG.TermCode}}ctermfg={{.FadedRow.FG.TermCode}} {{end}}{{if .FadedRow.BG.TermCode}}ctermbg={{.FadedRow.BG.TermCode}} {{end}}{{if .FadedRow.FG.GuiCode}}guifg={{.FadedRow.FG.GuiCode}} {{end}}{{if .FadedRow.BG.GuiCode}}guibg={{.FadedRow.BG.GuiCode}} {{end}}{{if .FadedRow.Attr}}term={{.FadedRow.Attr}} cterm={{.FadedRow.Attr}} gui={{.FadedRow.Attr}}{{end}} + hi String {{if .FadedRow.FG.TermCode}}ctermfg={{.FadedRow.FG.TermCode}} {{end}}{{if .FadedRow.BG.TermCode}}ctermbg={{.FadedRow.BG.TermCode}} {{end}}{{if .FadedRow.FG.GuiCode}}guifg={{.FadedRow.FG.GuiCode}} {{end}}{{if .FadedRow.BG.GuiCode}}guibg={{.FadedRow.BG.GuiCode}} {{end}}{{if .FadedRow.Attr}}term={{.FadedRow.Attr}} cterm={{.FadedRow.Attr}} gui={{.FadedRow.Attr}}{{end}} +endfunction + +function! NofrilsFocusCode() + hi Normal {{if .NormalRow.FG.TermCode}}ctermfg={{.NormalRow.FG.TermCode}} {{end}}{{if .NormalRow.BG.TermCode}}ctermbg={{.NormalRow.BG.TermCode}} {{end}}{{if .NormalRow.FG.GuiCode}}guifg={{.NormalRow.FG.GuiCode}} {{end}}{{if .NormalRow.BG.GuiCode}}guibg={{.NormalRow.BG.GuiCode}} {{end}}{{if .NormalRow.Attr}}term={{.NormalRow.Attr}} cterm={{.NormalRow.Attr}} gui={{.NormalRow.Attr}}{{end}} + if g:nofrils_strbackgrounds + hi Character {{if .HeavyStringRow.FG.TermCode}}ctermfg={{.HeavyStringRow.FG.TermCode}} {{end}}{{if .HeavyStringRow.BG.TermCode}}ctermbg={{.HeavyStringRow.BG.TermCode}} {{end}}{{if .HeavyStringRow.FG.GuiCode}}guifg={{.HeavyStringRow.FG.GuiCode}} {{end}}{{if .HeavyStringRow.BG.GuiCode}}guibg={{.HeavyStringRow.BG.GuiCode}} {{end}}{{if .HeavyStringRow.Attr}}term={{.HeavyStringRow.Attr}} cterm={{.HeavyStringRow.Attr}} gui={{.HeavyStringRow.Attr}}{{end}} + hi String {{if .HeavyStringRow.FG.TermCode}}ctermfg={{.HeavyStringRow.FG.TermCode}} {{end}}{{if .HeavyStringRow.BG.TermCode}}ctermbg={{.HeavyStringRow.BG.TermCode}} {{end}}{{if .HeavyStringRow.FG.GuiCode}}guifg={{.HeavyStringRow.FG.GuiCode}} {{end}}{{if .HeavyStringRow.BG.GuiCode}}guibg={{.HeavyStringRow.BG.GuiCode}} {{end}}{{if .HeavyStringRow.Attr}}term={{.HeavyStringRow.Attr}} cterm={{.HeavyStringRow.Attr}} gui={{.HeavyStringRow.Attr}}{{end}} + end + + hi Comment {{if .FadedRow.FG.TermCode}}ctermfg={{.FadedRow.FG.TermCode}} {{end}}{{if .FadedRow.BG.TermCode}}ctermbg={{.FadedRow.BG.TermCode}} {{end}}{{if .FadedRow.FG.GuiCode}}guifg={{.FadedRow.FG.GuiCode}} {{end}}{{if .FadedRow.BG.GuiCode}}guibg={{.FadedRow.BG.GuiCode}} {{end}}{{if .FadedRow.Attr}}term={{.FadedRow.Attr}} cterm={{.FadedRow.Attr}} gui={{.FadedRow.Attr}}{{end}} + hi LineNr {{if .FadedRow.FG.TermCode}}ctermfg={{.FadedRow.FG.TermCode}} {{end}}{{if .FadedRow.BG.TermCode}}ctermbg={{.FadedRow.BG.TermCode}} {{end}}{{if .FadedRow.FG.GuiCode}}guifg={{.FadedRow.FG.GuiCode}} {{end}}{{if .FadedRow.BG.GuiCode}}guibg={{.FadedRow.BG.GuiCode}} {{end}}{{if .FadedRow.Attr}}term={{.FadedRow.Attr}} cterm={{.FadedRow.Attr}} gui={{.FadedRow.Attr}}{{end}} + hi Character {{if .FadedRow.FG.TermCode}}ctermfg={{.FadedRow.FG.TermCode}} {{end}}{{if .FadedRow.BG.TermCode}}ctermbg={{.FadedRow.BG.TermCode}} {{end}}{{if .FadedRow.FG.GuiCode}}guifg={{.FadedRow.FG.GuiCode}} {{end}}{{if .FadedRow.BG.GuiCode}}guibg={{.FadedRow.BG.GuiCode}} {{end}}{{if .FadedRow.Attr}}term={{.FadedRow.Attr}} cterm={{.FadedRow.Attr}} gui={{.FadedRow.Attr}}{{end}} + hi String {{if .FadedRow.FG.TermCode}}ctermfg={{.FadedRow.FG.TermCode}} {{end}}{{if .FadedRow.BG.TermCode}}ctermbg={{.FadedRow.BG.TermCode}} {{end}}{{if .FadedRow.FG.GuiCode}}guifg={{.FadedRow.FG.GuiCode}} {{end}}{{if .FadedRow.BG.GuiCode}}guibg={{.FadedRow.BG.GuiCode}} {{end}}{{if .FadedRow.Attr}}term={{.FadedRow.Attr}} cterm={{.FadedRow.Attr}} gui={{.FadedRow.Attr}}{{end}} + +endfunction + +function! NofrilsNormal() + hi Normal {{if .NormalRow.FG.TermCode}}ctermfg={{.NormalRow.FG.TermCode}} {{end}}{{if .NormalRow.BG.TermCode}}ctermbg={{.NormalRow.BG.TermCode}} {{end}}{{if .NormalRow.FG.GuiCode}}guifg={{.NormalRow.FG.GuiCode}} {{end}}{{if .NormalRow.BG.GuiCode}}guibg={{.NormalRow.BG.GuiCode}} {{end}}{{if .NormalRow.Attr}}term={{.NormalRow.Attr}} cterm={{.NormalRow.Attr}} gui={{.NormalRow.Attr}}{{end}} + + hi Character {{if .NormalRow.FG.TermCode}}ctermfg={{.NormalRow.FG.TermCode}} {{end}}{{if .NormalRow.BG.TermCode}}ctermbg={{.NormalRow.BG.TermCode}} {{end}}{{if .NormalRow.FG.GuiCode}}guifg={{.NormalRow.FG.GuiCode}} {{end}}{{if .NormalRow.BG.GuiCode}}guibg={{.NormalRow.BG.GuiCode}} {{end}}{{if .NormalRow.Attr}}term={{.NormalRow.Attr}} cterm={{.NormalRow.Attr}} gui={{.NormalRow.Attr}}{{end}} + hi String {{if .NormalRow.FG.TermCode}}ctermfg={{.NormalRow.FG.TermCode}} {{end}}{{if .NormalRow.BG.TermCode}}ctermbg={{.NormalRow.BG.TermCode}} {{end}}{{if .NormalRow.FG.GuiCode}}guifg={{.NormalRow.FG.GuiCode}} {{end}}{{if .NormalRow.BG.GuiCode}}guibg={{.NormalRow.BG.GuiCode}} {{end}}{{if .NormalRow.Attr}}term={{.NormalRow.Attr}} cterm={{.NormalRow.Attr}} gui={{.NormalRow.Attr}}{{end}} + " Optional Syntax Features + if g:nofrils_strbackgrounds + hi Character {{if .HeavyStringRow.FG.TermCode}}ctermfg={{.HeavyStringRow.FG.TermCode}} {{end}}{{if .HeavyStringRow.BG.TermCode}}ctermbg={{.HeavyStringRow.BG.TermCode}} {{end}}{{if .HeavyStringRow.FG.GuiCode}}guifg={{.HeavyStringRow.FG.GuiCode}} {{end}}{{if .HeavyStringRow.BG.GuiCode}}guibg={{.HeavyStringRow.BG.GuiCode}} {{end}}{{if .HeavyStringRow.Attr}}term={{.HeavyStringRow.Attr}} cterm={{.HeavyStringRow.Attr}} gui={{.HeavyStringRow.Attr}}{{end}} + hi String {{if .HeavyStringRow.FG.TermCode}}ctermfg={{.HeavyStringRow.FG.TermCode}} {{end}}{{if .HeavyStringRow.BG.TermCode}}ctermbg={{.HeavyStringRow.BG.TermCode}} {{end}}{{if .HeavyStringRow.FG.GuiCode}}guifg={{.HeavyStringRow.FG.GuiCode}} {{end}}{{if .HeavyStringRow.BG.GuiCode}}guibg={{.HeavyStringRow.BG.GuiCode}} {{end}}{{if .HeavyStringRow.Attr}}term={{.HeavyStringRow.Attr}} cterm={{.HeavyStringRow.Attr}} gui={{.HeavyStringRow.Attr}}{{end}} + end + + hi Comment {{if .FadedRow.FG.TermCode}}ctermfg={{.FadedRow.FG.TermCode}} {{end}}{{if .FadedRow.BG.TermCode}}ctermbg={{.FadedRow.BG.TermCode}} {{end}}{{if .FadedRow.FG.GuiCode}}guifg={{.FadedRow.FG.GuiCode}} {{end}}{{if .FadedRow.BG.GuiCode}}guibg={{.FadedRow.BG.GuiCode}} {{end}}{{if .FadedRow.Attr}}term={{.FadedRow.Attr}} cterm={{.FadedRow.Attr}} gui={{.FadedRow.Attr}}{{end}} + if g:nofrils_heavycomments + hi Comment {{if .HeavyCommentRow.FG.TermCode}}ctermfg={{.HeavyCommentRow.FG.TermCode}} {{end}}{{if .HeavyCommentRow.BG.TermCode}}ctermbg={{.HeavyCommentRow.BG.TermCode}} {{end}}{{if .HeavyCommentRow.FG.GuiCode}}guifg={{.HeavyCommentRow.FG.GuiCode}} {{end}}{{if .HeavyCommentRow.BG.GuiCode}}guibg={{.HeavyCommentRow.BG.GuiCode}} {{end}}{{if .HeavyCommentRow.Attr}}term={{.HeavyCommentRow.Attr}} cterm={{.HeavyCommentRow.Attr}} gui={{.HeavyCommentRow.Attr}}{{end}} + end + + hi LineNr {{if .FadedRow.FG.TermCode}}ctermfg={{.FadedRow.FG.TermCode}} {{end}}{{if .FadedRow.BG.TermCode}}ctermbg={{.FadedRow.BG.TermCode}} {{end}}{{if .FadedRow.FG.GuiCode}}guifg={{.FadedRow.FG.GuiCode}} {{end}}{{if .FadedRow.BG.GuiCode}}guibg={{.FadedRow.BG.GuiCode}} {{end}}{{if .FadedRow.Attr}}term={{.FadedRow.Attr}} cterm={{.FadedRow.Attr}} gui={{.FadedRow.Attr}}{{end}} + if g:nofrils_heavylinenumbers + hi LineNr {{if .HeavyLineRow.FG.TermCode}}ctermfg={{.HeavyLineRow.FG.TermCode}} {{end}}{{if .HeavyLineRow.BG.TermCode}}ctermbg={{.HeavyLineRow.BG.TermCode}} {{end}}{{if .HeavyLineRow.FG.GuiCode}}guifg={{.HeavyLineRow.FG.GuiCode}} {{end}}{{if .HeavyLineRow.BG.GuiCode}}guibg={{.HeavyLineRow.BG.GuiCode}} {{end}}{{if .HeavyLineRow.Attr}}term={{.HeavyLineRow.Attr}} cterm={{.HeavyLineRow.Attr}} gui={{.HeavyLineRow.Attr}}{{end}} + end +endfunction + +" Command mappings +command! NofrilsDark :colo nofrils-dark +command! NofrilsLight :colo nofrils-light +command! NofrilsSepia :colo nofrils-sepia +command! NofrilsAcme :colo nofrils-acme +command! NofrilsFocusNormal :call NofrilsNormal() +command! NofrilsFocusCode :call NofrilsFocusCode() +command! NofrilsFocusComments :call NofrilsFocusComments() + +" Setup normal settings +call NofrilsNormal() diff --git a/.vim/bundle/syntastic/README.markdown b/.vim/bundle/syntastic/README.markdown index 7ed8cc8..346123e 100644 --- a/.vim/bundle/syntastic/README.markdown +++ b/.vim/bundle/syntastic/README.markdown @@ -58,19 +58,19 @@ their script to find them. At the time of this writing, syntastic has checking plugins for ACPI Source Language, ActionScript, Ada, Ansible configurations, API Blueprint, -AppleScript, AsciiDoc, Assembly languages, BEMHTML, Bro, Bourne shell, C, -C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, +AppleScript, AsciiDoc, Assembly languages, BEMHTML, Bro, Bourne shell, C, C++, +C#, Cabal, Chef, CMake, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dockerfile, Dust, Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, -JSX, LESS, Lex, Limbo, LISP, LLVM intermediate language, Lua, Markdown, +JSX, Julia, LESS, Lex, Limbo, LISP, LLVM intermediate language, Lua, Markdown, MATLAB, Mercury, NASM, Nix, Objective-C, Objective-C++, OCaml, Perl, Perl -POD, PHP, gettext Portable Object, OS X and iOS property lists, Pug (formerly -Jade), Puppet, Python, QML, R, Racket, RDF TriG, RDF Turtle, Relax NG, -reStructuredText, RPM spec, Ruby, SASS/SCSS, Scala, Slim, SML, Solidity, +6, Perl POD, PHP, gettext Portable Object, OS X and iOS property lists, Pug +(formerly Jade), Puppet, Python, QML, R, Racket, RDF TriG, RDF Turtle, Relax +NG, reStructuredText, RPM spec, Ruby, SASS/SCSS, Scala, Slim, SML, Solidity, Sphinx, SQL, Stylus, Tcl, TeX, Texinfo, Twig, TypeScript, Vala, Verilog, VHDL, -Vim help, VimL, xHtml, XML, XSLT, XQuery, YACC, YAML, YANG data models, z80, -Zope page templates, and Zsh. See the [manual][checkers] for details about the -corresponding supported checkers (`:help syntastic-checkers` in Vim). +Vim help, VimL, Vue.js, xHtml, XML, XSLT, XQuery, YACC, YAML, YANG data models, +z80, Zope page templates, and Zsh. See the [manual][checkers] for details about +the corresponding supported checkers (`:help syntastic-checkers` in Vim). A number of third-party Vim plugins also provide checkers for syntastic, for example: [merlin][merlin], [omnisharp-vim][omnisharp], [rust.vim][rust], @@ -101,10 +101,10 @@ enabled. Syntastic itself has rather relaxed requirements: it doesn't have any external dependencies, and it needs a version of [Vim][vim] compiled with a few common features: `autocmd`, `eval`, `file_in_path`, `modify_fname`, `quickfix`, -`reltime`, and `user_commands`. Not all possible combinations of features that -include the ones above make equal sense on all operating systems, but Vim -version 7 or later with the "normal", "big", or "huge" feature sets should be -fine. +`reltime`, `statusline`, and `user_commands`. Not all possible combinations of +features that include the ones above make equal sense on all operating systems, +but Vim version 7 or later with the "normal", "big", or "huge" feature sets +should be fine. Syntastic should work with any modern plugin managers for Vim, such as [NeoBundle][neobundle], [Pathogen][pathogen], [Vim-Addon-Manager][vam], @@ -437,15 +437,15 @@ scripts. __4.12. Q. How can I check scripts written for different versions of Ruby?__ A. Install a Ruby version manager such as [rvm][rvm] or [rbenv][rbenv], -activate the environment for the relevant version of Ruby, and install in it -the checkers you want to use. Set `g:syntastic_ruby_checkers` accordingly in -your `vimrc`, and run [Vim][vim] from the virtual environment. +activate the relevant version of Ruby, and install in it the checkers you want +to use. Set `g:syntastic_ruby_checkers` accordingly in your `vimrc`, and run +[Vim][vim] under the relevant Ruby version. -If you're starting Vim from a desktop manager rather than from a terminal you -might need to write wrapper scripts around your checkers, to activate the -virtual environment before running the actual checks. Then you'll need to -point the relevant `g:syntastic_ruby__exec` variables to the wrapper -scripts. +If you're starting Vim from a desktop manager rather than from a terminal +and depending on the version manager you use you might need to write wrapper +scripts around your checkers, to activate the relevant version of Ruby +before running the actual checks. Then you'll need to point the relevant +`g:syntastic_ruby__exec` variables to the wrapper scripts. diff --git a/.vim/bundle/syntastic/autoload/syntastic/postprocess.vim b/.vim/bundle/syntastic/autoload/syntastic/postprocess.vim index 136fa58..c69f397 100644 --- a/.vim/bundle/syntastic/autoload/syntastic/postprocess.vim +++ b/.vim/bundle/syntastic/autoload/syntastic/postprocess.vim @@ -65,6 +65,17 @@ function! syntastic#postprocess#guards(errors) abort " {{{2 return a:errors endfunction " }}}2 +" convert error messages from UTF-8 to the current encoding +function! syntastic#postprocess#iconv(errors) abort " {{{2 + if has('iconv') && &encoding !=# '' && &encoding !=# 'utf-8' + for e in a:errors + let e['text'] = iconv(e['text'], "utf-8", &encoding) + endfor + endif + + return a:errors +endfunction " }}}2 + " }}}1 let &cpo = s:save_cpo diff --git a/.vim/bundle/syntastic/autoload/syntastic/preprocess.vim b/.vim/bundle/syntastic/autoload/syntastic/preprocess.vim index 9d25b84..79e4fac 100644 --- a/.vim/bundle/syntastic/autoload/syntastic/preprocess.vim +++ b/.vim/bundle/syntastic/autoload/syntastic/preprocess.vim @@ -8,6 +8,37 @@ set cpo&vim " Public functions {{{1 +function! syntastic#preprocess#bandit(errors) abort " {{{2 + let out = [] + let json = s:_decode_JSON(join(a:errors, '')) + + if type(json) == type({}) && has_key(json, 'results') && type(json['results']) == type([]) + for issue in json['results'] + if type(issue) == type({}) + try + call add(out, + \ issue['filename'] . ':' . + \ issue['line_number'] . ':' . + \ { 'LOW': 'I', 'MEDIUM': 'W', 'HIGH': 'E' }[issue['issue_severity']] . ':' . + \ issue['test_id'][1:] . ':' . + \ issue['issue_text'] . + \ ' [' . issue['test_name'] . '] (confidence: ' . issue['issue_confidence'] . ')') + catch /\m^Vim\%((\a\+)\)\=:E716/ + call syntastic#log#warn('checker python/bandit: unrecognized error item ' . string(issue)) + let out = [] + break + endtry + else + call syntastic#log#warn('checker python/bandit: unrecognized error item ' . string(issue)) + endif + endfor + else + call syntastic#log#warn('checker python/bandit: unrecognized error format (crashed checker?)') + endif + + return out +endfunction " }}}2 + function! syntastic#preprocess#cabal(errors) abort " {{{2 let out = [] let star = 0 @@ -98,6 +129,35 @@ function! syntastic#preprocess#dockerfile_lint(errors) abort " {{{2 return out endfunction " }}}2 +function! syntastic#preprocess#dscanner(errors) abort " {{{2 + let idx = 0 + while idx < len(a:errors) && a:errors[idx][0] !=# '{' + let idx += 1 + endwhile + let errs = s:_decode_JSON(join(a:errors[idx :], '')) + + let out = [] + if type(errs) == type({}) && has_key(errs, 'issues') && type(errs['issues']) == type([]) + for issue in errs['issues'] + try + call add(out, + \ issue['fileName'] . ':' . + \ issue['line'] . ':' . + \ issue['column'] . ':' . + \ issue['message'] . ' [' . issue['key'] . ']') + catch /\m^Vim\%((\a\+)\)\=:E716/ + call syntastic#log#warn('checker d/dscanner: unrecognized error item ' . string(issue)) + let out = [] + break + endtry + endfor + else + call syntastic#log#warn('checker d/dscanner: unrecognized error format (crashed checker?)') + endif + + return out +endfunction " }}}2 + function! syntastic#preprocess#flow(errors) abort " {{{2 let idx = 0 while idx < len(a:errors) && a:errors[idx][0] !=# '{' @@ -204,13 +264,55 @@ function! syntastic#preprocess#perl(errors) abort " {{{2 return syntastic#util#unique(out) endfunction " }}}2 -function! syntastic#preprocess#prospector(errors) abort " {{{2 +function! syntastic#preprocess#perl6(errors) abort " {{{2 + if a:errors[0] ==# 'Syntax OK' + return [] + endif + let errs = s:_decode_JSON(join(a:errors, '')) let out = [] - if type(errs) == type({}) && has_key(errs, 'messages') - if type(errs['messages']) == type([]) - for e in errs['messages'] + if type(errs) == type({}) + try + for val in values(errs) + let line = get(val, 'line', 0) + let pos = get(val, 'pos', 0) + if pos && has('byte_offset') + let line_pos = byte2line(pos + 1) + let column = line_pos > 0 ? pos - line2byte(line_pos) + 2 : 0 + else + let column = 0 + endif + + call add(out, join([ + \ get(val, 'filename', ''), + \ line, + \ column, + \ get(val, 'message', '') ], ':')) + endfor + catch /\m^Vim\%((\a\+)\)\=:E716/ + call syntastic#log#warn('checker perl6/perl6: unrecognized error item ' . string(val)) + let out = [] + endtry + else + call syntastic#log#warn('checker perl6/perl6: unrecognized error format') + endif + + return out +endfunction " }}}2 + +function! syntastic#preprocess#prospector(errors) abort " {{{2 + let errs = join(a:errors, '') + if errs ==# '' + return [] + endif + + let json = s:_decode_JSON(errs) + + let out = [] + if type(json) == type({}) && has_key(json, 'messages') + if type(json['messages']) == type([]) + for e in json['messages'] if type(e) == type({}) try if e['source'] ==# 'pylint' @@ -240,6 +342,8 @@ function! syntastic#preprocess#prospector(errors) abort " {{{2 else call syntastic#log#warn('checker python/prospector: unrecognized error format (crashed checker?)') endif + else + call syntastic#log#warn('checker python/prospector: unrecognized error format (crashed checker?)') endif return out @@ -406,7 +510,7 @@ echomsg string(out) endfunction " }}}2 function! syntastic#preprocess#tslint(errors) abort " {{{2 - return map(copy(a:errors), 'substitute(v:val, ''\m^\(([^)]\+)\)\s\(.\+\)$'', ''\2 \1'', "")') + return map(copy(a:errors), 'substitute(v:val, ''\v^((ERROR|WARNING): )?\zs(\([^)]+\))\s(.+)$'', ''\4 \3'', "")') endfunction " }}}2 function! syntastic#preprocess#validator(errors) abort " {{{2 diff --git a/.vim/bundle/syntastic/autoload/syntastic/util.vim b/.vim/bundle/syntastic/autoload/syntastic/util.vim index deeb0f1..8a17fe6 100644 --- a/.vim/bundle/syntastic/autoload/syntastic/util.vim +++ b/.vim/bundle/syntastic/autoload/syntastic/util.vim @@ -76,7 +76,7 @@ function! syntastic#util#tmpdir() abort " {{{2 if (has('unix') || has('mac')) && executable('mktemp') && !has('win32unix') " TODO: option "-t" to mktemp(1) is not portable let tmp = $TMPDIR !=# '' ? $TMPDIR : $TMP !=# '' ? $TMP : '/tmp' - let out = split(syntastic#util#system('mktemp -q -d ' . tmp . '/vim-syntastic-' . getpid() . '-XXXXXXXX'), "\n") + let out = split(syntastic#util#system('mktemp -q -d ' . tmp . '/vim-syntastic-' . s:_fuzz() . '-XXXXXXXX'), "\n") if v:shell_error == 0 && len(out) == 1 let tempdir = out[0] endif @@ -84,13 +84,13 @@ function! syntastic#util#tmpdir() abort " {{{2 if tempdir ==# '' if has('win32') || has('win64') - let tempdir = $TEMP . syntastic#util#Slash() . 'vim-syntastic-' . getpid() + let tempdir = $TEMP . syntastic#util#Slash() . 'vim-syntastic-' . s:_fuzz() elseif has('win32unix') - let tempdir = syntastic#util#CygwinPath('/tmp/vim-syntastic-' . getpid()) + let tempdir = syntastic#util#CygwinPath('/tmp/vim-syntastic-' . s:_fuzz()) elseif $TMPDIR !=# '' - let tempdir = $TMPDIR . '/vim-syntastic-' . getpid() + let tempdir = $TMPDIR . '/vim-syntastic-' . s:_fuzz() else - let tempdir = '/tmp/vim-syntastic-' . getpid() + let tempdir = '/tmp/vim-syntastic-' . s:_fuzz() endif try @@ -132,9 +132,9 @@ endfunction " }}}2 " returns " " {'exe': '/usr/bin/perl', 'args': ['-f', '-bar']} -function! syntastic#util#parseShebang() abort " {{{2 +function! syntastic#util#parseShebang(buf) abort " {{{2 for lnum in range(1, 5) - let line = getline(lnum) + let line = get(getbufline(a:buf, lnum), 0, '') if line =~# '^#!' let line = substitute(line, '\v^#!\s*(\S+/env(\s+-\S+)*\s+)?', '', '') let exe = matchstr(line, '\m^\S*\ze') @@ -253,7 +253,7 @@ endfunction " }}}2 function! syntastic#util#findFileInParent(what, where) abort " {{{2 let old_suffixesadd = &suffixesadd let &suffixesadd = '' - let file = findfile(a:what, escape(a:where, ' ') . ';') + let file = findfile(a:what, escape(a:where, ' ,') . ';') let &suffixesadd = old_suffixesadd return file endfunction " }}}2 @@ -307,8 +307,14 @@ function! syntastic#util#fname2buf(fname) abort " {{{2 " this is a best-effort attempt to escape file patterns (cf. :h file-pattern) " XXX it fails for filenames containing something like \{2,3} + let buf = -1 for md in [':~:.', ':~', ':p'] - let buf = bufnr('^' . escape(fnamemodify(a:fname, md), '\*?,{}[') . '$') + try + " Older versions of Vim can throw E94 here + let buf = bufnr('^' . escape(fnamemodify(a:fname, md), '\*?,{}[') . '$') + catch + " catch everything + endtry if buf != -1 break endif @@ -401,9 +407,6 @@ function! syntastic#util#setLastTick(buf) abort " {{{2 call setbufvar(a:buf, 'syntastic_lasttick', getbufvar(a:buf, 'changedtick')) endfunction " }}}2 -let s:_wid_base = 'syntastic_' . getpid() . '_' . reltimestr(g:_SYNTASTIC_START) . '_' -let s:_wid_pool = 0 - " Add unique IDs to windows function! syntastic#util#setWids() abort " {{{2 for tab in range(1, tabpagenr('$')) @@ -614,8 +617,18 @@ endfunction "}}}2 let s:_getbufvar = function(v:version > 703 || (v:version == 703 && has('patch831')) ? 'getbufvar' : 's:_getbufvar_dumb') lockvar s:_getbufvar +function! s:_fuzz_dumb() abort " {{{2 + return 'tmp' +endfunction " }}}2 + +let s:_fuzz = function(exists('*getpid') ? 'getpid' : 's:_fuzz_dumb') +lockvar s:_fuzz + " }}}1 +let s:_wid_base = 'syntastic_' . s:_fuzz() . '_' . reltimestr(g:_SYNTASTIC_START) . '_' +let s:_wid_pool = 0 + let &cpo = s:save_cpo unlet s:save_cpo diff --git a/.vim/bundle/syntastic/doc/syntastic-checkers.txt b/.vim/bundle/syntastic/doc/syntastic-checkers.txt index b7625f1..ec76927 100644 --- a/.vim/bundle/syntastic/doc/syntastic-checkers.txt +++ b/.vim/bundle/syntastic/doc/syntastic-checkers.txt @@ -23,6 +23,7 @@ SYNTAX CHECKERS BY LANGUAGE *syntastic-checkers-lang* C++......................................|syntastic-checkers-cpp| Cabal....................................|syntastic-checkers-cabal| Chef.....................................|syntastic-checkers-chef| + CMake....................................|syntastic-checkers-cmake| COBOL....................................|syntastic-checkers-cobol| Coco.....................................|syntastic-checkers-co| CoffeeScript.............................|syntastic-checkers-coffee| @@ -58,6 +59,7 @@ SYNTAX CHECKERS BY LANGUAGE *syntastic-checkers-lang* Java.....................................|syntastic-checkers-java| JavaScript...............................|syntastic-checkers-javascript| JSON.....................................|syntastic-checkers-json| + Julia....................................|syntastic-checkers-julia| LESS.....................................|syntastic-checkers-less| Lex......................................|syntastic-checkers-lex| @@ -79,6 +81,7 @@ SYNTAX CHECKERS BY LANGUAGE *syntastic-checkers-lang* OCaml....................................|syntastic-checkers-ocaml| Perl.....................................|syntastic-checkers-perl| + Perl 6...................................|syntastic-checkers-perl6| PHP......................................|syntastic-checkers-php| POD......................................|syntastic-checkers-pod| Pug (formerly Jade)......................|syntastic-checkers-pug| @@ -119,6 +122,7 @@ SYNTAX CHECKERS BY LANGUAGE *syntastic-checkers-lang* VHDL.....................................|syntastic-checkers-vhdl| Vim help.................................|syntastic-checkers-help| VimL.....................................|syntastic-checkers-vim| + Vue.js...................................|syntastic-checkers-vue| xHTML....................................|syntastic-checkers-xhtml| XML......................................|syntastic-checkers-xml| @@ -225,18 +229,18 @@ fatal errors in one of the included files. Type: string Default: unset Compilation flags (such as defines or include directories) to be passed to the -checker. +linter. *'g:syntastic_ada_config_file'* Type: string Default: ".syntastic_ada_config" -File containing additional compilation flags to be passed to the checker, one +File containing additional compilation flags to be passed to the linter, one option per line (cf. |syntastic-config-files|). *'g:syntastic_ada_include_dirs'* Type: array of strings Default: [] -Include directories to be passed to the checker, in addition to the above +Include directories to be passed to the linter, in addition to the above compilation flags. You can set it like this: > let g:syntastic_ada_include_dirs = ["includes", "headers"] < @@ -260,7 +264,7 @@ Note~ This checker doesn't call the "makeprgBuild()" function, and thus it ignores the usual 'g:syntastic_ada_gcc_