From e96b5b30a50a159586460fb09118d23549e82273 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Fri, 3 Apr 2015 01:30:50 -0700
Subject: [PATCH 1/4] spicy legato

---
 home/vimrc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/home/vimrc b/home/vimrc
index 2b3c00e..35493d3 100644
--- a/home/vimrc
+++ b/home/vimrc
@@ -145,6 +145,11 @@ if has('autocmd')
         au FileType ruby call TabTwo()
     augroup END
 
+    augroup whatever
+        au!
+        au BufRead,BufNewFile *.lib setlocal ft=spice
+    augroup END
+
     augroup sessions
         au!
         au VimEnter * call LoadSession()

From 4aa47ba39df6fb505e8e5ec10ec0bd96ffc585a9 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Fri, 3 Apr 2015 01:32:08 -0700
Subject: [PATCH 2/4] more refactoring this dumb theme

---
 vim/colors/Tomorrow-Night.vim | 493 ++++++++++++++++++----------------
 1 file changed, 255 insertions(+), 238 deletions(-)

diff --git a/vim/colors/Tomorrow-Night.vim b/vim/colors/Tomorrow-Night.vim
index 79f4f2f..60edf95 100644
--- a/vim/colors/Tomorrow-Night.vim
+++ b/vim/colors/Tomorrow-Night.vim
@@ -38,250 +38,267 @@ fun <SID>X(group, fg, bg, attr)
         if a:attr != "" | exec "hi " . a:group . " gui="  . a:attr | endif
 endfun
 
-" Vim Highlighting
-call <SID>X("Normal",        s:foreground,  s:background,  "")
-call <SID>X("LineNr",        s:selection,   "",            "")
-call <SID>X("NonText",       s:selection,   "",            "")
-call <SID>X("SpecialKey",    s:selection,   "",            "")
-call <SID>X("Search",        s:background,  s:yellow,      "")
-call <SID>X("TabLine",       s:window,      s:foreground,  "reverse")
-call <SID>X("TabLineFill",   s:window,      s:foreground,  "reverse")
-call <SID>X("StatusLine",    s:window,      s:yellow,      "reverse")
-call <SID>X("StatusLineNC",  s:window,      s:foreground,  "reverse")
-call <SID>X("VertSplit",     s:window,      s:window,      "none")
-call <SID>X("Visual",        "",            s:selection,   "")
-call <SID>X("Directory",     s:blue,        "",            "")
-call <SID>X("ModeMsg",       s:green,       "",            "")
-call <SID>X("MoreMsg",       s:green,       "",            "")
-call <SID>X("Question",      s:green,       "",            "")
-call <SID>X("WarningMsg",    s:red,         "",            "")
-call <SID>X("MatchParen",    "",            s:selection,   "")
-call <SID>X("Folded",        s:comment,     s:background,  "")
-call <SID>X("FoldColumn",    "",            s:background,  "")
-if version >= 700
-    call <SID>X("CursorLine",    "",            s:line,        "none")
-    call <SID>X("CursorColumn",  "",            s:line,        "none")
-    call <SID>X("PMenu",         s:foreground,  s:selection,   "none")
-    call <SID>X("PMenuSel",      s:foreground,  s:selection,   "reverse")
-    call <SID>X("SignColumn",    "",            s:background,  "none")
-end
-if version >= 703
-    call <SID>X("ColorColumn",  "",  s:line,  "none")
-end
+"exec 'normal yiw' | exec '%s/'.@0.'$//gn'
 
-" Standard Highlighting
-call <SID>X("Comment",      s:comment,     "",            "")
-call <SID>X("Todo",         s:comment,     s:background,  "")
-call <SID>X("Title",        s:comment,     "",            "")
-call <SID>X("Identifier",   s:red,         "",            "none")
-call <SID>X("Statement",    s:foreground,  "",            "")
-call <SID>X("Conditional",  s:foreground,  "",            "")
-call <SID>X("Repeat",       s:foreground,  "",            "")
-call <SID>X("Structure",    s:purple,      "",            "")
-call <SID>X("Function",     s:blue,        "",            "")
-call <SID>X("Constant",     s:orange,      "",            "")
-call <SID>X("Keyword",      s:orange,      "",            "")
-call <SID>X("String",       s:green,       "",            "")
-call <SID>X("Special",      s:foreground,  "",            "")
-call <SID>X("PreProc",      s:purple,      "",            "")
-call <SID>X("Operator",     s:aqua,        "",            "none")
-call <SID>X("Type",         s:blue,        "",            "none")
-call <SID>X("Define",       s:purple,      "",            "none")
-call <SID>X("Include",      s:blue,        "",            "")
-"call <SID>X("Ignore",      "666666",      "",            "")
+call <SID>X("Normal",      s:foreground,  s:background,  "")
+call <SID>X("_Aqua",       s:aqua,        "",            "") " 3
+call <SID>X("_Blue",       s:blue,        "",            "") " 27
+call <SID>X("_Comment",    s:comment,     "",            "") " 6
+call <SID>X("_Green",      s:green,       "",            "") " 18
+call <SID>X("_Orange",     s:orange,      "",            "") " 23
+call <SID>X("_Plain",      s:foreground,  "",            "") " 12
+call <SID>X("_Purple",     s:purple,      "",            "") " 52
+call <SID>X("_Red",        s:red,         "",            "") " 10
+call <SID>X("_Selection",  s:selection,   "",            "") " 3
 
-" Vim Highlighting
-call <SID>X("vimCommand",  s:red,  "",  "none")
+call <SID>X("_AquaNone",    s:aqua,    "",           "none") " 1
+call <SID>X("_BlueNone",    s:blue,    "",           "none") " 1
+call <SID>X("_Bold",        "",        "",           "bold") " 1
+call <SID>X("_LineBGNone",  "",        s:line,       "none") " 3
+call <SID>X("_RedNone",     s:red,     "",           "none") " 2
+call <SID>X("_SelectBG",    "",        s:selection,  "") " 2
+call <SID>X("_LineBlue",    s:line,    s:blue,       "") " 1
+call <SID>X("_PurpleNone",  s:purple,  "",           "none") " 1
 
-" C Highlighting
-call <SID>X("cType",          s:yellow,  "",  "")
-call <SID>X("cStorageClass",  s:purple,  "",  "")
-call <SID>X("cConditional",   s:purple,  "",  "")
-call <SID>X("cRepeat",        s:purple,  "",  "")
+call <SID>X("_AquaPlainNone",    s:aqua,        s:background,  "none") " 1
+call <SID>X("_CommentPlain",     s:comment,     s:background,  "") " 2
+call <SID>X("_PlainBG",          "",            s:background,  "") " 1
+call <SID>X("_PlainBGNone",      "",            s:background,  "none") " 1
+call <SID>X("_RedBGPlain",       s:background,  s:red,         "") " 1
+call <SID>X("_YellowPlainNone",  s:yellow,      s:background,  "none") " 1
 
-" PHP Highlighting
-call <SID>X("phpVarSelector",     s:red,         "",  "")
-call <SID>X("phpKeyword",         s:purple,      "",  "")
-call <SID>X("phpRepeat",          s:purple,      "",  "")
-call <SID>X("phpConditional",     s:purple,      "",  "")
-call <SID>X("phpStatement",       s:purple,      "",  "")
-call <SID>X("phpMemberSelector",  s:foreground,  "",  "")
+call <SID>X("_OrangePlainNone",  s:orange,      s:background,  "none") " 1
+call <SID>X("_PurplePlainNone",  s:purple,      s:background,  "none") " 1
 
-" Ruby Highlighting
-call <SID>X("rubySymbol",                  s:green,   "",  "")
-call <SID>X("rubyConstant",                s:yellow,  "",  "")
-call <SID>X("rubyAccess",                  s:yellow,  "",  "")
-call <SID>X("rubyAttribute",               s:blue,    "",  "")
-call <SID>X("rubyInclude",                 s:blue,    "",  "")
-call <SID>X("rubyLocalVariableOrMethod",   s:orange,  "",  "")
-call <SID>X("rubyCurlyBlock",              s:orange,  "",  "")
-call <SID>X("rubyStringDelimiter",         s:green,   "",  "")
-call <SID>X("rubyInterpolationDelimiter",  s:orange,  "",  "")
-call <SID>X("rubyConditional",             s:purple,  "",  "")
-call <SID>X("rubyRepeat",                  s:purple,  "",  "")
-call <SID>X("rubyControl",                 s:purple,  "",  "")
-call <SID>X("rubyException",               s:purple,  "",  "")
+call <SID>X("_Search",      s:background,  s:yellow,      "") " 1
+call <SID>X("_TabLine",     s:window,      s:foreground,  "reverse") " 3
+call <SID>X("_VertSplit",   s:window,      s:window,      "none") " 1
+call <SID>X("_StatusLine",  s:window,      s:yellow,      "reverse") " 1
+call <SID>X("_PMenu",       s:foreground,  s:selection,   "none") " 1
+call <SID>X("_PMenuSel",    s:foreground,  s:selection,   "reverse") " 1
+call <SID>X("_diffAdd",     "",  "4c4e39",  "") " 1
+call <SID>X("_diffChange",  "",  "2b5b77",  "") " 1
 
-" Crystal Highlighting
-call <SID>X("crystalSymbol",                  s:green,   "",  "")
-call <SID>X("crystalConstant",                s:yellow,  "",  "")
-call <SID>X("crystalAccess",                  s:yellow,  "",  "")
-call <SID>X("crystalAttribute",               s:blue,    "",  "")
-call <SID>X("crystalInclude",                 s:blue,    "",  "")
-call <SID>X("crystalLocalVariableOrMethod",   s:orange,  "",  "")
-call <SID>X("crystalCurlyBlock",              s:orange,  "",  "")
-call <SID>X("crystalStringDelimiter",         s:green,   "",  "")
-call <SID>X("crystalInterpolationDelimiter",  s:orange,  "",  "")
-call <SID>X("crystalConditional",             s:purple,  "",  "")
-call <SID>X("crystalRepeat",                  s:purple,  "",  "")
-call <SID>X("crystalControl",                 s:purple,  "",  "")
-call <SID>X("crystalException",               s:purple,  "",  "")
-
-" Python Highlighting
-call <SID>X("pythonInclude",      s:purple,  "",  "")
-call <SID>X("pythonStatement",    s:purple,  "",  "")
-call <SID>X("pythonConditional",  s:purple,  "",  "")
-call <SID>X("pythonRepeat",       s:purple,  "",  "")
-call <SID>X("pythonException",    s:purple,  "",  "")
-call <SID>X("pythonFunction",     s:blue,    "",  "")
-call <SID>X("pythonPreCondit",    s:purple,  "",  "")
-call <SID>X("pythonRepeat",       s:aqua,    "",  "")
-call <SID>X("pythonExClass",      s:orange,  "",  "")
-
-" JavaScript Highlighting
-call <SID>X("javaScriptBraces",       s:foreground,  "",  "")
-call <SID>X("javaScriptFunction",     s:purple,      "",  "")
-call <SID>X("javaScriptConditional",  s:purple,      "",  "")
-call <SID>X("javaScriptRepeat",       s:purple,      "",  "")
-call <SID>X("javaScriptNumber",       s:orange,      "",  "")
-call <SID>X("javaScriptMember",       s:orange,      "",  "")
-call <SID>X("javascriptNull",         s:orange,      "",  "")
-call <SID>X("javascriptGlobal",       s:blue,        "",  "")
-call <SID>X("javascriptStatement",    s:red,         "",  "")
-
-" CoffeeScript Highlighting
-call <SID>X("coffeeRepeat",       s:purple,  "",  "")
-call <SID>X("coffeeConditional",  s:purple,  "",  "")
-call <SID>X("coffeeKeyword",      s:purple,  "",  "")
-call <SID>X("coffeeObject",       s:yellow,  "",  "")
-
-" HTML Highlighting
-call <SID>X("htmlTag",        s:red,  "",  "")
-call <SID>X("htmlTagName",    s:red,  "",  "")
-call <SID>X("htmlArg",        s:red,  "",  "")
-call <SID>X("htmlScriptTag",  s:red,  "",  "")
-
-" Diff Highlighting
-call <SID>X("diffAdd",     "",            "4c4e39",  "")
-call <SID>X("diffDelete",  s:background,  s:red,     "")
-call <SID>X("diffChange",  "",            "2B5B77",  "")
-call <SID>X("diffText",    s:line,        s:blue,    "")
-
-" ShowMarks Highlighting
-call <SID>X("ShowMarksHLl",  s:orange,  s:background,  "none")
-call <SID>X("ShowMarksHLo",  s:purple,  s:background,  "none")
-call <SID>X("ShowMarksHLu",  s:yellow,  s:background,  "none")
-call <SID>X("ShowMarksHLm",  s:aqua,    s:background,  "none")
-
-" Lua Highlighting
-call <SID>X("luaStatement",   s:purple,  "",  "")
-call <SID>X("luaRepeat",      s:purple,  "",  "")
-call <SID>X("luaCondStart",   s:purple,  "",  "")
-call <SID>X("luaCondElseif",  s:purple,  "",  "")
-call <SID>X("luaCond",        s:purple,  "",  "")
-call <SID>X("luaCondEnd",     s:purple,  "",  "")
-
-" Cucumber Highlighting
-call <SID>X("cucumberGiven",     s:blue,  "",  "")
-call <SID>X("cucumberGivenAnd",  s:blue,  "",  "")
-
-" Go Highlighting
-call <SID>X("goDirective",    s:purple,  "",  "")
-call <SID>X("goDeclaration",  s:purple,  "",  "")
-call <SID>X("goStatement",    s:purple,  "",  "")
-call <SID>X("goConditional",  s:purple,  "",  "")
-call <SID>X("goConstants",    s:orange,  "",  "")
-call <SID>X("goTodo",         s:yellow,  "",  "")
-call <SID>X("goDeclType",     s:blue,    "",  "")
-call <SID>X("goBuiltins",     s:purple,  "",  "")
-call <SID>X("goRepeat",       s:purple,  "",  "")
-call <SID>X("goLabel",        s:purple,  "",  "")
-
-" Clojure Highlighting
-call <SID>X("clojureConstant",   s:orange,  "",  "")
-call <SID>X("clojureBoolean",    s:orange,  "",  "")
-call <SID>X("clojureCharacter",  s:orange,  "",  "")
-call <SID>X("clojureKeyword",    s:green,   "",  "")
-call <SID>X("clojureNumber",     s:orange,  "",  "")
-call <SID>X("clojureString",     s:green,   "",  "")
-call <SID>X("clojureRegexp",     s:green,   "",  "")
-call <SID>X("clojureParen",      s:aqua,    "",  "")
-call <SID>X("clojureVariable",   s:yellow,  "",  "")
-call <SID>X("clojureCond",       s:blue,    "",  "")
-call <SID>X("clojureDefine",     s:purple,  "",  "")
-call <SID>X("clojureException",  s:red,     "",  "")
-call <SID>X("clojureFunc",       s:blue,    "",  "")
-call <SID>X("clojureMacro",      s:blue,    "",  "")
-call <SID>X("clojureRepeat",     s:blue,    "",  "")
-call <SID>X("clojureSpecial",    s:purple,  "",  "")
-call <SID>X("clojureQuote",      s:blue,    "",  "")
-call <SID>X("clojureUnquote",    s:blue,    "",  "")
-call <SID>X("clojureMeta",       s:blue,    "",  "")
-call <SID>X("clojureDeref",      s:blue,    "",  "")
-call <SID>X("clojureAnonArg",    s:blue,    "",  "")
-call <SID>X("clojureRepeat",     s:blue,    "",  "")
-call <SID>X("clojureDispatch",   s:blue,    "",  "")
-
-" Scala Highlighting
-call <SID>X("scalaKeyword",                 s:purple,      "",  "")
-call <SID>X("scalaKeywordModifier",         s:purple,      "",  "")
-call <SID>X("scalaOperator",                s:blue,        "",  "")
-call <SID>X("scalaPackage",                 s:red,         "",  "")
-call <SID>X("scalaFqn",                     s:foreground,  "",  "")
-call <SID>X("scalaFqnSet",                  s:foreground,  "",  "")
-call <SID>X("scalaImport",                  s:purple,      "",  "")
-call <SID>X("scalaBoolean",                 s:orange,      "",  "")
-call <SID>X("scalaDef",                     s:purple,      "",  "")
-call <SID>X("scalaVal",                     s:purple,      "",  "")
-call <SID>X("scalaVar",                     s:aqua,        "",  "")
-call <SID>X("scalaClass",                   s:purple,      "",  "")
-call <SID>X("scalaObject",                  s:purple,      "",  "")
-call <SID>X("scalaTrait",                   s:purple,      "",  "")
-call <SID>X("scalaDefName",                 s:blue,        "",  "")
-call <SID>X("scalaValName",                 s:foreground,  "",  "")
-call <SID>X("scalaVarName",                 s:foreground,  "",  "")
-call <SID>X("scalaClassName",               s:foreground,  "",  "")
-call <SID>X("scalaType",                    s:yellow,      "",  "")
-call <SID>X("scalaTypeSpecializer",         s:yellow,      "",  "")
-call <SID>X("scalaAnnotation",              s:orange,      "",  "")
-call <SID>X("scalaNumber",                  s:orange,      "",  "")
-call <SID>X("scalaDefSpecializer",          s:yellow,      "",  "")
-call <SID>X("scalaClassSpecializer",        s:yellow,      "",  "")
-call <SID>X("scalaBackTick",                s:green,       "",  "")
-call <SID>X("scalaRoot",                    s:foreground,  "",  "")
-call <SID>X("scalaMethodCall",              s:blue,        "",  "")
-call <SID>X("scalaCaseType",                s:yellow,      "",  "")
-call <SID>X("scalaLineComment",             s:comment,     "",  "")
-call <SID>X("scalaComment",                 s:comment,     "",  "")
-call <SID>X("scalaDocComment",              s:comment,     "",  "")
-call <SID>X("scalaDocTags",                 s:comment,     "",  "")
-call <SID>X("scalaEmptyString",             s:green,       "",  "")
-call <SID>X("scalaMultiLineString",         s:green,       "",  "")
-call <SID>X("scalaUnicode",                 s:orange,      "",  "")
-call <SID>X("scalaString",                  s:green,       "",  "")
-call <SID>X("scalaStringEscape",            s:green,       "",  "")
-call <SID>X("scalaSymbol",                  s:orange,      "",  "")
-call <SID>X("scalaChar",                    s:orange,      "",  "")
-call <SID>X("scalaXml",                     s:green,       "",  "")
-call <SID>X("scalaConstructorSpecializer",  s:yellow,      "",  "")
-call <SID>X("scalaBackTick",                s:blue,        "",  "")
-
-" Git
-call <SID>X("diffAdded",         s:green,  "",  "")
-call <SID>X("diffRemoved",       s:red,    "",  "")
-call <SID>X("gitcommitSummary",  "",       "",  "bold")
-
-" Delete Functions
 delf <SID>X
 
+" Vim Highlighting
+hi! link ColorColumn _LineBGNone
+hi! link CursorColumn _LineBGNone
+hi! link Directory _Blue
+hi! link FoldColumn _PlainBGNone
+hi! link Folded _CommentPlain
+hi! link LineNr _Selection
+hi! link MatchParen _SelectBG
+hi! link ModeMsg _Green
+hi! link MoreMsg _Green
+hi! link NonText _Selection
+hi! link PMenu _PMenu
+hi! link PMenuSel _PMenuSel
+hi! link Question _Green
+hi! link Search _Search
+hi! link SignColumn _PlainBG
+hi! link SpecialKey _Selection
+hi! link StatusLine _StatusLine
+hi! link StatusLineNC _TabLine
+hi! link TabLine _TabLine
+hi! link TabLineFill _TabLine
+hi! link VertSplit _VertSplit
+hi! link Visual _SelectBG
+hi! link WarningMsg _Red
+
+" Standard Highlighting
+hi! link Comment _Comment
+hi! link Conditional _Plain
+hi! link Constant _Orange
+hi! link CursorLine _LineBGNone
+hi! link Define _PurpleNone
+hi! link Function _Blue
+hi! link Identifier _RedNone
+hi! link Include _Blue
+hi! link Keyword _Orange
+hi! link Operator _AquaNone
+hi! link PreProc _Purple
+hi! link Repeat _Plain
+hi! link Special _Plain
+hi! link Statement _Plain
+hi! link String _Green
+hi! link Structure _Purple
+hi! link Title _Comment
+hi! link Todo _CommentPlain
+hi! link Type _BlueNone
+
+hi link vimCommand _RedNone
+
+hi link ShowMarksHLl _OrangePlainNone
+hi link ShowMarksHLm _AquaPlainNone
+hi link ShowMarksHLo _PurplePlainNone
+hi link ShowMarksHLu _YellowPlainNone
+
+hi link cConditional _Purple
+hi link cRepeat _Purple
+hi link cStorageClass _Purple
+hi link cType _Yellow
+
+hi link clojureAnonArg _Blue
+hi link clojureBoolean _Orange
+hi link clojureCharacter _Orange
+hi link clojureCond _Blue
+hi link clojureConstant _Orange
+hi link clojureDefine _Purple
+hi link clojureDeref _Blue
+hi link clojureDispatch _Blue
+hi link clojureException _Red
+hi link clojureFunc _Blue
+hi link clojureKeyword _Green
+hi link clojureMacro _Blue
+hi link clojureMeta _Blue
+hi link clojureNumber _Orange
+hi link clojureParen _Aqua
+hi link clojureQuote _Blue
+hi link clojureRegexp _Green
+hi link clojureRepeat _Blue
+hi link clojureRepeat _Blue
+hi link clojureSpecial _Purple
+hi link clojureString _Green
+hi link clojureUnquote _Blue
+hi link clojureVariable _Yellow
+
+hi link coffeeConditional _Purple
+hi link coffeeKeyword _Purple
+hi link coffeeObject _Yellow
+hi link coffeeRepeat _Purple
+
+hi link crystalAccess _Yellow
+hi link crystalAttribute _Blue
+hi link crystalConditional _Purple
+hi link crystalConstant _Yellow
+hi link crystalControl _Purple
+hi link crystalCurlyBlock _Orange
+hi link crystalException _Purple
+hi link crystalInclude _Blue
+hi link crystalInterpolationDelimiter _Orange
+hi link crystalLocalVariableOrMethod _Orange
+hi link crystalRepeat _Purple
+hi link crystalStringDelimiter _Green
+hi link crystalSymbol _Green
+
+hi link cucumberGiven _Blue
+hi link cucumberGivenAnd _Blue
+
+hi link diffAdd _diffAdd
+hi link diffChange _diffChange
+hi link diffDelete _RedBGPlain
+hi link diffText _LineBlue
+hi link diffAdded _Green
+hi link diffRemoved _Red
+
+hi link gitcommitSummary _Bold
+
+hi link goBuiltins _Purple
+hi link goConditional _Purple
+hi link goConstants _Orange
+hi link goDeclType _Blue
+hi link goDeclaration _Purple
+hi link goDirective _Purple
+hi link goLabel _Purple
+hi link goRepeat _Purple
+hi link goStatement _Purple
+hi link goTodo _Yellow
+
+hi link htmlArg _Red
+hi link htmlScriptTag _Red
+hi link htmlTag _Red
+hi link htmlTagName _Red
+
+hi link javaScriptBraces _Plain
+hi link javaScriptConditional _Purple
+hi link javaScriptFunction _Purple
+hi link javaScriptMember _Orange
+hi link javaScriptNumber _Orange
+hi link javaScriptRepeat _Purple
+hi link javascriptGlobal _Blue
+hi link javascriptNull _Orange
+hi link javascriptStatement _Red
+
+hi link luaCond _Purple
+hi link luaCondElseif _Purple
+hi link luaCondEnd _Purple
+hi link luaCondStart _Purple
+hi link luaRepeat _Purple
+hi link luaStatement _Purple
+
+hi link phpConditional _Purple
+hi link phpKeyword _Purple
+hi link phpMemberSelector _Plain
+hi link phpRepeat _Purple
+hi link phpStatement _Purple
+hi link phpVarSelector _Red
+
+hi link pythonConditional _Purple
+hi link pythonExClass _Orange
+hi link pythonException _Purple
+hi link pythonFunction _Blue
+hi link pythonInclude _Purple
+hi link pythonPreCondit _Purple
+hi link pythonRepeat _Aqua
+hi link pythonRepeat _Purple
+hi link pythonStatement _Purple
+
+hi link rubyAccess _Yellow
+hi link rubyAttribute _Blue
+hi link rubyConditional _Purple
+hi link rubyConstant _Yellow
+hi link rubyControl _Purple
+hi link rubyCurlyBlock _Orange
+hi link rubyException _Purple
+hi link rubyInclude _Blue
+hi link rubyInterpolationDelimiter _Orange
+hi link rubyLocalVariableOrMethod _Orange
+hi link rubyRepeat _Purple
+hi link rubyStringDelimiter _Green
+hi link rubySymbol _Green
+
+hi link scalaAnnotation _Orange
+hi link scalaBackTick _Blue
+hi link scalaBackTick _Green
+hi link scalaBoolean _Orange
+hi link scalaCaseType _Yellow
+hi link scalaChar _Orange
+hi link scalaClass _Purple
+hi link scalaClassName _Plain
+hi link scalaClassSpecializer _Yellow
+hi link scalaComment _Comment
+hi link scalaConstructorSpecializer _Yellow
+hi link scalaDef _Purple
+hi link scalaDefName _Blue
+hi link scalaDefSpecializer _Yellow
+hi link scalaDocComment _Comment
+hi link scalaDocTags _Comment
+hi link scalaEmptyString _Green
+hi link scalaFqn _Plain
+hi link scalaFqnSet _Plain
+hi link scalaImport _Purple
+hi link scalaKeyword _Purple
+hi link scalaKeywordModifier _Purple
+hi link scalaLineComment _Comment
+hi link scalaMethodCall _Blue
+hi link scalaMultiLineString _Green
+hi link scalaNumber _Orange
+hi link scalaObject _Purple
+hi link scalaOperator _Blue
+hi link scalaPackage _Red
+hi link scalaRoot _Plain
+hi link scalaString _Green
+hi link scalaStringEscape _Green
+hi link scalaSymbol _Orange
+hi link scalaTrait _Purple
+hi link scalaType _Yellow
+hi link scalaTypeSpecializer _Yellow
+hi link scalaUnicode _Orange
+hi link scalaVal _Purple
+hi link scalaValName _Plain
+hi link scalaVar _Aqua
+hi link scalaVarName _Plain
+hi link scalaXml _Green
+
 set background=dark

From 1fb9ff620a27330d4c8b5989c46bf85333b94ed5 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Fri, 3 Apr 2015 01:32:48 -0700
Subject: [PATCH 3/4] just freakin' include pathogen

---
 vim/autoload/pathogen.vim | 347 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 347 insertions(+)
 create mode 100644 vim/autoload/pathogen.vim

diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim
new file mode 100644
index 0000000..a13ae08
--- /dev/null
+++ b/vim/autoload/pathogen.vim
@@ -0,0 +1,347 @@
+" pathogen.vim - path option manipulation
+" Maintainer:   Tim Pope <http://tpo.pe/>
+" Version:      2.3
+
+" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
+"
+" For management of individually installed plugins in ~/.vim/bundle (or
+" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
+" .vimrc is the only other setup necessary.
+"
+" The API is documented inline below.
+
+if exists("g:loaded_pathogen") || &cp
+  finish
+endif
+let g:loaded_pathogen = 1
+
+" Point of entry for basic default usage.  Give a relative path to invoke
+" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke
+" pathogen#surround().  Curly braces are expanded with pathogen#expand():
+" "bundle/{}" finds all subdirectories inside "bundle" inside all directories
+" in the runtime path.
+function! pathogen#infect(...) abort
+  for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}']
+    if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]'
+      call pathogen#surround(path)
+    elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)'
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#surround(path . '/{}')
+    elseif path =~# '[{}*]'
+      call pathogen#interpose(path)
+    else
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#interpose(path . '/{}')
+    endif
+  endfor
+  call pathogen#cycle_filetype()
+  if pathogen#is_disabled($MYVIMRC)
+    return 'finish'
+  endif
+  return ''
+endfunction
+
+" Split a path into a list.
+function! pathogen#split(path) abort
+  if type(a:path) == type([]) | return a:path | endif
+  if empty(a:path) | return [] | endif
+  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
+  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
+endfunction
+
+" Convert a list to a path.
+function! pathogen#join(...) abort
+  if type(a:1) == type(1) && a:1
+    let i = 1
+    let space = ' '
+  else
+    let i = 0
+    let space = ''
+  endif
+  let path = ""
+  while i < a:0
+    if type(a:000[i]) == type([])
+      let list = a:000[i]
+      let j = 0
+      while j < len(list)
+        let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
+        let path .= ',' . escaped
+        let j += 1
+      endwhile
+    else
+      let path .= "," . a:000[i]
+    endif
+    let i += 1
+  endwhile
+  return substitute(path,'^,','','')
+endfunction
+
+" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
+function! pathogen#legacyjoin(...) abort
+  return call('pathogen#join',[1] + a:000)
+endfunction
+
+" Turn filetype detection off and back on again if it was already enabled.
+function! pathogen#cycle_filetype() abort
+  if exists('g:did_load_filetypes')
+    filetype off
+    filetype on
+  endif
+endfunction
+
+" Check if a bundle is disabled.  A bundle is considered disabled if its
+" basename or full name is included in the list g:pathogen_disabled.
+function! pathogen#is_disabled(path) abort
+  if a:path =~# '\~$'
+    return 1
+  endif
+  let sep = pathogen#slash()
+  let blacklist = map(
+        \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) +
+        \ pathogen#split($VIMBLACKLIST),
+        \ 'substitute(v:val, "[\\/]$", "", "")')
+  return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
+endfunction "}}}1
+
+" Prepend the given directory to the runtime path and append its corresponding
+" after directory.  Curly braces are expanded with pathogen#expand().
+function! pathogen#surround(path) abort
+  let sep = pathogen#slash()
+  let rtp = pathogen#split(&rtp)
+  let path = fnamemodify(a:path, ':p:?[\\/]\=$??')
+  let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
+  let after = filter(reverse(pathogen#expand(path.sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
+  call filter(rtp, 'index(before + after, v:val) == -1')
+  let &rtp = pathogen#join(before, rtp, after)
+  return &rtp
+endfunction
+
+" For each directory in the runtime path, add a second entry with the given
+" argument appended.  Curly braces are expanded with pathogen#expand().
+function! pathogen#interpose(name) abort
+  let sep = pathogen#slash()
+  let name = a:name
+  if has_key(s:done_bundles, name)
+    return ""
+  endif
+  let s:done_bundles[name] = 1
+  let list = []
+  for dir in pathogen#split(&rtp)
+    if dir =~# '\<after$'
+      let list += reverse(filter(pathogen#expand(dir[0:-6].name.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
+    else
+      let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
+    endif
+  endfor
+  let &rtp = pathogen#join(pathogen#uniq(list))
+  return 1
+endfunction
+
+let s:done_bundles = {}
+
+" Invoke :helptags on all non-$VIM doc directories in runtimepath.
+function! pathogen#helptags() abort
+  let sep = pathogen#slash()
+  for glob in pathogen#split(&rtp)
+    for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep')
+      if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags'))
+        silent! execute 'helptags' pathogen#fnameescape(dir)
+      endif
+    endfor
+  endfor
+endfunction
+
+command! -bar Helptags :call pathogen#helptags()
+
+" Execute the given command.  This is basically a backdoor for --remote-expr.
+function! pathogen#execute(...) abort
+  for command in a:000
+    execute command
+  endfor
+  return ''
+endfunction
+
+" Section: Unofficial
+
+function! pathogen#is_absolute(path) abort
+  return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]')
+endfunction
+
+" Given a string, returns all possible permutations of comma delimited braced
+" alternatives of that string.  pathogen#expand('/{a,b}/{c,d}') yields
+" ['/a/c', '/a/d', '/b/c', '/b/d'].  Empty braces are treated as a wildcard
+" and globbed.  Actual globs are preserved.
+function! pathogen#expand(pattern) abort
+  if a:pattern =~# '{[^{}]\+}'
+    let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
+    let found = map(split(pat, ',', 1), 'pre.v:val.post')
+    let results = []
+    for pattern in found
+      call extend(results, pathogen#expand(pattern))
+    endfor
+    return results
+  elseif a:pattern =~# '{}'
+    let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
+    let post = a:pattern[strlen(pat) : -1]
+    return map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
+  else
+    return [a:pattern]
+  endif
+endfunction
+
+" \ on Windows unless shellslash is set, / everywhere else.
+function! pathogen#slash() abort
+  return !exists("+shellslash") || &shellslash ? '/' : '\'
+endfunction
+
+function! pathogen#separator() abort
+  return pathogen#slash()
+endfunction
+
+" Convenience wrapper around glob() which returns a list.
+function! pathogen#glob(pattern) abort
+  let files = split(glob(a:pattern),"\n")
+  return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
+endfunction "}}}1
+
+" Like pathogen#glob(), only limit the results to directories.
+function! pathogen#glob_directories(pattern) abort
+  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
+endfunction "}}}1
+
+" Remove duplicates from a list.
+function! pathogen#uniq(list) abort
+  let i = 0
+  let seen = {}
+  while i < len(a:list)
+    if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
+      call remove(a:list,i)
+    elseif a:list[i] ==# ''
+      let i += 1
+      let empty = 1
+    else
+      let seen[a:list[i]] = 1
+      let i += 1
+    endif
+  endwhile
+  return a:list
+endfunction
+
+" Backport of fnameescape().
+function! pathogen#fnameescape(string) abort
+  if exists('*fnameescape')
+    return fnameescape(a:string)
+  elseif a:string ==# '-'
+    return '\-'
+  else
+    return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
+  endif
+endfunction
+
+" Like findfile(), but hardcoded to use the runtimepath.
+function! pathogen#runtime_findfile(file,count) abort "{{{1
+  let rtp = pathogen#join(1,pathogen#split(&rtp))
+  let file = findfile(a:file,rtp,a:count)
+  if file ==# ''
+    return ''
+  else
+    return fnamemodify(file,':p')
+  endif
+endfunction
+
+" Section: Deprecated
+
+function! s:warn(msg) abort
+  echohl WarningMsg
+  echomsg a:msg
+  echohl NONE
+endfunction
+
+" Prepend all subdirectories of path to the rtp, and append all 'after'
+" directories in those subdirectories.  Deprecated.
+function! pathogen#runtime_prepend_subdirectories(path) abort
+  call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')')
+  return pathogen#surround(a:path . pathogen#slash() . '{}')
+endfunction
+
+function! pathogen#incubate(...) abort
+  let name = a:0 ? a:1 : 'bundle/{}'
+  call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')')
+  return pathogen#interpose(name)
+endfunction
+
+" Deprecated alias for pathogen#interpose().
+function! pathogen#runtime_append_all_bundles(...) abort
+  if a:0
+    call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')')
+  else
+    call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()')
+  endif
+  return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}')
+endfunction
+
+if exists(':Vedit')
+  finish
+endif
+
+let s:vopen_warning = 0
+
+function! s:find(count,cmd,file,lcd)
+  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
+  let file = pathogen#runtime_findfile(a:file,a:count)
+  if file ==# ''
+    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
+  endif
+  if !s:vopen_warning
+    let s:vopen_warning = 1
+    let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
+  else
+    let warning = ''
+  endif
+  if a:lcd
+    let path = file[0:-strlen(a:file)-2]
+    execute 'lcd `=path`'
+    return a:cmd.' '.pathogen#fnameescape(a:file) . warning
+  else
+    return a:cmd.' '.pathogen#fnameescape(file) . warning
+  endif
+endfunction
+
+function! s:Findcomplete(A,L,P)
+  let sep = pathogen#slash()
+  let cheats = {
+        \'a': 'autoload',
+        \'d': 'doc',
+        \'f': 'ftplugin',
+        \'i': 'indent',
+        \'p': 'plugin',
+        \'s': 'syntax'}
+  if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
+    let request = cheats[a:A[0]].a:A[1:-1]
+  else
+    let request = a:A
+  endif
+  let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
+  let found = {}
+  for path in pathogen#split(&runtimepath)
+    let path = expand(path, ':p')
+    let matches = split(glob(path.sep.pattern),"\n")
+    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
+    call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
+    for match in matches
+      let found[match] = 1
+    endfor
+  endfor
+  return sort(keys(found))
+endfunction
+
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
+
+" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':

From f233136bba1bfe99bddf60279bab1d52e870b1b9 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Sat, 4 Apr 2015 00:14:55 -0700
Subject: [PATCH 4/4] quick insert one character

---
 home/vimrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home/vimrc b/home/vimrc
index 35493d3..273864f 100644
--- a/home/vimrc
+++ b/home/vimrc
@@ -247,6 +247,8 @@ let leader="\\"
 " no-op
 nn <Leader><Leader> :<cr>
 "ino <c-\> <C-o><Leader>              " this doesn't workkkkkkkkk
+nm <Leader>i i?<Esc>r
+nm <Leader>a a?<Esc>r
 nn <Leader>p "0p
 nn <Leader>P "0P
 nn <Leader>e :tabe