diff --git a/.gitmodules b/.gitmodules
index 9d49d9a..8b13789 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,57 +1 @@
-[submodule ".vim/bundle/lightline.vim"]
- path = .vim/bundle/lightline.vim
- url = https://github.com/itchyny/lightline.vim
-[submodule ".vim/bundle/nerdtree"]
- path = .vim/bundle/nerdtree
- url = https://github.com/scrooloose/nerdtree.git
-[submodule ".vim/bundle/typescript-vim"]
- path = .vim/bundle/typescript-vim
- url = https://github.com/leafgarland/typescript-vim.git
-[submodule ".vim/bundle/vim-elixir"]
- path = .vim/bundle/vim-elixir
- url = https://github.com/elixir-lang/vim-elixir.git
-[submodule ".vim/bundle/vim-gitgutter"]
- path = .vim/bundle/vim-gitgutter
- url = https://github.com/airblade/vim-gitgutter.git
-[submodule ".vim/bundle/vim-unimpaired"]
- path = .vim/bundle/vim-unimpaired
- url = https://github.com/tpope/vim-unimpaired.git
-[submodule ".vim/bundle/rust.vim"]
- path = .vim/bundle/rust.vim
- url = https://github.com/rust-lang/rust.vim.git
-[submodule "vim/bundle/vim-gitbranch"]
- path = vim/bundle/vim-gitbranch
- url = https://github.com/itchyny/vim-gitbranch.git
-[submodule ".vim/bundle/vim-gitbranch"]
- path = .vim/bundle/vim-gitbranch
- url = https://github.com/itchyny/vim-gitbranch.git
-[submodule ".vim/bundle/ansible-vim"]
- path = .vim/bundle/ansible-vim
- url = https://github.com/pearofducks/ansible-vim
-[submodule ".vim/bundle/direnv.vim"]
- path = .vim/bundle/direnv.vim
- url = https://github.com/direnv/direnv.vim.git
-[submodule ".vim/bundle/lightline-ale"]
- path = .vim/bundle/lightline-ale
- url = https://github.com/maximbaz/lightline-ale/
-[submodule ".vim/bundle/nerdtree-git-plugin"]
- path = .vim/bundle/nerdtree-git-plugin
- url = https://github.com/albfan/nerdtree-git-plugin.git
-[submodule ".vim/bundle/vim-nix"]
- path = .vim/bundle/vim-nix
- url = https://github.com/LnL7/vim-nix.git
-[submodule ".vim/bundle/vim-rails"]
- path = .vim/bundle/vim-rails
- url = https://github.com/tpope/vim-rails.git
-[submodule ".vim/bundle/vim-ruby"]
- path = .vim/bundle/vim-ruby
- url = https://github.com/vim-ruby/vim-ruby/
-[submodule ".vim/bundle/vim-terraform"]
- path = .vim/bundle/vim-terraform
- url = https://github.com/hashivim/vim-terraform.git
-[submodule ".vim/bundle/vim-toml"]
- path = .vim/bundle/vim-toml
- url = https://github.com/cespare/vim-toml.git
-[submodule ".vim/bundle/vim-trailing-whitespace"]
- path = .vim/bundle/vim-trailing-whitespace
- url = https://github.com/bronson/vim-trailing-whitespace/
+
diff --git a/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim
deleted file mode 100644
index dbe07f0..0000000
--- a/.vim/autoload/pathogen.vim
+++ /dev/null
@@ -1,289 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer: Tim Pope
-" Version: 2.4
-
-" 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,'\\\@]','\\&','')
- endif
-endfunction
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort
- 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
-
-" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':
diff --git a/.vim/bundle/ansible-vim b/.vim/bundle/ansible-vim
deleted file mode 160000
index 7abb04c..0000000
--- a/.vim/bundle/ansible-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7abb04c115742ec9a5f90b86170f0118680cf8ec
diff --git a/.vim/bundle/direnv.vim b/.vim/bundle/direnv.vim
deleted file mode 160000
index 983bbce..0000000
--- a/.vim/bundle/direnv.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 983bbce66b39cd17e4b8348078a41a5782cd73a0
diff --git a/.vim/bundle/lightline-ale b/.vim/bundle/lightline-ale
deleted file mode 160000
index 2335255..0000000
--- a/.vim/bundle/lightline-ale
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 23352556fdaa067209fa22df424f1b88ab370f6a
diff --git a/.vim/bundle/lightline.vim b/.vim/bundle/lightline.vim
deleted file mode 160000
index bc82a1c..0000000
--- a/.vim/bundle/lightline.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bc82a1c7b6d8517d4e9224a254968e0f0b334fdf
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
deleted file mode 160000
index 63c5920..0000000
--- a/.vim/bundle/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 63c59208c1f9eef7068a944f5c3033bd1a348b97
diff --git a/.vim/bundle/nerdtree-git-plugin b/.vim/bundle/nerdtree-git-plugin
deleted file mode 160000
index 95e2057..0000000
--- a/.vim/bundle/nerdtree-git-plugin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 95e20577cd442ad6256aff9bb2e9c80db05c13f0
diff --git a/.vim/bundle/rust.vim b/.vim/bundle/rust.vim
deleted file mode 160000
index 08fbcbb..0000000
--- a/.vim/bundle/rust.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 08fbcbbb8c4102df7c4099434826ac0d1fa3af15
diff --git a/.vim/bundle/typescript-vim b/.vim/bundle/typescript-vim
deleted file mode 160000
index 5a319ea..0000000
--- a/.vim/bundle/typescript-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5a319ea5504e18215d155576c78d1b7fb8e22c8f
diff --git a/.vim/bundle/vim-elixir b/.vim/bundle/vim-elixir
deleted file mode 160000
index 46a6847..0000000
--- a/.vim/bundle/vim-elixir
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 46a68476fc7b4f454c829d83d21997b82ac66f76
diff --git a/.vim/bundle/vim-gitbranch b/.vim/bundle/vim-gitbranch
deleted file mode 160000
index 8118dc1..0000000
--- a/.vim/bundle/vim-gitbranch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8118dc1cdd387bd609852be4bf350360ce881193
diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter
deleted file mode 160000
index 9147174..0000000
--- a/.vim/bundle/vim-gitgutter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 91471746fe687ee867877508dfd809460dab5698
diff --git a/.vim/bundle/vim-nix b/.vim/bundle/vim-nix
deleted file mode 160000
index d733cb9..0000000
--- a/.vim/bundle/vim-nix
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d733cb96707a2a6bdc6102b6d89f947688e0e959
diff --git a/.vim/bundle/vim-rails b/.vim/bundle/vim-rails
deleted file mode 160000
index 2c42236..0000000
--- a/.vim/bundle/vim-rails
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2c42236cf38c0842dd490095ffd6b1540cad2e29
diff --git a/.vim/bundle/vim-ruby b/.vim/bundle/vim-ruby
deleted file mode 160000
index e367f7b..0000000
--- a/.vim/bundle/vim-ruby
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e367f7b33fe9159c943963f3f839e4d08b74090e
diff --git a/.vim/bundle/vim-terraform b/.vim/bundle/vim-terraform
deleted file mode 160000
index 6fd491d..0000000
--- a/.vim/bundle/vim-terraform
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6fd491d6a2ae40fef3aa6c414e096ce07664f030
diff --git a/.vim/bundle/vim-toml b/.vim/bundle/vim-toml
deleted file mode 160000
index 897cb4e..0000000
--- a/.vim/bundle/vim-toml
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 897cb4eaa81a0366bc859effe14116660d4015cd
diff --git a/.vim/bundle/vim-trailing-whitespace b/.vim/bundle/vim-trailing-whitespace
deleted file mode 160000
index 610ca1a..0000000
--- a/.vim/bundle/vim-trailing-whitespace
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 610ca1a97c8dc85cdeb38635e5a4703317c4b94d
diff --git a/.vim/bundle/vim-unimpaired b/.vim/bundle/vim-unimpaired
deleted file mode 160000
index a49c4f2..0000000
--- a/.vim/bundle/vim-unimpaired
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a49c4f2bf05f18a6e4f6572a19763ba7abba52b1
diff --git a/.vim/colors/Tomorrow-Night-Blue.vim b/.vim/colors/Tomorrow-Night-Blue.vim
deleted file mode 100644
index 3da58fb..0000000
--- a/.vim/colors/Tomorrow-Night-Blue.vim
+++ /dev/null
@@ -1,489 +0,0 @@
-" Tomorrow Night Blue - Full Colour and 256 Colour
-" http://chriskempson.com
-"
-" Hex colour conversion functions borrowed from the theme "Desert256""
-
-" Default GUI Colours
-let s:foreground = "ffffff"
-let s:background = "002451"
-let s:selection = "003f8e"
-let s:line = "00346e"
-let s:comment = "7285b7"
-let s:red = "ff9da4"
-let s:orange = "ffc58f"
-let s:yellow = "ffeead"
-let s:green = "d1f1a9"
-let s:aqua = "99ffff"
-let s:blue = "bbdaff"
-let s:purple = "ebbbff"
-let s:window = "4d5057"
-
-hi clear
-syntax reset
-
-let g:colors_name = "Tomorrow-Night-Blue"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
- " Returns an approximate grey index for the given grey level
- fun grey_number(x)
- if &t_Co == 88
- if a:x < 23
- return 0
- elseif a:x < 69
- return 1
- elseif a:x < 103
- return 2
- elseif a:x < 127
- return 3
- elseif a:x < 150
- return 4
- elseif a:x < 173
- return 5
- elseif a:x < 196
- return 6
- elseif a:x < 219
- return 7
- elseif a:x < 243
- return 8
- else
- return 9
- endif
- else
- if a:x < 14
- return 0
- else
- let l:n = (a:x - 8) / 10
- let l:m = (a:x - 8) % 10
- if l:m < 5
- return l:n
- else
- return l:n + 1
- endif
- endif
- endif
- endfun
-
- " Returns the actual grey level represented by the grey index
- fun grey_level(n)
- if &t_Co == 88
- if a:n == 0
- return 0
- elseif a:n == 1
- return 46
- elseif a:n == 2
- return 92
- elseif a:n == 3
- return 115
- elseif a:n == 4
- return 139
- elseif a:n == 5
- return 162
- elseif a:n == 6
- return 185
- elseif a:n == 7
- return 208
- elseif a:n == 8
- return 231
- else
- return 255
- endif
- else
- if a:n == 0
- return 0
- else
- return 8 + (a:n * 10)
- endif
- endif
- endfun
-
- " Returns the palette index for the given grey index
- fun grey_colour(n)
- if &t_Co == 88
- if a:n == 0
- return 16
- elseif a:n == 9
- return 79
- else
- return 79 + a:n
- endif
- else
- if a:n == 0
- return 16
- elseif a:n == 25
- return 231
- else
- return 231 + a:n
- endif
- endif
- endfun
-
- " Returns an approximate colour index for the given colour level
- fun rgb_number(x)
- if &t_Co == 88
- if a:x < 69
- return 0
- elseif a:x < 172
- return 1
- elseif a:x < 230
- return 2
- else
- return 3
- endif
- else
- if a:x < 75
- return 0
- else
- let l:n = (a:x - 55) / 40
- let l:m = (a:x - 55) % 40
- if l:m < 20
- return l:n
- else
- return l:n + 1
- endif
- endif
- endif
- endfun
-
- " Returns the actual colour level for the given colour index
- fun rgb_level(n)
- if &t_Co == 88
- if a:n == 0
- return 0
- elseif a:n == 1
- return 139
- elseif a:n == 2
- return 205
- else
- return 255
- endif
- else
- if a:n == 0
- return 0
- else
- return 55 + (a:n * 40)
- endif
- endif
- endfun
-
- " Returns the palette index for the given R/G/B colour indices
- fun rgb_colour(x, y, z)
- if &t_Co == 88
- return 16 + (a:x * 16) + (a:y * 4) + a:z
- else
- return 16 + (a:x * 36) + (a:y * 6) + a:z
- endif
- endfun
-
- " Returns the palette index to approximate the given R/G/B colour levels
- fun colour(r, g, b)
- " Get the closest grey
- let l:gx = grey_number(a:r)
- let l:gy = grey_number(a:g)
- let l:gz = grey_number(a:b)
-
- " Get the closest colour
- let l:x = rgb_number(a:r)
- let l:y = rgb_number(a:g)
- let l:z = rgb_number(a:b)
-
- if l:gx == l:gy && l:gy == l:gz
- " There are two possibilities
- let l:dgr = grey_level(l:gx) - a:r
- let l:dgg = grey_level(l:gy) - a:g
- let l:dgb = grey_level(l:gz) - a:b
- let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
- let l:dr = rgb_level(l:gx) - a:r
- let l:dg = rgb_level(l:gy) - a:g
- let l:db = rgb_level(l:gz) - a:b
- let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
- if l:dgrey < l:drgb
- " Use the grey
- return grey_colour(l:gx)
- else
- " Use the colour
- return rgb_colour(l:x, l:y, l:z)
- endif
- else
- " Only one possibility
- return rgb_colour(l:x, l:y, l:z)
- endif
- endfun
-
- " Returns the palette index to approximate the 'rrggbb' hex string
- fun rgb(rgb)
- let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
- let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
- let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-
- return colour(l:r, l:g, l:b)
- endfun
-
- " Sets the highlighting for the given group
- fun X(group, fg, bg, attr)
- if a:fg != ""
- exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . rgb(a:fg)
- endif
- if a:bg != ""
- exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . rgb(a:bg)
- endif
- if a:attr != ""
- exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
- endif
- endfun
-
- " Vim Highlighting
- call X("Normal", s:foreground, s:background, "")
- call X("LineNr", s:foreground, s:background, "")
- call X("NonText", s:selection, "", "")
- call X("SpecialKey", s:selection, "", "")
- call X("Search", s:background, s:yellow, "")
- call X("TabLine", s:window, s:foreground, "reverse")
- call X("TabLineFill", s:window, s:foreground, "reverse")
- call X("StatusLine", s:window, s:yellow, "reverse")
- call X("StatusLineNC", s:window, s:foreground, "reverse")
- call X("VertSplit", s:window, s:window, "none")
- call X("Visual", "", s:selection, "")
- call X("Directory", s:blue, "", "")
- call X("ModeMsg", s:green, "", "")
- call X("MoreMsg", s:green, "", "")
- call X("Question", s:green, "", "")
- call X("WarningMsg", s:red, "", "")
- call X("MatchParen", "", s:selection, "")
- call X("Folded", s:comment, s:background, "")
- call X("FoldColumn", "", s:background, "")
- if version >= 700
- call X("CursorLine", "", s:line, "none")
- call X("CursorColumn", "", s:line, "none")
- call X("PMenu", s:foreground, s:selection, "none")
- call X("PMenuSel", s:foreground, s:selection, "reverse")
- call X("SignColumn", "", s:background, "none")
- end
- if version >= 703
- call X("ColorColumn", "", s:line, "none")
- end
-
- " Standard Highlighting
- call X("Comment", s:comment, "", "")
- call X("Todo", s:comment, s:background, "")
- call X("Title", s:comment, "", "")
- call X("Identifier", s:red, "", "none")
- call X("Statement", s:foreground, "", "")
- call X("Conditional", s:foreground, "", "")
- call X("Repeat", s:foreground, "", "")
- call X("Structure", s:purple, "", "")
- call X("Function", s:blue, "", "")
- call X("Constant", s:orange, "", "")
- call X("Keyword", s:orange, "", "")
- call X("String", s:green, "", "")
- call X("Special", s:foreground, "", "")
- call X("PreProc", s:purple, "", "")
- call X("Operator", s:aqua, "", "none")
- call X("Type", s:blue, "", "none")
- call X("Define", s:purple, "", "none")
- call X("Include", s:blue, "", "")
- "call X("Ignore", "666666", "", "")
-
- " Vim Highlighting
- call X("vimCommand", s:red, "", "none")
-
- " C Highlighting
- call X("cType", s:yellow, "", "")
- call X("cStorageClass", s:purple, "", "")
- call X("cConditional", s:purple, "", "")
- call X("cRepeat", s:purple, "", "")
-
- " PHP Highlighting
- call X("phpVarSelector", s:red, "", "")
- call X("phpKeyword", s:purple, "", "")
- call X("phpRepeat", s:purple, "", "")
- call X("phpConditional", s:purple, "", "")
- call X("phpStatement", s:purple, "", "")
- call X("phpMemberSelector", s:foreground, "", "")
-
- " Ruby Highlighting
- call X("rubySymbol", s:green, "", "")
- call X("rubyConstant", s:yellow, "", "")
- call X("rubyAccess", s:yellow, "", "")
- call X("rubyAttribute", s:blue, "", "")
- call X("rubyInclude", s:blue, "", "")
- call X("rubyLocalVariableOrMethod", s:orange, "", "")
- call X("rubyCurlyBlock", s:orange, "", "")
- call X("rubyStringDelimiter", s:green, "", "")
- call X("rubyInterpolationDelimiter", s:orange, "", "")
- call X("rubyConditional", s:purple, "", "")
- call X("rubyRepeat", s:purple, "", "")
- call X("rubyControl", s:purple, "", "")
- call X("rubyException", s:purple, "", "")
-
- " Crystal Highlighting
- call X("crystalSymbol", s:green, "", "")
- call X("crystalConstant", s:yellow, "", "")
- call X("crystalAccess", s:yellow, "", "")
- call X("crystalAttribute", s:blue, "", "")
- call X("crystalInclude", s:blue, "", "")
- call X("crystalLocalVariableOrMethod", s:orange, "", "")
- call X("crystalCurlyBlock", s:orange, "", "")
- call X("crystalStringDelimiter", s:green, "", "")
- call X("crystalInterpolationDelimiter", s:orange, "", "")
- call X("crystalConditional", s:purple, "", "")
- call X("crystalRepeat", s:purple, "", "")
- call X("crystalControl", s:purple, "", "")
- call X("crystalException", s:purple, "", "")
-
- " Python Highlighting
- call X("pythonInclude", s:purple, "", "")
- call X("pythonStatement", s:purple, "", "")
- call X("pythonConditional", s:purple, "", "")
- call X("pythonRepeat", s:purple, "", "")
- call X("pythonException", s:purple, "", "")
- call X("pythonFunction", s:blue, "", "")
- call X("pythonPreCondit", s:purple, "", "")
- call X("pythonRepeat", s:aqua, "", "")
- call X("pythonExClass", s:orange, "", "")
-
- " JavaScript Highlighting
- call X("javaScriptBraces", s:foreground, "", "")
- call X("javaScriptFunction", s:purple, "", "")
- call X("javaScriptConditional", s:purple, "", "")
- call X("javaScriptRepeat", s:purple, "", "")
- call X("javaScriptNumber", s:orange, "", "")
- call X("javaScriptMember", s:orange, "", "")
- call X("javascriptNull", s:orange, "", "")
- call X("javascriptGlobal", s:blue, "", "")
- call X("javascriptStatement", s:red, "", "")
-
- " CoffeeScript Highlighting
- call X("coffeeRepeat", s:purple, "", "")
- call X("coffeeConditional", s:purple, "", "")
- call X("coffeeKeyword", s:purple, "", "")
- call X("coffeeObject", s:yellow, "", "")
-
- " HTML Highlighting
- call X("htmlTag", s:red, "", "")
- call X("htmlTagName", s:red, "", "")
- call X("htmlArg", s:red, "", "")
- call X("htmlScriptTag", s:red, "", "")
-
- " Diff Highlighting
- call X("diffAdd", "", "4c4e39", "")
- call X("diffDelete", s:background, s:red, "")
- call X("diffChange", "", "2b5b77", "")
- call X("diffText", s:line, s:blue, "")
-
- " ShowMarks Highlighting
- call X("ShowMarksHLl", s:orange, s:background, "none")
- call X("ShowMarksHLo", s:purple, s:background, "none")
- call X("ShowMarksHLu", s:yellow, s:background, "none")
- call X("ShowMarksHLm", s:aqua, s:background, "none")
-
- " Lua Highlighting
- call X("luaStatement", s:purple, "", "")
- call X("luaRepeat", s:purple, "", "")
- call X("luaCondStart", s:purple, "", "")
- call X("luaCondElseif", s:purple, "", "")
- call X("luaCond", s:purple, "", "")
- call X("luaCondEnd", s:purple, "", "")
-
- " Cucumber Highlighting
- call X("cucumberGiven", s:blue, "", "")
- call X("cucumberGivenAnd", s:blue, "", "")
-
- " Go Highlighting
- call X("goDirective", s:purple, "", "")
- call X("goDeclaration", s:purple, "", "")
- call X("goStatement", s:purple, "", "")
- call X("goConditional", s:purple, "", "")
- call X("goConstants", s:orange, "", "")
- call X("goTodo", s:yellow, "", "")
- call X("goDeclType", s:blue, "", "")
- call X("goBuiltins", s:purple, "", "")
- call X("goRepeat", s:purple, "", "")
- call X("goLabel", s:purple, "", "")
-
- " Clojure Highlighting
- call X("clojureConstant", s:orange, "", "")
- call X("clojureBoolean", s:orange, "", "")
- call X("clojureCharacter", s:orange, "", "")
- call X("clojureKeyword", s:green, "", "")
- call X("clojureNumber", s:orange, "", "")
- call X("clojureString", s:green, "", "")
- call X("clojureRegexp", s:green, "", "")
- call X("clojureParen", s:aqua, "", "")
- call X("clojureVariable", s:yellow, "", "")
- call X("clojureCond", s:blue, "", "")
- call X("clojureDefine", s:purple, "", "")
- call X("clojureException", s:red, "", "")
- call X("clojureFunc", s:blue, "", "")
- call X("clojureMacro", s:blue, "", "")
- call X("clojureRepeat", s:blue, "", "")
- call X("clojureSpecial", s:purple, "", "")
- call X("clojureQuote", s:blue, "", "")
- call X("clojureUnquote", s:blue, "", "")
- call X("clojureMeta", s:blue, "", "")
- call X("clojureDeref", s:blue, "", "")
- call X("clojureAnonArg", s:blue, "", "")
- call X("clojureRepeat", s:blue, "", "")
- call X("clojureDispatch", s:blue, "", "")
-
- " Scala Highlighting
- call X("scalaKeyword", s:purple, "", "")
- call X("scalaKeywordModifier", s:purple, "", "")
- call X("scalaOperator", s:blue, "", "")
- call X("scalaPackage", s:red, "", "")
- call X("scalaFqn", s:foreground, "", "")
- call X("scalaFqnSet", s:foreground, "", "")
- call X("scalaImport", s:purple, "", "")
- call X("scalaBoolean", s:orange, "", "")
- call X("scalaDef", s:purple, "", "")
- call X("scalaVal", s:purple, "", "")
- call X("scalaVar", s:aqua, "", "")
- call X("scalaClass", s:purple, "", "")
- call X("scalaObject", s:purple, "", "")
- call X("scalaTrait", s:purple, "", "")
- call X("scalaDefName", s:blue, "", "")
- call X("scalaValName", s:foreground, "", "")
- call X("scalaVarName", s:foreground, "", "")
- call X("scalaClassName", s:foreground, "", "")
- call X("scalaType", s:yellow, "", "")
- call X("scalaTypeSpecializer", s:yellow, "", "")
- call X("scalaAnnotation", s:orange, "", "")
- call X("scalaNumber", s:orange, "", "")
- call X("scalaDefSpecializer", s:yellow, "", "")
- call X("scalaClassSpecializer", s:yellow, "", "")
- call X("scalaBackTick", s:green, "", "")
- call X("scalaRoot", s:foreground, "", "")
- call X("scalaMethodCall", s:blue, "", "")
- call X("scalaCaseType", s:yellow, "", "")
- call X("scalaLineComment", s:comment, "", "")
- call X("scalaComment", s:comment, "", "")
- call X("scalaDocComment", s:comment, "", "")
- call X("scalaDocTags", s:comment, "", "")
- call X("scalaEmptyString", s:green, "", "")
- call X("scalaMultiLineString", s:green, "", "")
- call X("scalaUnicode", s:orange, "", "")
- call X("scalaString", s:green, "", "")
- call X("scalaStringEscape", s:green, "", "")
- call X("scalaSymbol", s:orange, "", "")
- call X("scalaChar", s:orange, "", "")
- call X("scalaXml", s:green, "", "")
- call X("scalaConstructorSpecializer", s:yellow, "", "")
- call X("scalaBackTick", s:blue, "", "")
-
- " Git
- call X("diffAdded", s:green, "", "")
- call X("diffRemoved", s:red, "", "")
- call X("gitcommitSummary", "", "", "bold")
-
- " Delete Functions
- delf X
- delf rgb
- delf colour
- delf rgb_colour
- delf rgb_level
- delf rgb_number
- delf grey_colour
- delf grey_level
- delf grey_number
-endif
-
-set background=dark
diff --git a/.vim/colors/Tomorrow-Night-Bright.vim b/.vim/colors/Tomorrow-Night-Bright.vim
deleted file mode 100644
index 8a89dbe..0000000
--- a/.vim/colors/Tomorrow-Night-Bright.vim
+++ /dev/null
@@ -1,489 +0,0 @@
-" Tomorrow Night Bright - Full Colour and 256 Colour
-" http://chriskempson.com
-"
-" Hex colour conversion functions borrowed from the theme "Desert256""
-
-" Default GUI Colours
-let s:foreground = "eaeaea"
-let s:background = "000000"
-let s:selection = "424242"
-let s:line = "2a2a2a"
-let s:comment = "969896"
-let s:red = "d54e53"
-let s:orange = "e78c45"
-let s:yellow = "e7c547"
-let s:green = "b9ca4a"
-let s:aqua = "70c0b1"
-let s:blue = "7aa6da"
-let s:purple = "c397d8"
-let s:window = "4d5057"
-
-hi clear
-syntax reset
-
-let g:colors_name = "Tomorrow-Night-Bright"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
- " Returns an approximate grey index for the given grey level
- fun grey_number(x)
- if &t_Co == 88
- if a:x < 23
- return 0
- elseif a:x < 69
- return 1
- elseif a:x < 103
- return 2
- elseif a:x < 127
- return 3
- elseif a:x < 150
- return 4
- elseif a:x < 173
- return 5
- elseif a:x < 196
- return 6
- elseif a:x < 219
- return 7
- elseif a:x < 243
- return 8
- else
- return 9
- endif
- else
- if a:x < 14
- return 0
- else
- let l:n = (a:x - 8) / 10
- let l:m = (a:x - 8) % 10
- if l:m < 5
- return l:n
- else
- return l:n + 1
- endif
- endif
- endif
- endfun
-
- " Returns the actual grey level represented by the grey index
- fun grey_level(n)
- if &t_Co == 88
- if a:n == 0
- return 0
- elseif a:n == 1
- return 46
- elseif a:n == 2
- return 92
- elseif a:n == 3
- return 115
- elseif a:n == 4
- return 139
- elseif a:n == 5
- return 162
- elseif a:n == 6
- return 185
- elseif a:n == 7
- return 208
- elseif a:n == 8
- return 231
- else
- return 255
- endif
- else
- if a:n == 0
- return 0
- else
- return 8 + (a:n * 10)
- endif
- endif
- endfun
-
- " Returns the palette index for the given grey index
- fun grey_colour(n)
- if &t_Co == 88
- if a:n == 0
- return 16
- elseif a:n == 9
- return 79
- else
- return 79 + a:n
- endif
- else
- if a:n == 0
- return 16
- elseif a:n == 25
- return 231
- else
- return 231 + a:n
- endif
- endif
- endfun
-
- " Returns an approximate colour index for the given colour level
- fun rgb_number(x)
- if &t_Co == 88
- if a:x < 69
- return 0
- elseif a:x < 172
- return 1
- elseif a:x < 230
- return 2
- else
- return 3
- endif
- else
- if a:x < 75
- return 0
- else
- let l:n = (a:x - 55) / 40
- let l:m = (a:x - 55) % 40
- if l:m < 20
- return l:n
- else
- return l:n + 1
- endif
- endif
- endif
- endfun
-
- " Returns the actual colour level for the given colour index
- fun rgb_level(n)
- if &t_Co == 88
- if a:n == 0
- return 0
- elseif a:n == 1
- return 139
- elseif a:n == 2
- return 205
- else
- return 255
- endif
- else
- if a:n == 0
- return 0
- else
- return 55 + (a:n * 40)
- endif
- endif
- endfun
-
- " Returns the palette index for the given R/G/B colour indices
- fun rgb_colour(x, y, z)
- if &t_Co == 88
- return 16 + (a:x * 16) + (a:y * 4) + a:z
- else
- return 16 + (a:x * 36) + (a:y * 6) + a:z
- endif
- endfun
-
- " Returns the palette index to approximate the given R/G/B colour levels
- fun colour(r, g, b)
- " Get the closest grey
- let l:gx = grey_number(a:r)
- let l:gy = grey_number(a:g)
- let l:gz = grey_number(a:b)
-
- " Get the closest colour
- let l:x = rgb_number(a:r)
- let l:y = rgb_number(a:g)
- let l:z = rgb_number(a:b)
-
- if l:gx == l:gy && l:gy == l:gz
- " There are two possibilities
- let l:dgr = grey_level(l:gx) - a:r
- let l:dgg = grey_level(l:gy) - a:g
- let l:dgb = grey_level(l:gz) - a:b
- let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
- let l:dr = rgb_level(l:gx) - a:r
- let l:dg =