diff options
Diffstat (limited to '')
| -rw-r--r-- | vim/.vim/colors/monokai.vim | 107 | ||||
| -rw-r--r-- | vim/.vim/colors/sorcerer.vim | 210 | ||||
| -rw-r--r-- | vim/.vim/undo/.gitignore | 1 | ||||
| -rw-r--r-- | vim/.vimrc | 164 |
4 files changed, 334 insertions, 148 deletions
diff --git a/vim/.vim/colors/monokai.vim b/vim/.vim/colors/monokai.vim deleted file mode 100644 index 6fbadfa..0000000 --- a/vim/.vim/colors/monokai.vim +++ /dev/null @@ -1,107 +0,0 @@ -" Vim color file -" Converted from Textmate theme Monokai using Coloration v0.3.2 (http://github.com/sickill/coloration) - -set background=dark -highlight clear - -if exists("syntax_on") - syntax reset -endif - -let g:colors_name = "monokai" - -hi Cursor ctermfg=235 ctermbg=231 cterm=NONE guifg=#272822 guibg=#f8f8f0 gui=NONE -hi Visual ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE -hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE -hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE -hi ColorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE -hi LineNr ctermfg=102 ctermbg=237 cterm=NONE guifg=#90908a guibg=#3c3d37 gui=NONE -hi VertSplit ctermfg=241 ctermbg=241 cterm=NONE guifg=#64645e guibg=#64645e gui=NONE -hi MatchParen ctermfg=197 ctermbg=NONE cterm=underline guifg=#f92672 guibg=NONE gui=underline -hi StatusLine ctermfg=231 ctermbg=241 cterm=bold guifg=#f8f8f2 guibg=#64645e gui=bold -hi StatusLineNC ctermfg=231 ctermbg=241 cterm=NONE guifg=#f8f8f2 guibg=#64645e gui=NONE -hi Pmenu ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi PmenuSel ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE -hi IncSearch ctermfg=235 ctermbg=186 cterm=NONE guifg=#272822 guibg=#e6db74 gui=NONE -hi Search ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline -hi Directory ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Folded ctermfg=242 ctermbg=235 cterm=NONE guifg=#75715e guibg=#272822 gui=NONE - -hi Normal ctermfg=231 ctermbg=235 cterm=NONE guifg=#f8f8f2 guibg=#272822 gui=NONE -hi Boolean ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Character ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Comment ctermfg=242 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE -hi Conditional ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi Define ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi DiffAdd ctermfg=231 ctermbg=64 cterm=bold guifg=#f8f8f2 guibg=#46830c gui=bold -hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE guifg=#8b0807 guibg=NONE gui=NONE -hi DiffChange ctermfg=231 ctermbg=23 cterm=NONE guifg=#f8f8f2 guibg=#243955 gui=NONE -hi DiffText ctermfg=231 ctermbg=24 cterm=bold guifg=#f8f8f2 guibg=#204a87 gui=bold -hi ErrorMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE -hi WarningMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE -hi Float ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Function ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi Identifier ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi Keyword ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Label ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi NonText ctermfg=59 ctermbg=236 cterm=NONE guifg=#49483e guibg=#31322c gui=NONE -hi Number ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi Operator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi PreProc ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Special ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f8f8f2 guibg=NONE gui=NONE -hi SpecialKey ctermfg=59 ctermbg=237 cterm=NONE guifg=#49483e guibg=#3c3d37 gui=NONE -hi Statement ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi StorageClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi String ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi Tag ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi Title ctermfg=231 ctermbg=NONE cterm=bold guifg=#f8f8f2 guibg=NONE gui=bold -hi Todo ctermfg=95 ctermbg=NONE cterm=inverse,bold guifg=#75715e guibg=NONE gui=inverse,bold -hi Type ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline -hi rubyClass ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyFunction ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubySymbol ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi rubyConstant ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi rubyStringDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi rubyBlockParameter ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic -hi rubyInstanceVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubyInclude ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyGlobalVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubyRegexp ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi rubyRegexpDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi rubyEscape ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi rubyControl ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyClassVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubyOperator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyException ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi rubyPseudoVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi rubyRailsUserClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi rubyRailsARAssociationMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi rubyRailsARMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi rubyRailsRenderMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi rubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi erubyDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi erubyComment ctermfg=95 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE -hi erubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi htmlTag ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi htmlEndTag ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi htmlTagName ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi htmlArg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi htmlSpecialChar ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi javaScriptFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic -hi javaScriptRailsFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi javaScriptBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi yamlKey ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE -hi yamlAnchor ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi yamlAlias ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi yamlDocumentHeader ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE -hi cssURL ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic -hi cssFunctionName ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi cssColor ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi cssPseudoClassId ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi cssClassName ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE -hi cssValueLength ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE -hi cssCommonAttr ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE -hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE diff --git a/vim/.vim/colors/sorcerer.vim b/vim/.vim/colors/sorcerer.vim new file mode 100644 index 0000000..d94118d --- /dev/null +++ b/vim/.vim/colors/sorcerer.vim @@ -0,0 +1,210 @@ +" 'sorcerer.vim' -- Vim color scheme. +" Maintainer: Andrew Lawson +" Forked from 'vim-scripts/Sorcerer' by Jeet Sukumaran +" Based on 'Mustang' by Henrique C. Alves (hcarvalhoalves@gmail.com), +" Slight mods by xero harrison (git.io/.files) + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "sorcerer" + +" GUI Colors {{{1 +" ============================================================================ + +hi Normal guifg=#c2c2b0 guibg=#222222 gui=NONE +hi ColorColumn guifg=NONE guibg=#1c1c1c +hi Cursor guifg=NONE guibg=#626262 gui=NONE +hi CursorColumn guibg=#2d2d2d +hi CursorLine guibg=#2d2d2d +hi DiffAdd guifg=#000000 guibg=#3cb371 gui=NONE +hi DiffDelete guifg=#000000 guibg=#aa4450 gui=NONE +hi DiffChange guifg=#000000 guibg=#4f94cd gui=NONE +hi DiffText guifg=#000000 guibg=#8ee5ee gui=NONE +hi Directory guifg=#1e90ff guibg=NONE gui=NONE +hi ErrorMsg guifg=#ff6a6a guibg=NONE gui=bold +hi FoldColumn guifg=#68838b guibg=#4B4B4B gui=bold +hi Folded guifg=#406060 guibg=#232c2c gui=NONE +hi IncSearch guifg=#ffffff guibg=#ff4500 gui=bold +hi LineNr guifg=#878787 guibg=#3A3A3A gui=NONE +hi MatchParen guifg=#fff000 guibg=NONE gui=bold +hi ModeMsg guifg=#000000 guibg=#00ff00 gui=bold +hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold +hi NonText guifg=#404050 guibg=NONE gui=NONE + +hi Pmenu guifg=#ffffff guibg=#444444 +hi PmenuSel guifg=#000000 guibg=#b1d631 +" hi PmenuSbar guifg=#ffffff guibg=#c1cdc1 gui=NONE +" hi PmenuThumb guifg=#ffffff guibg=#838b83 gui=NONE + +hi Question guifg=#00ee00 guibg=NONE gui=bold +hi Search guifg=#000000 guibg=#d6e770 gui=bold +hi SignColumn guifg=#ffffff guibg=NONE gui=NONE +hi SpecialKey guifg=#505060 guibg=NONE gui=NONE +hi SpellBad guisp=#ee2c2c gui=undercurl +hi SpellCap guisp=#0000ff gui=undercurl +hi SpellLocal guisp=#008b8b gui=undercurl +hi SpellRare guisp=#ff00ff gui=undercurl +hi StatusLine guifg=#000000 guibg=#808070 gui=bold +hi StatusLineNC guifg=#000000 guibg=#404c4c gui=italic +hi VertSplit guifg=#404c4c guibg=#404c4c gui=NONE +hi TabLine guifg=fg guibg=#d3d3d3 gui=underline +hi TabLineFill guifg=fg guibg=NONE gui=reverse +hi TabLineSel guifg=fg guibg=NONE gui=bold +hi Title guifg=#528b8b guibg=NONE gui=bold +hi Visual guifg=#000000 guibg=#6688aa gui=NONE +hi WarningMsg guifg=#ee9a00 guibg=NONE gui=NONE +hi WildMenu guifg=#000000 guibg=#87ceeb gui=NONE +hi ExtraWhitespace guifg=fg guibg=#528b8b gui=NONE + +" Syntax highlighting +hi Comment guifg=#686858 gui=italic +hi Boolean guifg=#ff9800 gui=NONE +hi String guifg=#779b70 gui=NONE +hi Identifier guifg=#9ebac2 gui=NONE +hi Function guifg=#faf4c6 gui=NONE +hi Type guifg=#7e8aa2 gui=NONE +hi Statement guifg=#90b0d1 gui=NONE +hi Keyword guifg=#90b0d1 gui=NONE +hi Constant guifg=#ff9800 gui=NONE +hi Number guifg=#cc8800 gui=NONE +hi Special guifg=#719611 gui=NONE +hi PreProc guifg=#528b8b gui=NONE +hi Todo guifg=#8f6f8f guibg=#202020 gui=italic,underline,bold + +" Diff +hi diffOldFile guifg=#88afcb guibg=NONE gui=italic +hi diffNewFile guifg=#88afcb guibg=NONE gui=italic +hi diffFile guifg=#88afcb guibg=NONE gui=italic +hi diffLine guifg=#88afcb guibg=NONE gui=italic +hi link diffSubname diffLine +hi diffAdded guifg=#3cb371 guibg=NONE gui=NONE +hi diffRemoved guifg=#aa4450 guibg=NONE gui=NONE +hi diffChanged guifg=#4f94cd guibg=NONE gui=NONE +hi link diffOnly Constant +hi link diffIdentical Constant +hi link diffDiffer Constant +hi link diffBDiffer Constant +hi link diffIsA Constant +hi link diffNoEOL Constant +hi link diffCommon Constant +hi link diffComment Constant + +" Python +hi pythonException guifg=#90b0d1 guibg=NONE gui=NONE +hi pythonExClass guifg=#996666 guibg=NONE gui=NONE +hi pythonDecorator guifg=#888555 guibg=NONE gui=NONE +hi link pythonDecoratorFunction pythonDecorator + +" 1}}} + +" 256 Colors {{{1 +" ============================================================================ +hi Normal cterm=NONE ctermbg=NONE ctermfg=145 +hi ColorColumn cterm=NONE ctermbg=16 ctermfg=NONE +hi Cursor cterm=NONE ctermbg=241 ctermfg=fg +hi CursorColumn cterm=NONE ctermbg=16 ctermfg=fg +hi CursorLine cterm=NONE ctermbg=236 ctermfg=fg +hi DiffAdd cterm=NONE ctermbg=71 ctermfg=16 +hi DiffDelete cterm=NONE ctermbg=124 ctermfg=16 +hi DiffChange cterm=NONE ctermbg=68 ctermfg=16 +hi DiffText cterm=NONE ctermbg=117 ctermfg=16 +hi Directory cterm=NONE ctermbg=234 ctermfg=33 +hi ErrorMsg cterm=bold ctermbg=NONE ctermfg=203 +hi FoldColumn cterm=bold ctermbg=239 ctermfg=66 +hi Folded cterm=NONE ctermbg=16 ctermfg=60 +hi IncSearch cterm=bold ctermbg=202 ctermfg=231 +hi LineNr cterm=NONE ctermbg=237 ctermfg=102 +hi MatchParen cterm=bold ctermbg=NONE ctermfg=226 +hi ModeMsg cterm=bold ctermbg=46 ctermfg=16 +hi MoreMsg cterm=bold ctermbg=234 ctermfg=29 +hi NonText cterm=NONE ctermbg=NONE ctermfg=59 +hi Pmenu cterm=NONE ctermbg=238 ctermfg=231 +hi PmenuSbar cterm=NONE ctermbg=250 ctermfg=fg +hi PmenuSel cterm=NONE ctermbg=149 ctermfg=16 +hi Question cterm=bold ctermbg=NONE ctermfg=46 +hi Search cterm=bold ctermbg=185 ctermfg=16 +hi SignColumn cterm=NONE ctermbg=NONE ctermfg=231 +hi SpecialKey cterm=NONE ctermbg=NONE ctermfg=59 +hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=196 +hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=21 +hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=30 +hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=201 +hi StatusLine cterm=bold ctermbg=101 ctermfg=16 +hi StatusLineNC cterm=NONE ctermbg=102 ctermfg=16 +hi VertSplit cterm=NONE ctermbg=102 ctermfg=102 +hi TabLine cterm=bold ctermbg=102 ctermfg=16 +hi TabLineFill cterm=NONE ctermbg=102 ctermfg=16 +hi TabLineSel cterm=bold ctermbg=16 ctermfg=59 +hi Title cterm=bold ctermbg=NONE ctermfg=66 +hi Visual cterm=NONE ctermbg=67 ctermfg=16 +hi WarningMsg cterm=NONE ctermbg=234 ctermfg=208 +hi WildMenu cterm=NONE ctermbg=116 ctermfg=16 +hi ExtraWhitespace cterm=NONE ctermbg=66 ctermfg=fg + +hi Comment cterm=NONE ctermbg=NONE ctermfg=59 +hi Boolean cterm=NONE ctermbg=NONE ctermfg=208 +hi String cterm=NONE ctermbg=NONE ctermfg=101 +hi Identifier cterm=NONE ctermbg=NONE ctermfg=145 +hi Function cterm=NONE ctermbg=NONE ctermfg=230 +hi Type cterm=NONE ctermbg=NONE ctermfg=103 +hi Statement cterm=NONE ctermbg=NONE ctermfg=110 +hi Keyword cterm=NONE ctermbg=NONE ctermfg=110 +hi Constant cterm=NONE ctermbg=NONE ctermfg=208 +hi Number cterm=NONE ctermbg=NONE ctermfg=172 +hi Special cterm=NONE ctermbg=NONE ctermfg=64 +hi PreProc cterm=NONE ctermbg=NONE ctermfg=66 +hi Todo cterm=bold,underline ctermbg=234 ctermfg=96 + +hi diffOldFile cterm=NONE ctermbg=NONE ctermfg=67 +hi diffNewFile cterm=NONE ctermbg=NONE ctermfg=67 +hi diffFile cterm=NONE ctermbg=NONE ctermfg=67 +hi diffLine cterm=NONE ctermbg=NONE ctermfg=67 +hi diffAdded cterm=NONE ctermfg=NONE ctermfg=71 +hi diffRemoved cterm=NONE ctermfg=NONE ctermfg=124 +hi diffChanged cterm=NONE ctermfg=NONE ctermfg=68 +hi link diffSubname diffLine +hi link diffOnly Constant +hi link diffIdentical Constant +hi link diffDiffer Constant +hi link diffBDiffer Constant +hi link diffIsA Constant +hi link diffNoEOL Constant +hi link diffCommon Constant +hi link diffComment Constant + +hi pythonClass cterm=NONE ctermbg=NONE ctermfg=fg +hi pythonDecorator cterm=NONE ctermbg=NONE ctermfg=101 +hi pythonExClass cterm=NONE ctermbg=NONE ctermfg=95 +hi pythonException cterm=NONE ctermbg=NONE ctermfg=110 +hi pythonFunc cterm=NONE ctermbg=NONE ctermfg=fg +hi pythonFuncParams cterm=NONE ctermbg=NONE ctermfg=fg +hi pythonKeyword cterm=NONE ctermbg=NONE ctermfg=fg +hi pythonParam cterm=NONE ctermbg=NONE ctermfg=fg +hi pythonRawEscape cterm=NONE ctermbg=NONE ctermfg=fg +hi pythonSuperclasses cterm=NONE ctermbg=NONE ctermfg=fg +hi pythonSync cterm=NONE ctermbg=NONE ctermfg=fg + +hi Conceal cterm=NONE ctermbg=248 ctermfg=252 +hi Error cterm=NONE ctermbg=196 ctermfg=231 +hi Ignore cterm=NONE ctermbg=NONE ctermfg=234 +hi InsertModeCursorLine cterm=NONE ctermbg=16 ctermfg=fg +hi NormalModeCursorLine cterm=NONE ctermbg=235 ctermfg=fg +hi PmenuThumb cterm=reverse ctermbg=NONE ctermfg=fg +hi StatusLineAlert cterm=NONE ctermbg=160 ctermfg=231 +hi StatusLineUnalert cterm=NONE ctermbg=238 ctermfg=144 +hi Test cterm=NONE ctermbg=NONE ctermfg=fg +hi Underlined cterm=underline ctermbg=NONE ctermfg=111 +hi VisualNOS cterm=bold,underline ctermbg=NONE ctermfg=fg +hi cCursor cterm=reverse ctermbg=NONE ctermfg=fg +hi iCursor cterm=NONE ctermbg=210 ctermfg=16 +hi lCursor cterm=NONE ctermbg=145 ctermfg=234 +hi nCursor cterm=NONE ctermbg=46 ctermfg=16 +hi vCursor cterm=NONE ctermbg=201 ctermfg=16 +" 1}}} + diff --git a/vim/.vim/undo/.gitignore b/vim/.vim/undo/.gitignore new file mode 100644 index 0000000..13e4d83 --- /dev/null +++ b/vim/.vim/undo/.gitignore @@ -0,0 +1 @@ +[^.]* @@ -1,45 +1,127 @@ -"█▓▒░ autoload -execute pathogen#infect() - -let g:airline#extensions#tabline#enabled = 1 -let g:airline#extensions#whitespace#enabled = 0 -let g:airline_powerline_fonts = 0 -let g:airline_theme = 'tomorrow' -let g:airline_enable_branch = 1 -let g:airline_enable_syntastic = 1 - -if !exists('g:airline_symbols') - let g:airline_symbols = {} -endif -let g:airline_left_sep = '▒' -let g:airline_left_alt_sep = '▒' -let g:airline_right_sep = '▒' -let g:airline_right_alt_sep = '▒' -let g:airline_symbols.branch = '▓' -let g:airline_symbols.linenr = '░' -let g:airline_symbols.linenr = '░' -let g:airline_symbols.linenr = '░' -let g:airline_symbols.branch = '▓' -let g:airline_symbols.paste = '▓' -let g:airline_symbols.whitespace = '░' -let g:airline_symbols.readonly = '█' - -let g:startify_custom_header = [ - \ '', - \ ' ██ ██ ████ ██ ', - \ ' ░██ ░██ ░██░ ░░ ', - \ ' █████ ░██ ██ ██ ██████ ██████ ██████ ██ ██ ██ ██████████ ', - \ ' ██░░░██ ░██░██ ░██░░░██░ ██░░░░██░░░██░ ░██ ░██░██░░██░░██░░██', - \ '░██ ░░ ░██░██ ░██ ░██ ░██ ░██ ░██ ░░██ ░██ ░██ ░██ ░██ ░██', - \ '░██ ██ ░██░██ ░██ ░██ ░██ ░██ ░██ ░░████ ░██ ░██ ░██ ░██', - \ '░░█████ ███░░██████ ░░██ ░░██████ ░██ ░░██ ░██ ███ ░██ ░██', - \ ' ░░░░░ ░░░ ░░░░░░ ░░ ░░░░░░ ░░ ░░ ░░ ░░░ ░░ ░░ ', - \ '', - \ ] +" ██ +" ░░ +" ██ ██ ██ ██████████ ██████ █████ +" ░██ ░██░██░░██░░██░░██░░██░░█ ██░░░██ +" ░░██ ░██ ░██ ░██ ░██ ░██ ░██ ░ ░██ ░░ +" ░░████ ░██ ░██ ░██ ░██ ░██ ░██ ██ +" ░░██ ░██ ███ ░██ ░██░███ ░░█████ +" ░░ ░░ ░░░ ░░ ░░ ░░░ ░░░░░ +" +" ▓▓▓▓▓▓▓▓▓▓ +" ░▓ author ▓ xero <x@xero.nu> +" ░▓ code ▓ http://code.xero.nu/dotfiles +" ░▓ mirror ▓ http://git.io/.files +" ░▓▓▓▓▓▓▓▓▓▓ +" ░░░░░░░░░░ -set laststatus=2 -set lazyredraw +" use vim settings, rather than vi settings +" must be first, because it changes other options as a side effect +set nocompatible + +" paste without auto indentation +set paste + +" maintain undo history between sessions +set undofile +set undodir=~/.vim/undo +set noswapfile + +" file name tab completion +set wildmode=longest,list,full +set wildmenu +" make backspace behave in a sane manner +set backspace=indent,eol,start + +" disable startup message +set shortmess+=I + +" syntax highlighting and colors syntax on -colorscheme monokai +colorscheme sorcerer filetype plugin indent on + +" stop unnecessary rendering +set lazyredraw + +" show line numbers +set number + +" no line wrapping +set nowrap + +" no folding +set foldlevel=99 +set foldminlines=99 + +" enable file type detection and do language-dependent indenting +if has("autocmd") + filetype on + filetype indent on + filetype plugin on +endif + +" let mapleader="," +vnoremap <silent> <leader>y :w !xsel -i -b<CR> +nnoremap <silent> <leader>y V:w !xsel -i -b<CR> +nnoremap <silent> <leader>p :silent :r !xsel -o -b<CR> + +" remap code completion to ^space +inoremap <Nul> <C-x><C-o> + +" █▓▒░ wizard status line +set laststatus=2 + +hi BgColor guibg=#3A3A3A guifg=#ffffff ctermbg=237 ctermfg=255 +hi ModColor guibg=#3A3A3A guifg=#afaf00 ctermbg=237 ctermfg=142 +hi StatColor guibg=#3a3a3a guifg=#ffffff ctermbg=237 ctermfg=255 +hi GitColor guibg=#4e4e4e guifg=#ffffff ctermbg=239 ctermfg=255 +hi VoidColor guibg=#222222 guifg=#4e4e4e ctermbg=NONE ctermfg=239 +hi TypeColor guibg=#D78700 guifg=#262626 ctermbg=66 ctermfg=235 +hi PosColor guibg=#8787AF guifg=#262626 ctermbg=103 ctermfg=235 + +function! WizardStatus(mode) + let statusline="%#BgColor#" + if &modified == 1 + let statusline.="%#ModColor# »» " + else + let statusline.=" " + endif + if &readonly != '' + hi StatColor guifg=#af0000 ctermfg=124 + endif + let statusline.="%#StatColor#%F " + "let branch = system("git branch 2> /dev/null | sed -e '/^[^*]/d'") + let branch = system("git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* //'") + if branch != '' + let statusline .= '%#VoidColor#▓%#GitColor# ' . substitute(branch, '\n', '', 'g') . ' %#VoidColor#▓▒░ ' + else + let statusline .= '%#VoidColor#▒░ ' + endif + let statusline .= "%=%h%w\ %#TypeColor#▓" + if &filetype != '' + let statusline .="▒ %Y " + endif + let statusline .="▒ %{&encoding}:%{&fileformat} %#PosColor#▒ %p%% ░ %l/%L\.\%c\ ▒" + return statusline +endfunction + +au WinEnter * setlocal statusline=%!WizardStatus('Enter') +au WinLeave * setlocal statusline=%!WizardStatus('Leave') +set statusline=%!WizardStatus('Enter') + +function! Colorize(mode) + if a:mode == 'i' + hi StatColor guibg=#D78700 guifg=#222222 ctermbg=110 ctermfg=235 + elseif a:mode == 'r' + hi StatColor guibg=#D78700 guifg=#222222 ctermbg=172 ctermfg=235 + elseif a:mode == 'v' + hi StatColor guibg=#D78700 guifg=#222222 ctermbg=172 ctermfg=235 + else + hi StatColor guibg=#af0000 guifg=#222222 ctermbg=124 ctermfg=235 + endif +endfunction + +au InsertEnter * call Colorize(v:insertmode) +:au InsertLeave * hi StatColor guibg=#3a3a3a guifg=#ffffff ctermbg=237 ctermfg=255 + |