diff --git a/bashrc b/bashrc index 8a3e4c5..4a479c9 100644 --- a/bashrc +++ b/bashrc @@ -50,3 +50,7 @@ export HISTIGNORE="&:[ ]*:ls:ll:la:l:cd:pwd:exit:mc:su:df:clear" export PATH="/usr/local/heroku/bin:$PATH" export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting + +export NVM_DIR="/Users/matt9330/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm +ssh-add -A diff --git a/gitconfig b/gitconfig index 3553767..ad1bb91 100644 --- a/gitconfig +++ b/gitconfig @@ -14,3 +14,5 @@ d = difftool lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit -- undo = reset --soft HEAD^ +[merge] + tool = opendiff diff --git a/vimfolder/bundle/bclose/plugin/bclose.vim b/vimfolder/bundle/bclose/plugin/bclose.vim deleted file mode 100644 index 90318b2..0000000 --- a/vimfolder/bundle/bclose/plugin/bclose.vim +++ /dev/null @@ -1,73 +0,0 @@ -" Delete buffer while keeping window layout (don't close buffer's windows). -" Version 2008-11-18 from http://vim.wikia.com/wiki/VimTip165 -if v:version < 700 || exists('loaded_bclose') || &cp - finish -endif -let loaded_bclose = 1 -if !exists('bclose_multiple') - let bclose_multiple = 1 -endif - -" Display an error message. -function! s:Warn(msg) - echohl ErrorMsg - echomsg a:msg - echohl NONE -endfunction - -" Command ':Bclose' executes ':bd' to delete buffer in current window. -" The window will show the alternate buffer (Ctrl-^) if it exists, -" or the previous buffer (:bp), or a blank buffer if no previous. -" Command ':Bclose!' is the same, but executes ':bd!' (discard changes). -" An optional argument can specify which buffer to close (name or number). -function! s:Bclose(bang, buffer) - if empty(a:buffer) - let btarget = bufnr('%') - elseif a:buffer =~ '^\d\+$' - let btarget = bufnr(str2nr(a:buffer)) - else - let btarget = bufnr(a:buffer) - endif - if btarget < 0 - call s:Warn('No matching buffer for '.a:buffer) - return - endif - if empty(a:bang) && getbufvar(btarget, '&modified') - call s:Warn('No write since last change for buffer '.btarget.' (use :Bclose!)') - return - endif - " Numbers of windows that view target buffer which we will delete. - let wnums = filter(range(1, winnr('$')), 'winbufnr(v:val) == btarget') - if !g:bclose_multiple && len(wnums) > 1 - call s:Warn('Buffer is in multiple windows (use ":let bclose_multiple=1")') - return - endif - let wcurrent = winnr() - for w in wnums - execute w.'wincmd w' - let prevbuf = bufnr('#') - if prevbuf > 0 && buflisted(prevbuf) && prevbuf != w - buffer # - else - bprevious - endif - if btarget == bufnr('%') - " Numbers of listed buffers which are not the target to be deleted. - let blisted = filter(range(1, bufnr('$')), 'buflisted(v:val) && v:val != btarget') - " Listed, not target, and not displayed. - let bhidden = filter(copy(blisted), 'bufwinnr(v:val) < 0') - " Take the first buffer, if any (could be more intelligent). - let bjump = (bhidden + blisted + [-1])[0] - if bjump > 0 - execute 'buffer '.bjump - else - execute 'enew'.a:bang - endif - endif - endfor - execute 'bdelete'.a:bang.' '.btarget - execute wcurrent.'wincmd w' -endfunction -command! -bang -complete=buffer -nargs=? Bclose call Bclose('', '') -nnoremap bd :Bclose - diff --git a/vimfolder/bundle/clojure b/vimfolder/bundle/clojure deleted file mode 160000 index ab5086f..0000000 --- a/vimfolder/bundle/clojure +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ab5086fc7f85fa62adbd2c519206eb4fe0a4b71a diff --git a/vimfolder/bundle/ctrlp b/vimfolder/bundle/ctrlp deleted file mode 160000 index b5d3fe6..0000000 --- a/vimfolder/bundle/ctrlp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f diff --git a/vimfolder/bundle/delimitMate b/vimfolder/bundle/delimitMate index 39b8298..8bc47fd 160000 --- a/vimfolder/bundle/delimitMate +++ b/vimfolder/bundle/delimitMate @@ -1 +1 @@ -Subproject commit 39b8298390a9171c796df077ad3c5f3c0f111c56 +Subproject commit 8bc47fd1c40cdad9ea1f36c0cf13592c70ea65e9 diff --git a/vimfolder/bundle/fugitive b/vimfolder/bundle/fugitive deleted file mode 160000 index 00b0916..0000000 --- a/vimfolder/bundle/fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 00b0916ae2fc4e329f519686348de13d7477d770 diff --git a/vimfolder/bundle/git b/vimfolder/bundle/git deleted file mode 160000 index ca001e5..0000000 --- a/vimfolder/bundle/git +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ca001e529f3d02675d66f9dd8b7253ab4f284ee1 diff --git a/vimfolder/bundle/govim/ftdetect/gofiletype.vim b/vimfolder/bundle/govim/ftdetect/gofiletype.vim deleted file mode 100644 index 8843121..0000000 --- a/vimfolder/bundle/govim/ftdetect/gofiletype.vim +++ /dev/null @@ -1 +0,0 @@ -au BufRead,BufNewFile *.go set filetype=go diff --git a/vimfolder/bundle/govim/ftplugin/go/fmt.vim b/vimfolder/bundle/govim/ftplugin/go/fmt.vim deleted file mode 100644 index 18a2156..0000000 --- a/vimfolder/bundle/govim/ftplugin/go/fmt.vim +++ /dev/null @@ -1,30 +0,0 @@ -" Copyright 2011 The Go Authors. All rights reserved. -" Use of this source code is governed by a BSD-style -" license that can be found in the LICENSE file. -" -" fmt.vim: Vim command to format Go files with gofmt. -" -" This filetype plugin add a new commands for go buffers: -" -" :Fmt -" -" Filter the current Go buffer through gofmt. -" It tries to preserve cursor position and avoids -" replacing the buffer with stderr output. -" - -command! Fmt call s:GoFormat() - -function! s:GoFormat() - let view = winsaveview() - %!gofmt - if v:shell_error - %| " output errors returned by gofmt - " TODO(dchest): perhaps, errors should go to quickfix - undo - echohl Error | echomsg "Gofmt returned error" | echohl None - endif - call winrestview(view) -endfunction - -" vim:ts=4:sw=4:et diff --git a/vimfolder/bundle/govim/ftplugin/go/import.vim b/vimfolder/bundle/govim/ftplugin/go/import.vim deleted file mode 100644 index b5814ca..0000000 --- a/vimfolder/bundle/govim/ftplugin/go/import.vim +++ /dev/null @@ -1,201 +0,0 @@ -" Copyright 2011 The Go Authors. All rights reserved. -" Use of this source code is governed by a BSD-style -" license that can be found in the LICENSE file. -" -" import.vim: Vim commands to import/drop Go packages. -" -" This filetype plugin adds three new commands for go buffers: -" -" :Import {path} -" -" Import ensures that the provided package {path} is imported -" in the current Go buffer, using proper style and ordering. -" If {path} is already being imported, an error will be -" displayed and the buffer will be untouched. -" -" :ImportAs {localname} {path} -" -" Same as Import, but uses a custom local name for the package. -" -" :Drop {path} -" -" Remove the import line for the provided package {path}, if -" present in the current Go buffer. If {path} is not being -" imported, an error will be displayed and the buffer will be -" untouched. -" -" In addition to these commands, there are also two shortcuts mapped: -" -" \f - Runs :Import fmt -" \F - Runs :Drop fmt -" -" The backslash is the default maplocalleader, so it is possible that -" your vim is set to use a different character (:help maplocalleader). -" -if exists("b:did_ftplugin") - finish -endif - -command! -buffer -nargs=? Drop call s:SwitchImport(0, '', ) -command! -buffer -nargs=1 Import call s:SwitchImport(1, '', ) -command! -buffer -nargs=* ImportAs call s:SwitchImport(1, ) -map f :Import fmt -map F :Drop fmt - -function! s:SwitchImport(enabled, localname, path) - let view = winsaveview() - let path = a:path - - " Quotes are not necessary, so remove them if provided. - if path[0] == '"' - let path = strpart(path, 1) - endif - if path[len(path)-1] == '"' - let path = strpart(path, 0, len(path) - 1) - endif - if path == '' - call s:Error('Import path not provided') - return - endif - - let qpath = '"' . path . '"' - if a:localname != '' - let qlocalpath = a:localname . ' ' . qpath - else - let qlocalpath = qpath - endif - let indentstr = 0 - let packageline = -1 " Position of package name statement - let appendline = -1 " Position to introduce new import - let deleteline = -1 " Position of line with existing import - let linesdelta = 0 " Lines added/removed - - " Find proper place to add/remove import. - let line = 0 - while line <= line('$') - let linestr = getline(line) - - if linestr =~# '^package\s' - let packageline = line - let appendline = line - - elseif linestr =~# '^import\s\+(' - let appendstr = qlocalpath - let indentstr = 1 - let appendline = line - while line <= line("$") - let line = line + 1 - let linestr = getline(line) - let m = matchlist(getline(line), '^\()\|\(\s\+\)\(\S*\s*\)"\(.\+\)"\)') - if empty(m) - continue - endif - if m[1] == ')' - break - endif - if a:localname != '' && m[3] != '' - let qlocalpath = printf('%-' . (len(m[3])-1) . 's %s', a:localname, qpath) - endif - let appendstr = m[2] . qlocalpath - let indentstr = 0 - if m[4] == path - let appendline = -1 - let deleteline = line - break - elseif m[4] < path - let appendline = line - endif - endwhile - break - - elseif linestr =~# '^import ' - if appendline == packageline - let appendstr = 'import ' . qlocalpath - let appendline = line - 1 - endif - let m = matchlist(linestr, '^import\(\s\+\)\(\S*\s*\)"\(.\+\)"') - if !empty(m) - if m[3] == path - let appendline = -1 - let deleteline = line - break - endif - if m[3] < path - let appendline = line - endif - if a:localname != '' && m[2] != '' - let qlocalpath = printf("%s %" . len(m[2])-1 . "s", a:localname, qpath) - endif - let appendstr = 'import' . m[1] . qlocalpath - endif - - elseif linestr =~# '^\(var\|const\|type\|func\)\>' - break - - endif - let line = line + 1 - endwhile - - " Append or remove the package import, as requested. - if a:enabled - if deleteline != -1 - call s:Error(qpath . ' already being imported') - elseif appendline == -1 - call s:Error('No package line found') - else - if appendline == packageline - call append(appendline + 0, '') - call append(appendline + 1, 'import (') - call append(appendline + 2, ')') - let appendline += 2 - let linesdelta += 3 - let appendstr = qlocalpath - let indentstr = 1 - endif - call append(appendline, appendstr) - execute appendline + 1 - if indentstr - execute 'normal >>' - endif - let linesdelta += 1 - endif - else - if deleteline == -1 - call s:Error(qpath . ' not being imported') - else - execute deleteline . 'd' - let linesdelta -= 1 - - if getline(deleteline-1) =~# '^import\s\+(' && getline(deleteline) =~# '^)' - " Delete empty import block - let deleteline -= 1 - execute deleteline . "d" - execute deleteline . "d" - let linesdelta -= 2 - endif - - if getline(deleteline) == '' && getline(deleteline - 1) == '' - " Delete spacing for removed line too. - execute deleteline . "d" - let linesdelta -= 1 - endif - endif - endif - - " Adjust view for any changes. - let view.lnum += linesdelta - let view.topline += linesdelta - if view.topline < 0 - let view.topline = 0 - endif - - " Put buffer back where it was. - call winrestview(view) - -endfunction - -function! s:Error(s) - echohl Error | echo a:s | echohl None -endfunction - -" vim:ts=4:sw=4:et diff --git a/vimfolder/bundle/govim/indent/go.vim b/vimfolder/bundle/govim/indent/go.vim deleted file mode 100644 index 2e9f191..0000000 --- a/vimfolder/bundle/govim/indent/go.vim +++ /dev/null @@ -1,30 +0,0 @@ -" Copyright 2011 The Go Authors. All rights reserved. -" Use of this source code is governed by a BSD-style -" license that can be found in the LICENSE file. -" -" indent/go.vim: Vim indent file for Go. -" - -if exists("b:did_indent") - finish -endif -let b:did_indent = 1 - -" C indentation is mostly correct -setlocal cindent - -" Options set: -" +0 -- Don't indent continuation lines (because Go doesn't use semicolons -" much) -" L0 -- Don't move jump labels (NOTE: this isn't correct when working with -" gofmt, but it does keep struct literals properly indented.) -" :0 -- Align case labels with switch statement -" l1 -- Always align case body relative to case labels -" J1 -- Indent JSON-style objects (properly indents struct-literals) -" (0, Ws -- Indent lines inside of unclosed parentheses by one shiftwidth -" m1 -- Align closing parenthesis line with first non-blank of matching -" parenthesis line -" -" Known issue: Trying to do a multi-line struct literal in a short variable -" declaration will not indent properly. -setlocal cinoptions+=+0,L0,:0,l1,J1,(0,Ws,m1 diff --git a/vimfolder/bundle/govim/readme.txt b/vimfolder/bundle/govim/readme.txt deleted file mode 100644 index 3c32551..0000000 --- a/vimfolder/bundle/govim/readme.txt +++ /dev/null @@ -1,50 +0,0 @@ -Vim syntax highlighting for Go (http://golang.org) -================================================== - -To install automatic syntax highlighting for GO programs: - - 1. Copy or link the filetype detection script to the ftdetect directory - underneath your vim runtime directory (normally $HOME/.vim/ftdetect) - 2. Copy or link syntax/go.vim to the syntax directory underneath your vim - runtime directory (normally $HOME/.vim/syntax). Linking this file rather - than just copying it will ensure any changes are automatically reflected - in your syntax highlighting. - 3. Add the following line to your .vimrc file (normally $HOME/.vimrc): - - syntax on - -In a typical unix environment you might accomplish this using the following -commands: - - mkdir -p $HOME/.vim/ftdetect - mkdir -p $HOME/.vim/syntax - ln -s $GOROOT/misc/vim/ftdetect/gofiletype.vim $HOME/.vim/ftdetect/ - ln -s $GOROOT/misc/vim/syntax/go.vim $HOME/.vim/syntax - echo "syntax on" >> $HOME/.vimrc - - -Vim filetype plugins for Go -=========================== - -To install one of the available filetype plugins for Go: - - 1. Same as 1 above. - 2. Copy or link one or more plugins from ftplugin/go/*.vim to the - Go-specific ftplugin directory underneath your vim runtime directory - (normally $HOME/.vim/ftplugin/go/*.vim). - 3. Add the following line to your .vimrc file (normally $HOME/.vimrc): - - filetype plugin on - - -Vim indentation plugin for Go -============================= - -To install automatic indentation for Go: - - 1. Same as 1 above. - 2. Copy or link indent/go.vim to the indent directory underneath your vim - runtime directory (normally $HOME/.vim/indent). - 3. Add the following line to your .vimrc file (normally $HOME/.vimrc): - - filetype indent on diff --git a/vimfolder/bundle/govim/syntax/go.vim b/vimfolder/bundle/govim/syntax/go.vim deleted file mode 100644 index 26d7def..0000000 --- a/vimfolder/bundle/govim/syntax/go.vim +++ /dev/null @@ -1,208 +0,0 @@ -" Copyright 2009 The Go Authors. All rights reserved. -" Use of this source code is governed by a BSD-style -" license that can be found in the LICENSE file. -" -" go.vim: Vim syntax file for Go. -" -" Options: -" There are some options for customizing the highlighting; the recommended -" settings are the default values, but you can write: -" let OPTION_NAME = 0 -" in your ~/.vimrc file to disable particular options. You can also write: -" let OPTION_NAME = 1 -" to enable particular options. At present, all options default to on. -" -" - go_highlight_array_whitespace_error -" Highlights white space after "[]". -" - go_highlight_chan_whitespace_error -" Highlights white space around the communications operator that don't follow -" the standard style. -" - go_highlight_extra_types -" Highlights commonly used library types (os.Error, etc.). -" - go_highlight_space_tab_error -" Highlights instances of tabs following spaces. -" - go_highlight_trailing_whitespace_error -" Highlights trailing white space. - -" Quit when a (custom) syntax file was already loaded -if exists("b:current_syntax") - finish -endif - -if !exists("go_highlight_array_whitespace_error") - let go_highlight_array_whitespace_error = 1 -endif -if !exists("go_highlight_chan_whitespace_error") - let go_highlight_chan_whitespace_error = 1 -endif -if !exists("go_highlight_extra_types") - let go_highlight_extra_types = 1 -endif -if !exists("go_highlight_space_tab_error") - let go_highlight_space_tab_error = 1 -endif -if !exists("go_highlight_trailing_whitespace_error") - let go_highlight_trailing_whitespace_error = 1 -endif - -syn case match - -syn keyword goDirective package import -syn keyword goDeclaration var const type -syn keyword goDeclType struct interface - -hi def link goDirective Statement -hi def link goDeclaration Keyword -hi def link goDeclType Keyword - -" Keywords within functions -syn keyword goStatement defer go goto return break continue fallthrough -syn keyword goConditional if else switch select -syn keyword goLabel case default -syn keyword goRepeat for range - -hi def link goStatement Statement -hi def link goConditional Conditional -hi def link goLabel Label -hi def link goRepeat Repeat - -" Predefined types -syn keyword goType chan map bool string -syn keyword goSignedInts int int8 int16 int32 int64 -syn keyword goUnsignedInts byte uint uint8 uint16 uint32 uint64 uintptr -syn keyword goFloats float32 float64 -syn keyword goComplexes complex64 complex128 - -hi def link goType Type -hi def link goSignedInts Type -hi def link goUnsignedInts Type -hi def link goFloats Type -hi def link goComplexes Type - -" Treat func specially: it's a declaration at the start of a line, but a type -" elsewhere. Order matters here. -syn match goType /\/ -syn match goDeclaration /^func\>/ - -" Predefined functions and values -syn keyword goBuiltins append cap close complex copy imag len -syn keyword goBuiltins make new panic print println real recover -syn keyword goConstants iota true false nil - -hi def link goBuiltins Keyword -hi def link goConstants Keyword - -" Comments; their contents -syn keyword goTodo contained TODO FIXME XXX BUG -syn cluster goCommentGroup contains=goTodo -syn region goComment start="/\*" end="\*/" contains=@goCommentGroup,@Spell -syn region goComment start="//" end="$" contains=@goCommentGroup,@Spell - -hi def link goComment Comment -hi def link goTodo Todo - -" Go escapes -syn match goEscapeOctal display contained "\\[0-7]\{3}" -syn match goEscapeC display contained +\\[abfnrtv\\'"]+ -syn match goEscapeX display contained "\\x\x\{2}" -syn match goEscapeU display contained "\\u\x\{4}" -syn match goEscapeBigU display contained "\\U\x\{8}" -syn match goEscapeError display contained +\\[^0-7xuUabfnrtv\\'"]+ - -hi def link goEscapeOctal goSpecialString -hi def link goEscapeC goSpecialString -hi def link goEscapeX goSpecialString -hi def link goEscapeU goSpecialString -hi def link goEscapeBigU goSpecialString -hi def link goSpecialString Special -hi def link goEscapeError Error - -" Strings and their contents -syn cluster goStringGroup contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError -syn region goString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup -syn region goRawString start=+`+ end=+`+ - -hi def link goString String -hi def link goRawString String - -" Characters; their contents -syn cluster goCharacterGroup contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU -syn region goCharacter start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@goCharacterGroup - -hi def link goCharacter Character - -" Regions -syn region goBlock start="{" end="}" transparent fold -syn region goParen start='(' end=')' transparent - -" Integers -syn match goDecimalInt "\<\d\+\([Ee]\d\+\)\?\>" -syn match goHexadecimalInt "\<0x\x\+\>" -syn match goOctalInt "\<0\o\+\>" -syn match goOctalError "\<0\o*[89]\d*\>" - -hi def link goDecimalInt Integer -hi def link goHexadecimalInt Integer -hi def link goOctalInt Integer -hi def link Integer Number - -" Floating point -syn match goFloat "\<\d\+\.\d*\([Ee][-+]\d\+\)\?\>" -syn match goFloat "\<\.\d\+\([Ee][-+]\d\+\)\?\>" -syn match goFloat "\<\d\+[Ee][-+]\d\+\>" - -hi def link goFloat Float - -" Imaginary literals -syn match goImaginary "\<\d\+i\>" -syn match goImaginary "\<\d\+\.\d*\([Ee][-+]\d\+\)\?i\>" -syn match goImaginary "\<\.\d\+\([Ee][-+]\d\+\)\?i\>" -syn match goImaginary "\<\d\+[Ee][-+]\d\+i\>" - -hi def link goImaginary Number - -" Spaces after "[]" -if go_highlight_array_whitespace_error != 0 - syn match goSpaceError display "\(\[\]\)\@<=\s\+" -endif - -" Spacing errors around the 'chan' keyword -if go_highlight_chan_whitespace_error != 0 - " receive-only annotation on chan type - syn match goSpaceError display "\(<-\)\@<=\s\+\(chan\>\)\@=" - " send-only annotation on chan type - syn match goSpaceError display "\(\/ - syn match goExtraType /\/ - syn match goExtraType /\<\(os\.Error\)\>/ - syn match goExtraType /\/ - syn match goExtraType /\/ -endif - -" Space-tab error -if go_highlight_space_tab_error != 0 - syn match goSpaceError display " \+\t"me=e-1 -endif - -" Trailing white space error -if go_highlight_trailing_whitespace_error != 0 - syn match goSpaceError display excludenl "\s\+$" -endif - -hi def link goExtraType Type -hi def link goSpaceError Error - -" Search backwards for a global declaration to start processing the syntax. -"syn sync match goSync grouphere NONE /^\(const\|var\|type\|func\)\>/ - -" There's a bug in the implementation of grouphere. For now, use the -" following as a more expensive/less precise workaround. -syn sync minlines=500 - -let b:current_syntax = "go" diff --git a/vimfolder/bundle/gundo b/vimfolder/bundle/gundo deleted file mode 160000 index 584f1d5..0000000 --- a/vimfolder/bundle/gundo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 584f1d52f827ed26bba774a1f77080f104af9894 diff --git a/vimfolder/bundle/jedi-vim b/vimfolder/bundle/jedi-vim deleted file mode 160000 index ddad7b8..0000000 --- a/vimfolder/bundle/jedi-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ddad7b8a901d9363fd248cf517021fd1b8e4c95b diff --git a/vimfolder/bundle/jquery/syntax/jquery.vim b/vimfolder/bundle/jquery/syntax/jquery.vim deleted file mode 100644 index ed85eaf..0000000 --- a/vimfolder/bundle/jquery/syntax/jquery.vim +++ /dev/null @@ -1,106 +0,0 @@ -" Vim syntax file -" Language: jQuery -" Maintainer: Bruno Michel -" Last Change: Jan 14, 2010 -" Version: 0.3 -" URL: http://jquery.com/ - -if exists("b:current_syntax") && b:current_syntax =~ "jquery" - finish -endif - - -syn match jQuery /jQuery\|\$/ - - -syn match jFunc /\.\w\+(/ contains=@jFunctions - -syn cluster jFunctions contains=jCore,jAttributes,jTraversing,jManipulation,jCSS,jEvents,jAjax,jUtilities,jEffects -syn keyword jCore contained each size length selector context eq get index toArray -syn keyword jCore contained data removeData clearQueue queue dequeue -syn keyword jCore contained extend noConflict -syn keyword jAttributes contained attr removeAttr addClass removeClass toggleClass html text val -syn keyword jTraversing contained eq filter has is map not slice -syn keyword jTraversing contained add children closest contents find next nextAll nextUntil parent parents parentsUntil prev prevAll prevUntil siblings -syn keyword jTraversing contained andSelf end -syn keyword jManipulation contained append appendTo preprend prependTo -syn keyword jManipulation contained after before insertAfter insertBefore -syn keyword jManipulation contained unwrap wrap wrapAll wrapInner -syn keyword jManipulation contained replaceWith replaceAll -syn keyword jManipulation contained detach empty remove -syn keyword jManipulation contained clone -syn keyword jCSS contained css -syn keyword jCSS contained offset offsetParent position scrollTop scrollLeft -syn keyword jCSS contained height width innerHeight innerWidth outerHeight outerWidth -syn keyword jEvents contained ready -syn keyword jEvents contained bind one trigger triggerHandler unbind -syn keyword jEvents contained live die -syn keyword jEvents contained hover toggle -syn keyword jEvents contained blur change click dblclick error focus focusin focusout keydown keypress keyup load -syn keyword jEvents contained mousedown mouseenter mouseleave mousemove mouseout mouseover mouseup resize scroll select submit unload -syn keyword jEffects contained show hide toggle -syn keyword jEffects contained slideDown slideUp slideToggle -syn keyword jEffects contained fadeIn fadeOut fadeTo -syn keyword jEffects contained animate stop delay -syn keyword jAjax contained ajax load get getJSON getScript post -syn keyword jAjax contained ajaxComplete ajaxError ajaxSend ajaxStart ajaxStop ajaxSuccess -syn keyword jAjax contained ajaxSetup serialize serializeArray -syn keyword jUtilities contained support browser boxModel -syn keyword jUtilities contained extend grep makeArray map inArray merge noop proxy unique -syn keyword jUtilities contained isArray isEmptyObject isFunction isPlainObject -syn keyword jUtilities contained trim param - - -syn region javaScriptStringD start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contains=javaScriptSpecial,@htmlPreproc,@jSelectors -syn region javaScriptStringS start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contains=javaScriptSpecial,@htmlPreproc,@jSelectors - -syn cluster jSelectors contains=jId,jClass,jOperators,jBasicFilters,jContentFilters,jVisibility,jChildFilters,jForms,jFormFilters -syn match jId contained /#[0-9A-Za-z_\-]\+/ -syn match jClass contained /\.[0-9A-Za-z_\-]\+/ -syn match jOperators contained /*\|>\|>|\~/ -syn match jBasicFilters contained /:\(first\|last\|not\|even\|odd\|eq\|gt\|lt\|header\|animated\)/ -syn match jContentFilters contained /:\(contains\|empty\|has\|parent\)/ -syn match jVisibility contained /:\(hidden\|visible\)/ -syn match jChildFilters contained /:\(nth\|first\|last\|only\)-child/ -syn match jForms contained /:\(input\|text\|password\|radio\|checkbox\|submit\|image\|reset\|button\|file\)/ -syn match jFormFilters contained /:\(enabled\|disabled\|checked\|selected\)/ - - -" Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_lisp_syntax_inits") - if version < 508 - let did_lisp_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink jQuery Constant - - HiLink jCore Identifier - HiLink jAttributes Identifier - HiLink jTraversing Identifier - HiLink jManipulation Identifier - HiLink jCSS Identifier - HiLink jEvents Identifier - HiLink jEffects Identifier - HiLink jAjax Identifier - HiLink jUtilities Identifier - - HiLink jId Identifier - HiLink jClass Constant - HiLink jOperators Special - HiLink jBasicFilters Statement - HiLink jContentFilters Statement - HiLink jVisibility Statement - HiLink jChildFilters Statement - HiLink jForms Statement - HiLink jFormFilters Statement - - delcommand HiLink -endif - - -let b:current_syntax = 'javascript.jquery' diff --git a/vimfolder/bundle/less b/vimfolder/bundle/less deleted file mode 160000 index 3c2a265..0000000 --- a/vimfolder/bundle/less +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3c2a265b89d1d9848633cfc1642d2e78ecd73a25 diff --git a/vimfolder/bundle/makegreen b/vimfolder/bundle/makegreen deleted file mode 160000 index eb04971..0000000 --- a/vimfolder/bundle/makegreen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eb04971f545a4656c19a5374b748bd6c0bc459a3 diff --git a/vimfolder/bundle/molokai/README.md b/vimfolder/bundle/molokai/README.md index 95c6f64..cd92bda 100644 --- a/vimfolder/bundle/molokai/README.md +++ b/vimfolder/bundle/molokai/README.md @@ -19,12 +19,8 @@ If you prefer the scheme to match the original monokai background color, put thi let g:molokai_original = 1 ``` -There is also an alternative sheme under development for color terminals which attempts to bring the 256 color version as close as possible to the the default (dark) GUI version. To access, add this to your .vimrc: +There is also an alternative scheme under development for color terminals which attempts to bring the 256 color version as close as possible to the the default (dark) GUI version. To access, add this to your .vimrc: ``` let g:rehash256 = 1 ``` -Note: when using the console version, add this command after enabling the colorscheme in your .vimrc: -``` -set background=dark -``` diff --git a/vimfolder/bundle/molokai/colors/molokai.vim b/vimfolder/bundle/molokai/colors/molokai.vim index 58442c2..6d97053 100644 --- a/vimfolder/bundle/molokai/colors/molokai.vim +++ b/vimfolder/bundle/molokai/colors/molokai.vim @@ -1,16 +1,15 @@ - " Vim color file " " Author: Tomas Restrepo +" https://github.com/tomasr/molokai " -" Note: Based on the monokai theme for textmate +" Note: Based on the Monokai theme for TextMate " by Wimer Hazenberg and its darker variant " by Hamish Stuart Macpherson " hi clear -set background=dark if version > 580 " no guarantees for version 5.8 and below, but this makes it stop " complaining @@ -76,7 +75,7 @@ hi PreCondit guifg=#A6E22E gui=bold hi PreProc guifg=#A6E22E hi Question guifg=#66D9EF hi Repeat guifg=#F92672 gui=bold -hi Search guifg=#FFFFFF guibg=#455354 +hi Search guifg=#000000 guibg=#FFE792 " marks hi SignColumn guifg=#A6E22E guibg=#232526 hi SpecialChar guifg=#F92672 gui=bold @@ -178,14 +177,14 @@ if &t_Co > 255 hi Macro ctermfg=193 hi SpecialKey ctermfg=81 - hi MatchParen ctermfg=208 ctermbg=233 cterm=bold + hi MatchParen ctermfg=233 ctermbg=208 cterm=bold hi ModeMsg ctermfg=229 hi MoreMsg ctermfg=229 hi Operator ctermfg=161 " complete menu hi Pmenu ctermfg=81 ctermbg=16 - hi PmenuSel ctermfg=81 ctermbg=244 + hi PmenuSel ctermfg=255 ctermbg=242 hi PmenuSbar ctermbg=232 hi PmenuThumb ctermfg=81 @@ -193,7 +192,7 @@ if &t_Co > 255 hi PreProc ctermfg=118 hi Question ctermfg=81 hi Repeat ctermfg=161 cterm=bold - hi Search ctermfg=253 ctermbg=66 + hi Search ctermfg=0 ctermbg=222 cterm=NONE " marks column hi SignColumn ctermfg=118 ctermbg=235 @@ -271,3 +270,7 @@ if &t_Co > 255 hi SpecialKey ctermfg=239 endif end + +" Must be at the end, because of ctermbg=234 bug. +" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ +set background=dark diff --git a/vimfolder/bundle/monokai/README.md b/vimfolder/bundle/monokai/README.md deleted file mode 100644 index 572cb27..0000000 --- a/vimfolder/bundle/monokai/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# monokai.vim - -[Monokai][textmate] is a GUI-only colorscheme, originally [ported to vim by Damien Gombault][original] (first seen [here][first]). - -The [original repos still live][repos], although it hasn't been updated since 2009. This repos serves only to allow monokai.vim to be installed using modern plugin managers for vim. - -There's also a [vim.org Script page][vimorg] for this colorscheme. - -## Vundle -Add to your .vimrc: - - Bundle 'lsdr/monokai' - -Don't forget to `:BundleInstall` after editing your config files. - -## Manual install -Fetch it over the net and store it locally in your `.vim/colors` folder: - - $ cd ~/.vim/colors - $ curl -G https://raw.github.com/lsdr/monokai/master/colors/monokai.vim -o monokai.vim - -## Screenshot -[![monokai.vim screenshot][screenshot]](https://github.com/lsdr/monokai/raw/master/screenshot.png) - -## License -[![Creative Commons BY-NC][ccstamp]][ccbync] - - -[textmate]: http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/ -[original]: http://desintegr.free.fr/dokuwiki/doku.php?id=linux:vim:monokai -[repos]: http://desintegr.googlecode.com/svn/config/vim/colors/monokai.vim -[first]: http://modcult.org/read/2008/7/3/monokai-for-vim -[screenshot]: https://github.com/lsdr/monokai/raw/master/screenshot.png "monokai.vim screenshot" -[ccbync]: http://creativecommons.org/licenses/by-nc/3.0/ -[ccstamp]: http://i.creativecommons.org/l/by-nc/3.0/88x31.png "creative commons by-nc" -[vimorg]: http://www.vim.org/scripts/script.php?script_id=4667 - diff --git a/vimfolder/bundle/monokai/colors/monokai.vim b/vimfolder/bundle/monokai/colors/monokai.vim deleted file mode 100644 index 4e019ee..0000000 --- a/vimfolder/bundle/monokai/colors/monokai.vim +++ /dev/null @@ -1,156 +0,0 @@ -" Vim color file -" Maintainer: Damien Gombault -" WWW: http://desintegr.googlecode.com/svn/config/vim/colors/monokai.vim -" Last Change: 2008 Feb 27 -" Version: 0.1.3 - -set background=dark - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "monokai" - -hi Normal guifg=#F8F8F2 guibg=#272822 - -" Main highlight groups -hi Cursor guibg=fg -"hi CursorIM -"hi CursorColumn -hi CursorLine guibg=#3E3D32 -hi Directory guifg=#66D9EF gui=none -hi DiffAdd guifg=bg guibg=#A6E22E -hi DiffChange guifg=bg guibg=#E6DB74 -hi DiffDelete guifg=bg guibg=#F92672 -hi DiffText guifg=bg guibg=#E6DB74 -hi ErrorMsg guifg=#F92672 guibg=bg gui=none -hi VertSplit guifg=#3B3A32 guibg=bg gui=none -hi Folded guifg=#75715E guibg=bg gui=none -hi FoldColumn guifg=#75715E guibg=#3E3D32 gui=none -hi SignColum guifg=#75715E guibg=#3E3D32 gui=none -hi IncSearch guifg=bg guibg=#E6DB74 gui=none -hi LineNr guifg=#75715E guibg=#3E3D32 gui=none -hi MatchParen guifg=fg guibg=bg gui=bold -hi ModeMsg gui=none -hi MoreMsg guifg=#66D9EF gui=none -hi NonText guifg=#3B3A32 gui=none -hi Pmenu guifg=fg guibg=#3E3D32 -hi PmenuSel guifg=fg guibg=bg -hi PmenuSbar guibg=bg -hi PmenuThumb guifg=fg -hi Question guifg=#A6E22E gui=none -hi Search guifg=bg guibg=#E6DB74 gui=none -hi SpecialKey guifg=#3B3A32 gui=none -hi SpellBad guisp=#F92672 -hi SpellCap guisp=#65D9EF -"hi SpellLocal -hi SpellRare guisp=#AE81FF -hi StatusLine guifg=fg guibg=#3E3D32 gui=none -hi StatusLineNC guifg=#75715E guibg=#3E3D32 gui=none -hi TabLine guifg=#75715E guibg=#3E3D32 gui=none -hi TabLineFill guifg=fg guibg=#3E3D32 gui=none -hi TabLineSel guifg=fg guibg=#3E3D32 gui=none -hi Title guifg=#F92672 gui=none -hi Visual guibg=#49483E gui=none -"hi VisualNOS -hi WarningMsg guifg=#F92672 gui=none -"hi WildMenu - -"hi Menu -"hi ScrollBar -"hi Tooltip - - -" Plugin specific highlight groups -hi MyTagListFileName guifg=#FD971F guibg=bg gui=none - - -" Color groups -hi Blue guifg=#66D9EF gui=none -hi Green guifg=#A6E22E gui=none -hi Grey guifg=#75715E gui=none -hi Orange guifg=#FD971F gui=none -hi Purple guifg=#AE81FF gui=none -hi Red guifg=#F92672 gui=none -hi White guifg=#F8F8F2 gui=none -hi Yellow guifg=#E6DB74 gui=none - -hi BlueU guifg=#66D9EF gui=underline - -hi RedR guifg=fg guibg=#F92672 gui=none -hi YellowR guifg=bg guibg=#FD971F gui=none - - -" Syntax highligh groups -hi! link Comment Grey -" -hi! link Constant Purple -hi! link String Yellow -hi! link Character Yellow -"hi Number -"hi Boolean -"hi Float -" -hi! link Identifier Green -"hi Function -" -hi! link Statement Red -"hi Conditional -"hi Repeat -"hi Label -hi! link Operator Green -"hi Keyword -"hi Exception -" -hi! link PreProc Orange -"hi Include -"hi Define -"hi Macro -"hi PreCondit -" -hi! link Type Blue -hi! link StorageClass Red -"hi Structure -"hi Typedef -" -hi! link Special Grey -"hi SpecialChar -hi! link Tag Green -"hi Delimiter -"hi SpecialComment -"hi Debug -" -hi! link Underlined BlueU -"hi Ignore -hi! link Error RedR -hi! link Todo YellowR - -" Language specific highligh groups -" C -hi link cStatement Green -" C++ -hi link cppStatement Green -" CSS -hi link cssBraces White -hi link cssFontProp White -hi link cssColorProp White -hi link cssTextProp White -hi link cssBoxProp White -hi link cssRenderProp White -hi link cssAuralProp White -hi link cssRenderProp White -hi link cssGeneratedContentProp White -hi link cssPagingProp White -hi link cssTableProp White -hi link cssUIProp White -hi link cssFontDescriptorProp White -" Java -hi link javaStatement Green -" Ruby -hi link rubyClassVariable White -hi link rubyControl Green -hi link rubyGlobalVariable White -hi link rubyInstanceVariable White diff --git a/vimfolder/bundle/monokai/screenshot.png b/vimfolder/bundle/monokai/screenshot.png deleted file mode 100644 index cfbcd5b..0000000 Binary files a/vimfolder/bundle/monokai/screenshot.png and /dev/null differ diff --git a/vimfolder/bundle/nerdtree b/vimfolder/bundle/nerdtree index 8b7004c..4ebbb53 160000 --- a/vimfolder/bundle/nerdtree +++ b/vimfolder/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 8b7004c20a18277a94261dc20ad3a45950265bc2 +Subproject commit 4ebbb533c3faf2c480211db2b547972bb3b60f2b diff --git a/vimfolder/bundle/pep8 b/vimfolder/bundle/pep8 deleted file mode 160000 index 8a185fe..0000000 --- a/vimfolder/bundle/pep8 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8a185fe42a4d96dd45dae7bc1b95332a391d9e8a diff --git a/vimfolder/bundle/pydoc b/vimfolder/bundle/pydoc deleted file mode 160000 index fd814c4..0000000 --- a/vimfolder/bundle/pydoc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fd814c429e5269da10df87429b62c570617456f2 diff --git a/vimfolder/bundle/rust.vim b/vimfolder/bundle/rust.vim deleted file mode 160000 index ae7a3d1..0000000 --- a/vimfolder/bundle/rust.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ae7a3d18ec25e8ebe7304d267b42e4c885b36ea2 diff --git a/vimfolder/bundle/salt-vim b/vimfolder/bundle/salt-vim deleted file mode 160000 index e0e7d4d..0000000 --- a/vimfolder/bundle/salt-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e0e7d4d34d65fbab6a60f74ba7a5e541fd69b28a diff --git a/vimfolder/bundle/scala b/vimfolder/bundle/scala deleted file mode 160000 index b289ac4..0000000 --- a/vimfolder/bundle/scala +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b289ac4a940ba543ec47e9a2754076ec03f74365 diff --git a/vimfolder/bundle/supertab b/vimfolder/bundle/supertab index 21cd55b..6651177 160000 --- a/vimfolder/bundle/supertab +++ b/vimfolder/bundle/supertab @@ -1 +1 @@ -Subproject commit 21cd55bf94c0d9251ae6fbfb3a0a736165e94340 +Subproject commit 66511772a430a5eaad7f7d03dbb02e8f33c4a641 diff --git a/vimfolder/bundle/surround b/vimfolder/bundle/surround deleted file mode 160000 index d9e6bfd..0000000 --- a/vimfolder/bundle/surround +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d9e6bfdd902fc661c8fd58ede248ccfc3b3039d7 diff --git a/vimfolder/bundle/syntastic b/vimfolder/bundle/syntastic index 0c557bf..1f4846f 160000 --- a/vimfolder/bundle/syntastic +++ b/vimfolder/bundle/syntastic @@ -1 +1 @@ -Subproject commit 0c557bfca62df13e65f5912cfd143db86232c1a0 +Subproject commit 1f4846fecca79fa6a56f054d40761bd8c63a236f diff --git a/vimfolder/bundle/vim-ack b/vimfolder/bundle/vim-ack deleted file mode 160000 index a41d5d5..0000000 --- a/vimfolder/bundle/vim-ack +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a41d5d52c39a31128e969e69acf800b198cb07f9 diff --git a/vimfolder/bundle/vim-airline b/vimfolder/bundle/vim-airline index 5a2daf6..ca6ab34 160000 --- a/vimfolder/bundle/vim-airline +++ b/vimfolder/bundle/vim-airline @@ -1 +1 @@ -Subproject commit 5a2daf6dfbd6e0df21612a20f95b4285ae8a2603 +Subproject commit ca6ab34e3ce2d25e5625fe56ef31d5032c69dbec diff --git a/vimfolder/bundle/vim-coffescript b/vimfolder/bundle/vim-coffescript deleted file mode 160000 index c92f18e..0000000 --- a/vimfolder/bundle/vim-coffescript +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c92f18eb55f7905d426cedc92fd4e50d94e27724 diff --git a/vimfolder/bundle/vim-colors-solarized/autoload/togglebg.vim b/vimfolder/bundle/vim-colors-solarized/autoload/togglebg.vim index f060cee..108511f 100644 --- a/vimfolder/bundle/vim-colors-solarized/autoload/togglebg.vim +++ b/vimfolder/bundle/vim-colors-solarized/autoload/togglebg.vim @@ -1,5 +1,5 @@ -" Toggle background -" Last Change: April 7, 2011 +" Toggle Background +" Modified: 2011 Apr 29 " Maintainer: Ethan Schoonover " License: OSI approved MIT license @@ -18,10 +18,18 @@ vnoremap ', 'nWb') - \ && 0 < searchpair(js, '', '', 'nW') - " we're inside javascript - - if getline(lnum) !~ js && getline(a:lnum) !~ '' - if restore_ic == 0 - setlocal noic - endif - return GetJsIndent(a:lnum) - endif - endif - - if getline(lnum) =~ '\c' - " line before the current line a:lnum contains - " a closing . --> search for line before - " starting 
 to restore the indent.
-	let preline = prevnonblank(search('\c
', 'bW') - 1)
-	if preline > 0
-	    if restore_ic == 0
-	      setlocal noic
-	    endif
-	    return indent(preline)
-	endif
-    endif
-
-    let ind = HtmlIndentSum(lnum, -1)
-    let ind = ind + HtmlIndentSum(a:lnum, 0)
-
-    if restore_ic == 0
-	setlocal noic
-    endif
-
-    return indent(lnum) + (&sw * ind)
-endfun
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" [-- EOF /indent/html.vim --]
diff --git a/vimfolder/bundle/web-indent/indent/javascript.vim b/vimfolder/bundle/web-indent/indent/javascript.vim
deleted file mode 100644
index b0e190c..0000000
--- a/vimfolder/bundle/web-indent/indent/javascript.vim
+++ /dev/null
@@ -1,407 +0,0 @@
-" Vim indent file Language:		JavaScript
-" Author: 		Preston Koprivica (pkopriv2@gmail.com)	
-" URL:
-" Last Change: 	April 30, 2010
-
-" 0. Standard Stuff
-" =================
-
-" Only load one indent script per buffer
-if exists('b:did_indent')
-  finish
-endif
-
-let b:did_indent = 1
-
-" Set the global log variable 1 = logging enabled, 0 = logging disabled
-if !exists("g:js_indent_log")
-	let g:js_indent_log = 0
-endif
-
-setlocal indentexpr=GetJsIndent(v:lnum)
-setlocal indentkeys=
-
-
-setlocal cindent
-setlocal autoindent
-
-
-" 1. Variables
-" ============
-
-" Inline comments (for anchoring other statements)
-let s:js_mid_line_comment = '\s*\(\/\*.*\*\/\)*\s*'
-let s:js_end_line_comment = s:js_mid_line_comment . '\s*\(//.*\)*'
-let s:js_line_comment = s:js_end_line_comment
-
-" Comment/String Syntax Key
-let s:syn_comment = '\(Comment\|String\|Regexp\)'
-
-
-" 2. Aux. Functions
-" =================
-
-" = Method: IsInComment
-"
-" Determines whether the specified position is contained in a comment. "Note:
-" This depends on a 
-function! s:IsInComment(lnum, cnum)
-	return synIDattr(synID(a:lnum, a:cnum, 1), 'name') =~? s:syn_comment
-endfunction
-
-
-" = Method: IsComment
-" 
-" Determines whether a line is a comment or not.
-function! s:IsComment(lnum)
-	let line = getline(a:lnum)
-
-	return s:IsInComment(a:lnum, 1) && s:IsInComment(a:lnum, strlen(line)) "Doesn't absolutely work.  Only Probably!
-endfunction
-
-
-" = Method: GetNonCommentLine
-"
-" Grabs the nearest non-commented line
-function! s:GetNonCommentLine(lnum)
-	let lnum = prevnonblank(a:lnum)
-
-	while lnum > 0
-		if s:IsComment(lnum)
-			let lnum = prevnonblank(lnum - 1)
-		else
-			return lnum
-		endif
-	endwhile
-
-	return lnum
-endfunction
-
-" = Method: SearchForPair
-"
-" Returns the beginning tag of a given pair starting from the given line.
-function! s:SearchForPair(lnum, beg, end)
-	" Save the cursor position.
-	let curpos = getpos(".")
-
-	" Set the cursor position to the beginning of the line (default
-	" behavior when using ==)
-	call cursor(a:lnum, 0)
-
-	" Search for the opening tag
-	let mnum = searchpair(a:beg, '', a:end, 'bW', 
-				\ 'synIDattr(synID(line("."), col("."), 0), "name") =~? s:syn_comment' )
-
-	"Restore the cursor position
-	call cursor(curpos)
-	
-	" Finally, return the matched line number
-	return mnum
-endfunction
-
-
-" Object Helpers
-" ==============
-let s:object_beg = '{[^}]*' . s:js_end_line_comment . '$'
-let s:object_end = '^' . s:js_mid_line_comment . '}[;,]\='
-
-
-function! s:IsObjectBeg(line)
-	return a:line =~ s:object_beg
-endfunction
-
-function! s:IsObjectEnd(line)
-	return a:line =~ s:object_end
-endfunction 
-
-function! s:GetObjectBeg(lnum)
-	return s:SearchForPair(a:lnum, '{', '}')
-endfunction
-
-
-" Array Helpers
-" ==============
-let s:array_beg = '\[[^\]]*' . s:js_end_line_comment . '$'
-let s:array_end = '^' . s:js_mid_line_comment . '[^\[]*\][;,]*' . s:js_end_line_comment . '$'
-
-
-function! s:IsArrayBeg(line)
-	return a:line =~ s:array_beg
-endfunction
-
-function! s:IsArrayEnd(line)
-	return a:line =~ s:array_end
-endfunction 
-
-function! s:GetArrayBeg(lnum)
-	return s:SearchForPair(a:lnum, '\[', '\]')
-endfunction
-
-
-" MultiLine Declaration/Invocation Helpers
-" ========================================
-let s:paren_beg = '([^)]*' . s:js_end_line_comment . '$'
-let s:paren_end = '^' . s:js_mid_line_comment . '[^(]*)[;,]*'
-
-function! s:IsParenBeg(line)
-	return a:line =~ s:paren_beg
-endfunction
-
-function! s:IsParenEnd(line)
-	return a:line =~ s:paren_end
-endfunction 
-
-function! s:GetParenBeg(lnum)
-	return s:SearchForPair(a:lnum, '(', ')')
-endfunction
-
-
-
-" Continuation Helpers
-" ====================
-let s:continuation = '\(+\|\\\)\{1}' . s:js_line_comment . '$' 
-
-function! s:IsContinuationLine(line)
-	return a:line =~ s:continuation
-endfunction
-
-function! s:GetContinuationBegin(lnum) 
-	let cur = a:lnum
-	
-	while s:IsContinuationLine(getline(cur)) 
-		let cur -= 1
-	endwhile
-	
-	return cur + 1
-endfunction 
-
-
-" Switch Helpers
-" ==============
-let s:switch_beg_next_line = 'switch\s*(.*)\s*' . s:js_mid_line_comment . s:js_end_line_comment . '$'
-let s:switch_beg_same_line = 'switch\s*(.*)\s*' . s:js_mid_line_comment . '{\s*' . s:js_line_comment . '$'
-let s:switch_mid = '^.*\(case.*\|default\)\s*:\s*' 
-
-function! s:IsSwitchBeginNextLine(line) 
-	return a:line =~ s:switch_beg_next_line 
-endfunction
-
-function! s:IsSwitchBeginSameLine(line) 
-	return a:line =~ s:switch_beg_same_line 
-endfunction
-
-function! s:IsSwitchMid(line)
-	return a:line =~ s:switch_mid
-endfunction 
-
-
-" Control Helpers
-" ===============
-let s:cntrl_beg_keys = '\(\(\(if\|for\|with\|while\)\s*(.*)\)\|\(try\|do\)\)\s*'
-let s:cntrl_mid_keys = '\(\(\(else\s*if\|catch\)\s*(.*)\)\|\(finally\|else\)\)\s*'
-
-let s:cntrl_beg = s:cntrl_beg_keys . s:js_end_line_comment . '$' 
-let s:cntrl_mid = s:cntrl_mid_keys . s:js_end_line_comment . '$' 
-
-let s:cntrl_end = '\(while\s*(.*)\)\s*;\=\s*' . s:js_end_line_comment . '$'
-
-function! s:IsControlBeg(line)
-	return a:line =~ s:cntrl_beg
-endfunction
-
-function! s:IsControlMid(line)
-	return a:line =~ s:cntrl_mid
-endfunction
-
-function! s:IsControlMidStrict(line)
-	return a:line =~ s:cntrl_mid
-endfunction
-
-function! s:IsControlEnd(line)
-	return a:line =~ s:cntrl_end
-endfunction
-
-" = Method: Log
-"
-" Logs a message to the stdout.
-function! s:Log(msg)
-	if g:js_indent_log
-		echo "LOG: " . a:msg
-	endif
-endfunction
-
-
-" 3. Indenter
-" ===========
-function! GetJsIndent(lnum)
-	" Grab the first non-comment line prior to this line
-	let pnum = s:GetNonCommentLine(a:lnum-1)
-
-	" First line, start at indent = 0
-	if pnum == 0
-		call s:Log("No, noncomment lines prior to the current line.")
-		return 0
-	endif
-
-	" Grab the second non-comment line prior to this line
-	let ppnum = s:GetNonCommentLine(pnum-1)
-
-	call s:Log("Line: " . a:lnum)
-	call s:Log("PLine: " . pnum)
-	call s:Log("PPLine: " . ppnum)
-
-	" Grab the lines themselves.
-	let line = getline(a:lnum)
-	let pline = getline(pnum)
-	let ppline = getline(ppnum)
-
-	" Determine the current level of indentation
-	let ind = indent(pnum)
-
-
-	" Handle: Object Closers (ie }) 
-	" =============================
-	if s:IsObjectEnd(line) && !s:IsComment(a:lnum)
-		call s:Log("Line matched object end")
-
-		let obeg = s:GetObjectBeg(a:lnum)
-		let oind = indent(obeg)
-		let oline = getline(obeg)
-
-		call s:Log("The object beg was found at: " . obeg)
-		return oind
-	endif
-
-	if s:IsObjectBeg(pline) 
-		call s:Log("Pline matched object beg")
-		return ind + &sw 
-	endif
-
-
-	" Handle: Array Closer (ie ])
-	" ============================
-	if s:IsArrayEnd(line) && !s:IsComment(a:lnum)
-		call s:Log("Line matched array end")
-
-		let abeg = s:GetArrayBeg(a:lnum)
-		let aind = indent(abeg)
-
-		call s:Log("The array beg was found at: " . abeg)
-		return aind
-	endif
-
-	if s:IsArrayBeg(pline) 
-		call s:Log("Pline matched array beg")
-		return ind + &sw 
-	endif
-
-	" Handle: Parens
-	" ==============
-	if s:IsParenEnd(line) && !s:IsComment(a:lnum)
-		call s:Log("Line matched paren end")
-
-		let abeg = s:GetParenBeg(a:lnum)
-		let aind = indent(abeg)
-
-		call s:Log("The paren beg was found at: " . abeg)
-		return aind
-	endif
-
-	if s:IsParenBeg(pline) 
-		call s:Log("Pline matched paren beg")
-		return ind + &sw 
-	endif
-
-
-	" Handle: Continuation Lines. 
-	" ========================================================
-	if s:IsContinuationLine(pline) 
-		call s:Log('Pline is a continuation line.')
-
-		let cbeg = s:GetContinuationBegin(pnum)
-		let cind = indent(cbeg)
-
-		call s:Log('The continuation block begin found at: ' . cbeg)
-		return cind + &sw
-	endif
-
-	if s:IsContinuationLine(ppline)
-		call s:Log('PPline was a continuation line but pline wasnt.')
-		return ind - &sw
-	endif
-
-	" Handle: Switch Control Blocks
-	" =============================
-	if s:IsSwitchMid(pline) 
-		call s:Log("PLine matched switch cntrl mid")
-		if s:IsSwitchMid(line) || s:IsObjectEnd(line)
-			call s:Log("Line matched a cntrl mid")
-			return ind
-		else
-			call s:Log("Line didnt match a cntrl mid")
-			return ind + &sw
-		endif 
-	endif
-
-	if s:IsSwitchMid(line)
-		call s:Log("Line matched switch cntrl mid")
-		return ind - &sw
-	endif
-
-	
-	" Handle: Single Line Control Blocks
-	" ==================================
-	if s:IsControlBeg(pline)
-		call s:Log("Pline matched control beginning")
-		
-		if s:IsControlMid(line)
-			call s:Log("Line matched a control mid")
-			return ind
-		elseif line =~ '^\s*{\s*$'
-			call s:Log("Line matched an object beg")
-			return ind
-		else
-			return ind + &sw
-		endif
-		
-	endif
-
-	if s:IsControlMid(pline)
-		call s:Log("Pline matched a control mid")
-
-		if s:IsControlMid(line)
-			call s:Log("Line matched a control mid")
-			return ind
-		elseif s:IsObjectBeg(line)
-			call s:Log("Line matched an object beg")
-			return ind
-		else
-			call s:Log("Line didn't match a control mid or object beg."
-			return ind + &sw
-		endif
-	endif
-
-	if s:IsControlMid(line)
-		call s:Log("Line matched a control mid.")
-
-		if s:IsControlEnd(pline) || s:IsObjectEnd(pline)
-			call s:Log("PLine matched control end")
-			return ind
-		else
-			call s:Log("Pline didn't match object end")
-			return ind - &sw
-		endif
-	endif
-
-
-	if ( s:IsControlBeg(ppline) || s:IsControlMid(ppline) ) &&
-			\ !s:IsObjectBeg(pline) && !s:IsObjectEnd(pline)
-		call s:Log("PPLine matched single line control beg or mid")
-		return ind - &sw
-	endif
-
-	" Handle: No matches
-	" ==================
-	"call s:Log("Line didn't match anything.  Retaining indent")
-	return ind
-endfunction
diff --git a/vimfolder/bundle/web-indent/test.html b/vimfolder/bundle/web-indent/test.html
deleted file mode 100644
index b475bc2..0000000
--- a/vimfolder/bundle/web-indent/test.html
+++ /dev/null
@@ -1,399 +0,0 @@
-
-
-	
-		
-
-		Test
-	
-	
-		
-	
-
diff --git a/vimrc b/vimrc
index 104cf21..2eddf22 100755
--- a/vimrc
+++ b/vimrc
@@ -1,16 +1,38 @@
 " Load plugins from .vim/bundles using .vim/autoload/pathogen.vim
+set nocompatible
 filetype off
-" call pathogen#helptags()
-call pathogen#infect()
-" call pathogen#runtime_append_all_bundles()
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+
+Plugin 'VundleVim/Vundle.vim'
+
+Plugin 'rbgrouleff/bclose.vim'
+Plugin 'scrooloose/syntastic'
+Plugin 'scrooloose/nerdtree'
+Plugin 'fatih/vim-go'
+Plugin 'ctrlpvim/ctrlp.vim'
+Plugin 'altercation/vim-colors-solarized'
+Plugin 'mileszs/ack.vim'
+Plugin 'bling/vim-airline'
+Plugin 'Raimondi/delimitMate'
+Plugin 'groenewege/vim-less'
+Plugin 'tpope/vim-surround'
+Plugin 'tpope/vim-fugitive'
+Plugin 'ervandew/supertab'
+
+Plugin 'Valloric/YouCompleteMe'
+Plugin 'tomasr/molokai'
+Plugin 'antlypls/vim-colors-codeschool'
+Plugin 'hdima/python-syntax'
+Plugin 'airblade/vim-gitgutter'
 
 " filetype off " On some Linux systems, this is necessary to make sure pathogen
              " picks up ftdetect directories in plugins! :(
-syntax on
+call vundle#end()
 filetype plugin indent on
+syntax on
+syntax enable
 
-
-set nocompatible
 set backspace=indent,eol,start
 set history=1000
 set scrolloff=3     " keep 3 lines when scrolling
@@ -87,11 +109,11 @@ let Tlist_File_Fold_Auto_Close = 1         " Close folds for inactive files
 " SCMDiff Plugin Configuration
 let SCMDiffCommand = 'git'
 
-syntax on
 set expandtab
 set sm
 set smarttab
-set guifont=Menlo\ for\ Powerline:h14.00
+" set guifont=Menlo\ for\ Powerline:h14.00
+set guifont=Hack:h16.00
     set list 
     set listchars=tab:▷⋅,trail:⋅,nbsp:⋅ " mark trailing white space
 if has("gui_running")
@@ -267,3 +289,4 @@ let g:airline_theme="powerlineish"
 "let g:jedi#use_tabs_not_buffers = 0
 "let g:jedi#popup_on_dot = 0
 "let g:SuperTabDefaultCompletionType = "context"
+nnoremap j :YcmCompleter GoToDeclaration