Commit 435ad0e

@@ -1,118 +1,88 @@
-[submodule "bundle/colors/irblack"]
+[submodule "pack/plugins/start/irblack"]
 	path = pack/plugins/start/irblack
 	url = https://github.com/twerth/ir_black.git
-[submodule "bundle/colors/vim-colorschemes"]
-	path = bundle/colors/vim-colorschemes
-	url = https://github.com/flazz/vim-colorschemes.git
-[submodule "bundle/langs/vim-vue"]
-	path = bundle/langs/vim-vue
-	url = https://github.com/posva/vim-vue.git
-[submodule "bundle/langs/haml"]
+[submodule "pack/plugins/start/haml"]
 	path = pack/plugins/start/haml
 	url = https://github.com/tpope/vim-haml.git
-[submodule "bundle/langs/javascript"]
+[submodule "pack/plugins/start/javascript"]
 	path = pack/plugins/start/javascript
 	url = https://github.com/pangloss/vim-javascript.git
-[submodule "bundle/langs/cucumber"]
-	path = pack/plugins/start/cucumber
-	url = https://github.com/tpope/vim-cucumber.git
-[submodule "bundle/langs/markdown"]
+[submodule "pack/plugins/start/markdown"]
 	path = pack/plugins/start/markdown
 	url = https://github.com/tpope/vim-markdown.git
-[submodule "bundle/langs/coffeescript"]
+[submodule "pack/plugins/start/coffeescript"]
 	path = pack/plugins/start/coffeescript
 	url = https://github.com/kchmck/vim-coffee-script.git
-[submodule "bundle/langs/rails"]
+[submodule "pack/plugins/start/rails"]
 	path = pack/plugins/start/rails
 	url = https://github.com/tpope/vim-rails.git
-[submodule "bundle/langs/git"]
+[submodule "pack/plugins/start/git"]
 	path = pack/plugins/start/git
 	url = https://github.com/tpope/vim-git.git
-[submodule "bundle/langs/rspec"]
+[submodule "pack/plugins/start/rspec"]
 	path = pack/plugins/start/rspec
 	url = https://github.com/skwp/vim-rspec.git
-[submodule "bundle/langs/scss"]
+[submodule "pack/plugins/start/scss"]
 	path = pack/plugins/start/scss
 	url = https://github.com/cakebaker/scss-syntax.vim.git
-[submodule "bundle/langs/csv"]
+[submodule "pack/plugins/start/csv"]
 	path = pack/plugins/start/csv
 	url = https://github.com/chrisbra/csv.vim.git
-[submodule "bundle/langs/nodejs"]
+[submodule "pack/plugins/start/nodejs"]
 	path = pack/plugins/start/nodejs
 	url = https://github.com/mmalecki/vim-node.js.git
-[submodule "bundle/langs/ruby"]
+[submodule "pack/plugins/start/ruby"]
 	path = pack/plugins/start/ruby
 	url = https://github.com/vim-ruby/vim-ruby.git
-[submodule "bundle/langs/minitest"]
+[submodule "pack/plugins/start/minitest"]
 	path = pack/plugins/start/minitest
 	url = https://github.com/sunaku/vim-ruby-minitest.git
-[submodule "bundle/langs/elixir"]
+[submodule "pack/plugins/start/elixir"]
 	path = pack/plugins/start/exlixir
 	url = https://github.com/elixir-lang/vim-elixir.git
-[submodule "bundle/langs/hive"]
-	path = bundle/langs/hive
-	url = https://github.com/autowitch/hive.vim.git
-[submodule "bundle/tools/nerdcommenter"]
+[submodule "pack/plugins/start/nerdcommenter"]
 	path = pack/plugins/start/nerdcommenter
 	url = https://github.com/scrooloose/nerdcommenter.git
-[submodule "bundle/tools/supertab"]
+[submodule "pack/plugins/start/supertab"]
 	path = pack/plugins/start/supertab
 	url = https://github.com/ervandew/supertab.git
-[submodule "bundle/tools/fugitive"]
+[submodule "pack/plugins/start/fugitive"]
 	path = pack/plugins/start/fugitive
 	url = https://github.com/tpope/vim-fugitive.git
-[submodule "bundle/tools/snipmate"]
+[submodule "plugins/start/snipmate"]
 	path = pack/plugins/start/snipmate
 	url = https://github.com/garbas/vim-snipmate.git
-[submodule "bundle/tools/tlib"]
-	path = pack/plugins/start/tlib
-	url = https://github.com/tomtom/tlib_vim.git
-[submodule "bundle/tools/vim-addon-mw-utils"]
-	path = pack/plugins/start/vim-addon-mw-utils
-	url = https://github.com/MarcWeber/vim-addon-mw-utils.git
-[submodule "bundle/tools/syntastic"]
+[submodule "pack/plugins/start/syntastic"]
 	path = pack/plugins/start/syntastic
 	url = https://github.com/scrooloose/syntastic.git
-[submodule "bundle/tools/nerdtree"]
+[submodule "pack/plugins/start/nerdtree"]
 	path = pack/plugins/start/nerdtree
 	url = https://github.com/scrooloose/nerdtree.git
-[submodule "bundle/tools/endwise"]
+[submodule "pack/plugins/start/endwise"]
 	path = pack/plugins/start/endwise
 	url = https://github.com/tpope/vim-endwise.git
-[submodule "bundle/tools/vimwiki"]
+[submodule "pack/plugins/start/vimwiki"]
 	path = pack/plugins/start/vimwiki
 	url = https://github.com/vim-scripts/vimwiki.git
-[submodule "bundle/tools/css-color"]
+[submodule "pack/plugins/start/css-color"]
 	path = pack/plugins/start/css-color
 	url = https://github.com/ap/vim-css-color.git
-[submodule "bundle/tools/vroom"]
+[submodule "pack/plugins/start/vroom"]
 	path = pack/plugins/start/vroom
 	url = https://github.com/skalnik/vim-vroom.git
-[submodule "bundle/tools/vim-snippets"]
+[submodule "pack/plugins/start/vim-snippets"]
 	path = pack/plugins/start/vim-snippets
 	url = https://github.com/honza/vim-snippets.git
-[submodule "bundle/tools/vim-ruby-minitest"]
-	path = bundle/tools/vim-ruby-minitest
-	url = git://github.com/sunaku/vim-ruby-minitest.git
-[submodule "bundle/tools/snipmate-snippets-rubymotion"]
-	path = bundle/tools/snipmate-snippets-rubymotion
-	url = git://github.com/rcyrus/snipmate-snippets-rubymotion.git
-[submodule "bundle/tools/vim-ruby-refactoring"]
-	path = bundle/tools/vim-ruby-refactoring
-	url = git://github.com/ecomba/vim-ruby-refactoring.git
-[submodule "bundle/langs/dart"]
+[submodule "pack/plugins/langs/dart"]
 	path = pack/plugins/start/dart
 	url = https://github.com/dart-lang/dart-vim-plugin.git
-[submodule "bundle/tools/matchit"]
-	path = bundle/tools/matchit
-	url = https://github.com/tmhedberg/matchit.git
-[submodule "bundle/tools/fzf"]
+[submodule "pack/plugins/start/fzf"]
 	path = pack/plugins/start/fzf
 	url = https://github.com/junegunn/fzf
-[submodule "bundle/tools/fzf.vim"]
+[submodule "pack/plugins/start/fzf.vim"]
 	path = pack/plugins/start/fzf.vim
 	url = https://github.com/junegunn/fzf.vim
-[submodule "bundle/langs/golang"]
+[submodule "pack/plugins/start/golang"]
 	path = pack/plugins/start/golang
 	url = https://github.com/fatih/vim-go.git
 [submodule "pack/plugins/start/ultisnips.git"]
@@ -127,15 +97,3 @@
 [submodule "pack/plugins/start/nord-vim"]
 	path = pack/plugins/start/nord-vim
 	url = https://github.com/arcticicestudio/nord-vim
-[submodule "pack/plugins/start/vim-lsp"]
-	path = pack/plugins/start/vim-lsp
-	url = https://github.com/prabirshrestha/vim-lsp
-[submodule "pack/plugins/start/async.vim"]
-	path = pack/plugins/start/async.vim
-	url = https://github.com/prabirshrestha/async.vim
-[submodule "pack/plugins/start/asyncomplete.vim"]
-	path = pack/plugins/start/asyncomplete.vim
-	url = https://github.com/prabirshrestha/asyncomplete.vim
-[submodule "pack/plugins/start/asyncomplete-lsp.vim"]
-	path = pack/plugins/start/asyncomplete-lsp.vim
-	url = https://github.com/prabirshrestha/asyncomplete-lsp.vim

@@ -56,7 +56,7 @@ set smartcase   " ... unless they contain at least one capital letter
 set showmatch   " briefly jump to the matching bracket.
 
 runtime macros/matchit.vim
-color nord
+color happy_hacking
 syntax enable         " Turn on syntax highlighting allowing local overrides
 set t_Co=256
 
@@ -261,13 +261,4 @@ let dart_style_guide = 2
 let g:vroom_map_keys = 0
 let g:vroom_use_dispatch = 1
 
-"if executable('solargraph')
-  "" gem install solargraph
-  "au User lsp_setup call lsp#register_server({
-    "\ 'name': 'solargraph',
-    "\ 'cmd': {server_info->[&shell, &shellcmdflag, 'solargraph stdio']},
-    "\ 'initialization_options': {"diagnostics": "true"},
-    "\ 'whitelist': ['ruby'],
-    "\ })
-"endif
 " }}}}