dissimulo/drunkendotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ability to disable solarized enhancements [Fix #487]

Browse Source
This commit is contained in:
Yan Pritzker
2014-06-24 11:36:28 -05:00
parent cebeb7719e
commit 51fd5bc84d
2 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/vim/enhancements.md
View File

@@ -9,3 +9,7 @@
* AnsiEsc - inteprets ansi color codes inside log files. great for looking at Rails logs * AnsiEsc - inteprets ansi color codes inside log files. great for looking at Rails logs
* solarized - a color scheme scientifically calibrated for awesomeness (including skwp mods for ShowMarks) * solarized - a color scheme scientifically calibrated for awesomeness (including skwp mods for ShowMarks)
* Airline - Improved status bar. Requires patched fonts (installed from fonts/ directory) * Airline - Improved status bar. Requires patched fonts (installed from fonts/ directory)
YADR provides solarized enhancements that make it even better. If you're using another theme, you can disable them with this line in `~/.vimrc.before`:
let g:yadr_disable_solarized_enhancements=1

116
vim/settings/solarized.vim
View File

@@ -2,67 +2,69 @@ if !has("gui_macvim")
set t_Co=256 set t_Co=256
endif endif
hi! link txtBold Identifier if !exists("g:yadr_disable_solarized_enhancements")
hi! link zshVariableDef Identifier hi! link txtBold Identifier
hi! link zshFunction Function hi! link zshVariableDef Identifier
hi! link rubyControl Statement hi! link zshFunction Function
hi! link rspecGroupMethods rubyControl hi! link rubyControl Statement
hi! link rspecMocks Identifier hi! link rspecGroupMethods rubyControl
hi! link rspecKeywords Identifier hi! link rspecMocks Identifier
hi! link rubyLocalVariableOrMethod Normal hi! link rspecKeywords Identifier
hi! link rubyStringDelimiter Constant hi! link rubyLocalVariableOrMethod Normal
hi! link rubyString Constant hi! link rubyStringDelimiter Constant
hi! link rubyAccess Todo hi! link rubyString Constant
hi! link rubySymbol Identifier hi! link rubyAccess Todo
hi! link rubyPseudoVariable Type hi! link rubySymbol Identifier
hi! link rubyRailsARAssociationMethod Title hi! link rubyPseudoVariable Type
hi! link rubyRailsARValidationMethod Title hi! link rubyRailsARAssociationMethod Title
hi! link rubyRailsMethod Title hi! link rubyRailsARValidationMethod Title
hi! link rubyDoBlock Normal hi! link rubyRailsMethod Title
hi! link MatchParen DiffText hi! link rubyDoBlock Normal
hi! link MatchParen DiffText
hi! link CTagsModule Type hi! link CTagsModule Type
hi! link CTagsClass Type hi! link CTagsClass Type
hi! link CTagsMethod Identifier hi! link CTagsMethod Identifier
hi! link CTagsSingleton Identifier hi! link CTagsSingleton Identifier
hi! link javascriptFuncName Type hi! link javascriptFuncName Type
hi! link jsFuncCall jsFuncName hi! link jsFuncCall jsFuncName
hi! link javascriptFunction Statement hi! link javascriptFunction Statement
hi! link javascriptThis Statement hi! link javascriptThis Statement
hi! link javascriptParens Normal hi! link javascriptParens Normal
hi! link jOperators javascriptStringD hi! link jOperators javascriptStringD
hi! link jId Title hi! link jId Title
hi! link jClass Title hi! link jClass Title
hi! link NERDTreeFile Constant hi! link NERDTreeFile Constant
hi! link NERDTreeDir Identifier hi! link NERDTreeDir Identifier
hi! link sassMixinName Function hi! link sassMixinName Function
hi! link sassDefinition Function hi! link sassDefinition Function
hi! link sassProperty Type hi! link sassProperty Type
hi! link htmlTagName Type hi! link htmlTagName Type
hi! PreProc gui=bold hi! PreProc gui=bold
" Solarized separators are a little garish. " Solarized separators are a little garish.
" This moves separators, comments, and normal " This moves separators, comments, and normal
" text into the same color family as the background. " text into the same color family as the background.
" Using the http://drpeterjones.com/colorcalc/, " Using the http://drpeterjones.com/colorcalc/,
" they are now just differently saturated and " they are now just differently saturated and
" valued riffs on the background color, making " valued riffs on the background color, making
" everything play together just a little more nicely. " everything play together just a little more nicely.
hi! VertSplit guifg=#003745 cterm=NONE term=NONE ctermfg=NONE ctermbg=NONE hi! VertSplit guifg=#003745 cterm=NONE term=NONE ctermfg=NONE ctermbg=NONE
hi! LineNR guifg=#004C60 gui=bold guibg=#002B36 ctermfg=146 hi! LineNR guifg=#004C60 gui=bold guibg=#002B36 ctermfg=146
hi! link NonText VertSplit hi! link NonText VertSplit
hi! Normal guifg=#77A5B1 hi! Normal guifg=#77A5B1
hi! Constant guifg=#00BCE0 hi! Constant guifg=#00BCE0
hi! Comment guifg=#52737B hi! Comment guifg=#52737B
hi! link htmlLink Include hi! link htmlLink Include
hi! CursorLine cterm=NONE gui=NONE hi! CursorLine cterm=NONE gui=NONE
hi! Visual ctermbg=233 hi! Visual ctermbg=233
hi! Type gui=bold hi! Type gui=bold
hi! EasyMotionTarget guifg=#4CE660 gui=bold hi! EasyMotionTarget guifg=#4CE660 gui=bold
" Make sure this file loads itself on top of any other color settings " Make sure this file loads itself on top of any other color settings
au VimEnter * so ~/.vim/settings/solarized.vim au VimEnter * so ~/.vim/settings/solarized.vim
endif