From db8cf0fe93b74e5ebc9c4560feb7e81e6101d580 Mon Sep 17 00:00:00 2001
From: Michael Kelly <m@michaelkelly.org>
Date: Sun, 9 Jul 2023 01:11:18 -0400
Subject: [PATCH] Refactor nvim configs to use packages

:h packages in either vim or neovim

My config file is still compatible with both vim and neovim, so vim's
`pack` dir is a symlink to neovim's.
---
 .config/nvim/autoload/pathogen.vim            | 264 ----------
 .../bundle/vim-javascript/ISSUE_TEMPLATE.md   |  13 -
 .config/nvim/bundle/vim-javascript/README.md  | 119 -----
 .../after/ftplugin/javascript.vim             |  12 -
 .../bundle/vim-javascript/compiler/eslint.vim |  16 -
 .../nvim/bundle/vim-javascript/extras/ctags   |   8 -
 .../bundle/vim-javascript/extras/flow.vim     | 107 ----
 .../bundle/vim-javascript/extras/jsdoc.vim    |  39 --
 .../bundle/vim-javascript/extras/ngdoc.vim    |   3 -
 .../vim-javascript/ftdetect/javascript.vim    |  11 -
 .../vim-javascript/indent/javascript.vim      | 475 ------------------
 .../vim-javascript/syntax/javascript.vim      | 391 --------------
 .config/nvim/init.vim                         |  10 +-
 .local/overlay-directory                      |   1 +
 .local/share/nvim/overlay-directory           |   1 +
 .local/share/nvim/site/overlay-directory      |   1 +
 .../start}/vim-bufferline/.gitignore          |   0
 .../start}/vim-bufferline/LICENSE             |   0
 .../start}/vim-bufferline/README.md           |   0
 .../vim-bufferline/autoload/bufferline.vim    |   0
 .../bufferline/algos/fixed_position.vim       |   0
 .../start}/vim-bufferline/doc/bufferline.txt  |   0
 .../vim-bufferline/img/bufferline-command.png | Bin
 .../vim-bufferline/img/bufferline-status.png  | Bin
 .../vim-bufferline/plugin/bufferline.vim      |   0
 .../start}/vim-commentary/.gitignore          |   0
 .../vim-commentary/CONTRIBUTING.markdown      |   0
 .../start}/vim-commentary/README.markdown     |   0
 .../start}/vim-commentary/doc/commentary.txt  |   0
 .../vim-commentary/plugin/commentary.vim      |   0
 .../vim-gnupg/start}/vim-gnupg/.gitattributes |   0
 .../vim-gnupg/start}/vim-gnupg/.gitignore     |   0
 .../pack/vim-gnupg/start}/vim-gnupg/README.md |   0
 .../start}/vim-gnupg/autoload/gnupg.vim       |   0
 .../vim-gnupg/start}/vim-gnupg/doc/gnupg.txt  |   0
 .../start}/vim-gnupg/plugin/gnupg.vim         |   0
 .../vim-go/start}/vim-go-1.19/.codecov.yml    |   0
 .../vim-go/start}/vim-go-1.19/.coveragerc     |   0
 .../vim-go/start}/vim-go-1.19/.dockerignore   |   0
 .../vim-go/start}/vim-go-1.19/.editorconfig   |   0
 .../vim-go-1.19/.github/CONTRIBUTING.md       |   0
 .../vim-go-1.19/.github/ISSUE_TEMPLATE.md     |   0
 .../pack/vim-go/start}/vim-go-1.19/.gitignore |   0
 .../vim-go/start}/vim-go-1.19/.travis.yml     |   0
 .../vim-go/start}/vim-go-1.19/.vintrc.yaml    |   0
 .../vim-go/start}/vim-go-1.19/CHANGELOG.md    |   0
 .../pack/vim-go/start}/vim-go-1.19/Dockerfile |   0
 .../pack/vim-go/start}/vim-go-1.19/LICENSE    |   0
 .../pack/vim-go/start}/vim-go-1.19/Makefile   |   0
 .../pack/vim-go/start}/vim-go-1.19/README.md  |   0
 .../vim-go/start}/vim-go-1.19/addon-info.json |   0
 .../start}/vim-go-1.19/assets/vim-go.png      | Bin
 .../start}/vim-go-1.19/assets/vim-go.svg      |   0
 .../vim-go-1.19/autoload/ctrlp/decls.vim      |   0
 .../start}/vim-go-1.19/autoload/fzf/decls.vim |   0
 .../vim-go-1.19/autoload/go/alternate.vim     |   0
 .../start}/vim-go-1.19/autoload/go/asmfmt.vim |   0
 .../start}/vim-go-1.19/autoload/go/cmd.vim    |   0
 .../vim-go-1.19/autoload/go/cmd_test.vim      |   0
 .../vim-go-1.19/autoload/go/complete.vim      |   0
 .../vim-go-1.19/autoload/go/complete_test.vim |   0
 .../start}/vim-go-1.19/autoload/go/config.vim |   0
 .../vim-go-1.19/autoload/go/coverage.vim      |   0
 .../start}/vim-go-1.19/autoload/go/debug.vim  |   0
 .../start}/vim-go-1.19/autoload/go/decls.vim  |   0
 .../start}/vim-go-1.19/autoload/go/def.vim    |   0
 .../vim-go-1.19/autoload/go/def_test.vim      |   0
 .../start}/vim-go-1.19/autoload/go/doc.vim    |   0
 .../vim-go-1.19/autoload/go/fillstruct.vim    |   0
 .../autoload/go/fillstruct_test.vim           |   0
 .../start}/vim-go-1.19/autoload/go/fmt.vim    |   0
 .../vim-go-1.19/autoload/go/fmt_test.vim      |   0
 .../start}/vim-go-1.19/autoload/go/guru.vim   |   0
 .../vim-go-1.19/autoload/go/guru_test.vim     |   0
 .../autoload/go/highlight_test.vim            |   0
 .../start}/vim-go-1.19/autoload/go/iferr.vim  |   0
 .../start}/vim-go-1.19/autoload/go/impl.vim   |   0
 .../vim-go-1.19/autoload/go/impl_test.vim     |   0
 .../start}/vim-go-1.19/autoload/go/import.vim |   0
 .../vim-go-1.19/autoload/go/indent_test.vim   |   0
 .../start}/vim-go-1.19/autoload/go/issue.vim  |   0
 .../start}/vim-go-1.19/autoload/go/job.vim    |   0
 .../start}/vim-go-1.19/autoload/go/keyify.vim |   0
 .../start}/vim-go-1.19/autoload/go/lint.vim   |   0
 .../vim-go-1.19/autoload/go/lint_test.vim     |   0
 .../start}/vim-go-1.19/autoload/go/list.vim   |   0
 .../start}/vim-go-1.19/autoload/go/mod.vim    |   0
 .../vim-go-1.19/autoload/go/package.vim       |   0
 .../start}/vim-go-1.19/autoload/go/path.vim   |   0
 .../start}/vim-go-1.19/autoload/go/play.vim   |   0
 .../start}/vim-go-1.19/autoload/go/rename.vim |   0
 .../vim-go-1.19/autoload/go/statusline.vim    |   0
 .../start}/vim-go-1.19/autoload/go/tags.vim   |   0
 .../vim-go-1.19/autoload/go/tags_test.vim     |   0
 .../vim-go-1.19/autoload/go/template.vim      |   0
 .../start}/vim-go-1.19/autoload/go/term.vim   |   0
 .../vim-go-1.19/autoload/go/term_test.vim     |   0
 .../autoload/go/test-fixtures/cmd/bad.go      |   0
 .../go/test-fixtures/complete/complete.go     |   0
 .../autoload/go/test-fixtures/def/jump.go     |   0
 .../autoload/go/test-fixtures/fmt/hello.go    |   0
 .../go/test-fixtures/fmt/hello_golden.go      |   0
 .../go/test-fixtures/fmt/imports/goimports.go |   0
 .../fmt/imports/goimports_golden.go           |   0
 .../vendor/gh.com/gi/foo-logging/logger.go    |   0
 .../autoload/go/test-fixtures/fmt/src/imports |   0
 .../go/test-fixtures/lint/src/foo/foo.go      |   0
 .../go/test-fixtures/lint/src/lint/lint.go    |   0
 .../go/test-fixtures/lint/src/lint/quux.go    |   0
 .../go/test-fixtures/lint/src/vet/vet.go      |   0
 .../go/test-fixtures/tags/add_all_golden.go   |   0
 .../go/test-fixtures/tags/add_all_input.go    |   0
 .../test-fixtures/tags/remove_all_golden.go   |   0
 .../go/test-fixtures/tags/remove_all_input.go |   0
 .../autoload/go/test-fixtures/term/term.go    |   0
 .../autoload/go/test-fixtures/test/.gitignore |   0
 .../test/src/compilerror/compilerror.go       |   0
 .../test/src/play/mock/controller.go          |   0
 .../test-fixtures/test/src/play/play_test.go  |   0
 .../test/src/showname/showname_test.go        |   0
 .../testcompilerror/testcompilerror_test.go   |   0
 .../test/src/timeout/timeout_test.go          |   0
 .../test/src/veterror/veterror.go             |   0
 .../start}/vim-go-1.19/autoload/go/test.vim   |   0
 .../vim-go-1.19/autoload/go/test_test.vim     |   0
 .../vim-go-1.19/autoload/go/textobj.vim       |   0
 .../start}/vim-go-1.19/autoload/go/tool.vim   |   0
 .../vim-go-1.19/autoload/go/tool_test.vim     |   0
 .../start}/vim-go-1.19/autoload/go/ui.vim     |   0
 .../start}/vim-go-1.19/autoload/go/util.vim   |   0
 .../start}/vim-go-1.19/autoload/gotest.vim    |   0
 .../autoload/unite/sources/decls.vim          |   0
 .../vim-go/start}/vim-go-1.19/compiler/go.vim |   0
 .../vim-go/start}/vim-go-1.19/doc/vim-go.txt  |   0
 .../vim-go-1.19/ftdetect/gofiletype.vim       |   0
 .../start}/vim-go-1.19/ftplugin/asm.vim       |   0
 .../vim-go/start}/vim-go-1.19/ftplugin/go.vim |   0
 .../vim-go-1.19/ftplugin/go/commands.vim      |   0
 .../vim-go-1.19/ftplugin/go/mappings.vim      |   0
 .../vim-go-1.19/ftplugin/go/snippets.vim      |   0
 .../start}/vim-go-1.19/ftplugin/go/tagbar.vim |   0
 .../vim-go-1.19/ftplugin/gohtmltmpl.vim       |   0
 .../start}/vim-go-1.19/ftplugin/gomod.vim     |   0
 .../vim-go-1.19/ftplugin/gomod/commands.vim   |   0
 .../vim-go-1.19/ftplugin/gomod/mappings.vim   |   0
 .../gosnippets/UltiSnips/go.snippets          |   0
 .../vim-go-1.19/gosnippets/minisnip/_go_eq    |   0
 .../vim-go-1.19/gosnippets/minisnip/_go_err   |   0
 .../vim-go-1.19/gosnippets/minisnip/_go_errt  |   0
 .../vim-go-1.19/gosnippets/minisnip/_go_errw  |   0
 .../vim-go-1.19/gosnippets/minisnip/_go_f     |   0
 .../vim-go-1.19/gosnippets/minisnip/_go_ff    |   0
 .../vim-go-1.19/gosnippets/minisnip/_go_fori  |   0
 .../vim-go-1.19/gosnippets/minisnip/_go_pkg   |   0
 .../vim-go-1.19/gosnippets/minisnip/_go_sp    |   0
 .../vim-go-1.19/gosnippets/minisnip/_go_tt    |   0
 .../vim-go-1.19/gosnippets/snippets/go.snip   |   0
 .../vim-go/start}/vim-go-1.19/indent/go.vim   |   0
 .../start}/vim-go-1.19/indent/gohtmltmpl.vim  |   0
 .../vim-go/start}/vim-go-1.19/plugin/go.vim   |   0
 .../rplugin/python3/denite/source/decls.py    |   0
 .../start}/vim-go-1.19/scripts/bench-syntax   |   0
 .../start}/vim-go-1.19/scripts/docker-test    |   0
 .../start}/vim-go-1.19/scripts/install-vim    |   0
 .../vim-go/start}/vim-go-1.19/scripts/lint    |   0
 .../vim-go/start}/vim-go-1.19/scripts/run-vim |   0
 .../start}/vim-go-1.19/scripts/runbench.vim   |   0
 .../start}/vim-go-1.19/scripts/runtest.vim    |   0
 .../vim-go/start}/vim-go-1.19/scripts/test    |   0
 .../vim-go/start}/vim-go-1.19/syntax/go.vim   |   0
 .../vim-go-1.19/syntax/godebugoutput.vim      |   0
 .../vim-go-1.19/syntax/godebugstacktrace.vim  |   0
 .../vim-go-1.19/syntax/godebugvariables.vim   |   0
 .../start}/vim-go-1.19/syntax/godefstack.vim  |   0
 .../start}/vim-go-1.19/syntax/gohtmltmpl.vim  |   0
 .../start}/vim-go-1.19/syntax/gomod.vim       |   0
 .../start}/vim-go-1.19/syntax/gotexttmpl.vim  |   0
 .../start}/vim-go-1.19/syntax/vimgo.vim       |   0
 .../vim-go-1.19/templates/hello_world.go      |   0
 .../vim-go-1.19/templates/hello_world_test.go |   0
 .../start}/vim-go-1.19/test/gopath_test.vim   |   0
 .../vim-go/start}/vim-go-1.19/test/parse.go   |   0
 .../start}/vim-terraform/.editorconfig        |   0
 .../start}/vim-terraform/.gitignore           |   0
 .../start}/vim-terraform/.travis.yml          |   0
 .../start}/vim-terraform/CHANGELOG.md         |   0
 .../start}/vim-terraform/CODE_OF_CONDUCT.md   |   0
 .../start}/vim-terraform/CONTRIBUTING.md      |   0
 .../start}/vim-terraform/LICENSE              |   0
 .../start}/vim-terraform/Makefile             |   0
 .../start}/vim-terraform/README.md            |   0
 .../vim-terraform/autoload/terraform.vim      |   0
 .../start}/vim-terraform/doc/terraform.txt    |   0
 .../vim-terraform/ftdetect/terraform.vim      |   0
 .../vim-terraform/ftplugin/terraform.vim      |   0
 .../start}/vim-terraform/get_providers.sh     |   0
 .../start}/vim-terraform/indent/terraform.vim |   0
 .../start}/vim-terraform/syntax/terraform.vim |   0
 .../start}/vim-terraform/test/syntax.vader    |   0
 .../vim-terraform/test/terraform_align.vader  |   0
 .../test/terraform_fold_sections.vader        |   0
 .../test/terraform_remap_spacebar.vader       |   0
 .../start}/vim-terraform/update_automagic.sh  |   0
 .../start}/vim-terraform/update_commands.rb   |   0
 .../vim-terraform/update_data_sources.rb      |   0
 .../start}/vim-terraform/update_resources.rb  |   0
 .local/share/overlay-directory                |   1 +
 .tmux.conf                                    |   2 +-
 .vim/autoload/pathogen.vim                    | 264 ----------
 .vim/bundle/vim-bufferline                    |   1 -
 .vim/bundle/vim-commentary                    |   1 -
 .vim/bundle/vim-gnupg                         |   1 -
 .vim/bundle/vim-go-1.19                       |   1 -
 .vim/bundle/vim-javascript                    |   1 -
 .vim/bundle/vim-sensible/README.markdown      |  94 ----
 .vim/bundle/vim-sensible/plugin/sensible.vim  |  88 ----
 .vim/bundle/vim-terraform                     |   1 -
 .vim/pack                                     |   1 +
 218 files changed, 10 insertions(+), 1917 deletions(-)
 delete mode 100644 .config/nvim/autoload/pathogen.vim
 delete mode 100644 .config/nvim/bundle/vim-javascript/ISSUE_TEMPLATE.md
 delete mode 100644 .config/nvim/bundle/vim-javascript/README.md
 delete mode 100644 .config/nvim/bundle/vim-javascript/after/ftplugin/javascript.vim
 delete mode 100644 .config/nvim/bundle/vim-javascript/compiler/eslint.vim
 delete mode 100644 .config/nvim/bundle/vim-javascript/extras/ctags
 delete mode 100644 .config/nvim/bundle/vim-javascript/extras/flow.vim
 delete mode 100644 .config/nvim/bundle/vim-javascript/extras/jsdoc.vim
 delete mode 100644 .config/nvim/bundle/vim-javascript/extras/ngdoc.vim
 delete mode 100644 .config/nvim/bundle/vim-javascript/ftdetect/javascript.vim
 delete mode 100644 .config/nvim/bundle/vim-javascript/indent/javascript.vim
 delete mode 100644 .config/nvim/bundle/vim-javascript/syntax/javascript.vim
 create mode 100644 .local/overlay-directory
 create mode 100644 .local/share/nvim/overlay-directory
 create mode 100644 .local/share/nvim/site/overlay-directory
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-bufferline/start}/vim-bufferline/.gitignore (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-bufferline/start}/vim-bufferline/LICENSE (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-bufferline/start}/vim-bufferline/README.md (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-bufferline/start}/vim-bufferline/autoload/bufferline.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-bufferline/start}/vim-bufferline/autoload/bufferline/algos/fixed_position.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-bufferline/start}/vim-bufferline/doc/bufferline.txt (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-bufferline/start}/vim-bufferline/img/bufferline-command.png (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-bufferline/start}/vim-bufferline/img/bufferline-status.png (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-bufferline/start}/vim-bufferline/plugin/bufferline.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-commentary/start}/vim-commentary/.gitignore (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-commentary/start}/vim-commentary/CONTRIBUTING.markdown (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-commentary/start}/vim-commentary/README.markdown (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-commentary/start}/vim-commentary/doc/commentary.txt (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-commentary/start}/vim-commentary/plugin/commentary.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-gnupg/start}/vim-gnupg/.gitattributes (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-gnupg/start}/vim-gnupg/.gitignore (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-gnupg/start}/vim-gnupg/README.md (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-gnupg/start}/vim-gnupg/autoload/gnupg.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-gnupg/start}/vim-gnupg/doc/gnupg.txt (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-gnupg/start}/vim-gnupg/plugin/gnupg.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/.codecov.yml (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/.coveragerc (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/.dockerignore (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/.editorconfig (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/.github/CONTRIBUTING.md (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/.github/ISSUE_TEMPLATE.md (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/.gitignore (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/.travis.yml (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/.vintrc.yaml (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/CHANGELOG.md (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/Dockerfile (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/LICENSE (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/Makefile (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/README.md (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/addon-info.json (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/assets/vim-go.png (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/assets/vim-go.svg (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/ctrlp/decls.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/fzf/decls.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/alternate.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/asmfmt.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/cmd.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/cmd_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/complete.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/complete_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/config.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/coverage.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/debug.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/decls.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/def.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/def_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/doc.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/fillstruct.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/fillstruct_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/fmt.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/fmt_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/guru.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/guru_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/highlight_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/iferr.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/impl.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/impl_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/import.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/indent_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/issue.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/job.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/keyify.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/lint.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/lint_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/list.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/mod.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/package.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/path.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/play.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/rename.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/statusline.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/tags.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/tags_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/template.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/term.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/term_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/cmd/bad.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/complete/complete.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/def/jump.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/fmt/hello.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/fmt/hello_golden.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/goimports.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/goimports_golden.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/vendor/gh.com/gi/foo-logging/logger.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/fmt/src/imports (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/lint/src/foo/foo.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/lint/src/lint/lint.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/lint/src/lint/quux.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/lint/src/vet/vet.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/tags/add_all_golden.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/tags/add_all_input.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/tags/remove_all_golden.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/tags/remove_all_input.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/term/term.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/test/.gitignore (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/test/src/compilerror/compilerror.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/test/src/play/mock/controller.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/test/src/play/play_test.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/test/src/showname/showname_test.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/test/src/testcompilerror/testcompilerror_test.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/test/src/timeout/timeout_test.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test-fixtures/test/src/veterror/veterror.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/test_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/textobj.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/tool.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/tool_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/ui.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/go/util.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/gotest.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/autoload/unite/sources/decls.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/compiler/go.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/doc/vim-go.txt (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/ftdetect/gofiletype.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/ftplugin/asm.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/ftplugin/go.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/ftplugin/go/commands.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/ftplugin/go/mappings.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/ftplugin/go/snippets.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/ftplugin/go/tagbar.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/ftplugin/gohtmltmpl.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/ftplugin/gomod.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/ftplugin/gomod/commands.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/ftplugin/gomod/mappings.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/gosnippets/UltiSnips/go.snippets (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/gosnippets/minisnip/_go_eq (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/gosnippets/minisnip/_go_err (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/gosnippets/minisnip/_go_errt (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/gosnippets/minisnip/_go_errw (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/gosnippets/minisnip/_go_f (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/gosnippets/minisnip/_go_ff (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/gosnippets/minisnip/_go_fori (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/gosnippets/minisnip/_go_pkg (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/gosnippets/minisnip/_go_sp (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/gosnippets/minisnip/_go_tt (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/gosnippets/snippets/go.snip (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/indent/go.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/indent/gohtmltmpl.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/plugin/go.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/rplugin/python3/denite/source/decls.py (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/scripts/bench-syntax (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/scripts/docker-test (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/scripts/install-vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/scripts/lint (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/scripts/run-vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/scripts/runbench.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/scripts/runtest.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/scripts/test (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/syntax/go.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/syntax/godebugoutput.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/syntax/godebugstacktrace.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/syntax/godebugvariables.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/syntax/godefstack.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/syntax/gohtmltmpl.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/syntax/gomod.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/syntax/gotexttmpl.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/syntax/vimgo.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/templates/hello_world.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/templates/hello_world_test.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/test/gopath_test.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-go/start}/vim-go-1.19/test/parse.go (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/.editorconfig (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/.gitignore (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/.travis.yml (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/CHANGELOG.md (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/CODE_OF_CONDUCT.md (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/CONTRIBUTING.md (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/LICENSE (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/Makefile (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/README.md (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/autoload/terraform.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/doc/terraform.txt (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/ftdetect/terraform.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/ftplugin/terraform.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/get_providers.sh (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/indent/terraform.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/syntax/terraform.vim (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/test/syntax.vader (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/test/terraform_align.vader (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/test/terraform_fold_sections.vader (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/test/terraform_remap_spacebar.vader (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/update_automagic.sh (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/update_commands.rb (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/update_data_sources.rb (100%)
 rename {.config/nvim/bundle => .local/share/nvim/site/pack/vim-terraform/start}/vim-terraform/update_resources.rb (100%)
 create mode 100644 .local/share/overlay-directory
 delete mode 100644 .vim/autoload/pathogen.vim
 delete mode 120000 .vim/bundle/vim-bufferline
 delete mode 120000 .vim/bundle/vim-commentary
 delete mode 120000 .vim/bundle/vim-gnupg
 delete mode 120000 .vim/bundle/vim-go-1.19
 delete mode 120000 .vim/bundle/vim-javascript
 delete mode 100644 .vim/bundle/vim-sensible/README.markdown
 delete mode 100644 .vim/bundle/vim-sensible/plugin/sensible.vim
 delete mode 120000 .vim/bundle/vim-terraform
 create mode 120000 .vim/pack

diff --git a/.config/nvim/autoload/pathogen.vim b/.config/nvim/autoload/pathogen.vim
deleted file mode 100644
index 3582fbf..0000000
--- a/.config/nvim/autoload/pathogen.vim
+++ /dev/null
@@ -1,264 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" 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() 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.
-" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}"
-" on versions of Vim without native package support.
-function! pathogen#infect(...) abort
-  if a:0
-    let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")')
-  else
-    let paths = ['bundle/{}', 'pack/{}/start/{}']
-  endif
-  if has('packages')
-    call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"')
-  endif
-  let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$'
-  for path in filter(copy(paths), 'v:val =~# static')
-    call pathogen#surround(path)
-  endfor
-  for path in filter(copy(paths), 'v:val !~# static')
-    if path =~# '^\%([$~\\/]\|\w:[\\/]\)'
-      call pathogen#surround(path)
-    else
-      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_blacklist or the
-" comma delimited environment variable $VIMBLACKLIST.
-function! pathogen#is_disabled(path) abort
-  if a:path =~# '\~$'
-    return 1
-  endif
-  let sep = pathogen#slash()
-  let blacklist = get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) + pathogen#split($VIMBLACKLIST)
-  if !empty(blacklist)
-    call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
-  endif
-  return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
-endfunction
-
-" 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, ':s?[\\/]\=$??')
-  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
-  let after = a:0 ? a:1 : ''
-  let pattern = substitute(a:pattern, '^[~$][^\/]*', '\=expand(submatch(0))', '')
-  if pattern =~# '{[^{}]\+}'
-    let [pre, pat, post] = split(substitute(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
-  elseif pattern =~# '{}'
-    let pat = matchstr(pattern, '^.*{}[^*]*\%($\|[\\/]\)')
-    let post = pattern[strlen(pat) : -1]
-    let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
-  else
-    let results = [pattern]
-  endif
-  let vf = pathogen#slash() . 'vimfiles'
-  call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
-  return filter(results, '!empty(v:val)')
-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
-
-" 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
-
-" 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
-  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
-
-" 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/.config/nvim/bundle/vim-javascript/ISSUE_TEMPLATE.md b/.config/nvim/bundle/vim-javascript/ISSUE_TEMPLATE.md
deleted file mode 100644
index b1ddccb..0000000
--- a/.config/nvim/bundle/vim-javascript/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,13 +0,0 @@
-*Requisite minimal reproducible example, formatted as plain text :*
-
-<hr>
-
-#### Optional: concerning jsx.
-PLEASE PLEASE PLEASE make sure you have properly
-setup and are sourcing this plugin https://github.com/mxw/vim-jsx
-
-WE DO NOT support JSX automatically, you need another plugin to add get this
-functionality.
-
-Make sure the bug still exists if you disable all other javascript plugins
-except the one noted above, mxw/vim-jsx
diff --git a/.config/nvim/bundle/vim-javascript/README.md b/.config/nvim/bundle/vim-javascript/README.md
deleted file mode 100644
index b9ac49f..0000000
--- a/.config/nvim/bundle/vim-javascript/README.md
+++ /dev/null
@@ -1,119 +0,0 @@
-# vim-javascript
-
-JavaScript bundle for vim, this bundle provides syntax highlighting and
-improved indentation.
-
-
-## Installation
-
-### Install with [pathogen](https://github.com/tpope/vim-pathogen)
-
-      git clone https://github.com/pangloss/vim-javascript.git ~/.vim/bundle/vim-javascript
-
-alternatively, use a package manager like [vim-plug](https://github.com/junegunn/vim-plug)
-
-
-## Configuration Variables
-
-The following variables control certain syntax highlighting plugins. You can
-add them to your `.vimrc` to enable their features.
-
------------------
-
-```
-let g:javascript_plugin_jsdoc = 1
-```
-
-Enables syntax highlighting for [JSDocs](http://usejsdoc.org/).
-
-Default Value: 0
-
------------------
-
-```
-let g:javascript_plugin_ngdoc = 1
-```
-
-Enables some additional syntax highlighting for NGDocs. Requires JSDoc plugin
-to be enabled as well.
-
-Default Value: 0
-
------------------
-
-```
-let g:javascript_plugin_flow = 1
-```
-
-Enables syntax highlighting for [Flow](https://flowtype.org/).
-
-Default Value: 0
-
------------------
-
-```vim
-augroup javascript_folding
-    au!
-    au FileType javascript setlocal foldmethod=syntax
-augroup END
-```
-
-Enables code folding for javascript based on our syntax file.
-
-Please note this can have a dramatic effect on performance.
-
-
-## Concealing Characters
-
-You can customize concealing characters, if your font provides the glyph you want, by defining one or more of the following
-variables:
-
-    let g:javascript_conceal_function             = "ƒ"
-    let g:javascript_conceal_null                 = "ø"
-    let g:javascript_conceal_this                 = "@"
-    let g:javascript_conceal_return               = "⇚"
-    let g:javascript_conceal_undefined            = "¿"
-    let g:javascript_conceal_NaN                  = "ℕ"
-    let g:javascript_conceal_prototype            = "¶"
-    let g:javascript_conceal_static               = "•"
-    let g:javascript_conceal_super                = "Ω"
-    let g:javascript_conceal_arrow_function       = "⇒"
-    let g:javascript_conceal_noarg_arrow_function = "🞅"
-    let g:javascript_conceal_underscore_arrow_function = "🞅"
-
-
-You can enable concealing within VIM with:
-
-    set conceallevel=1
-
-OR if you wish to toggle concealing you may wish to bind a command such as the following which will map `<LEADER>l` (leader is usually the `\` key) to toggling conceal mode:
-
-    map <leader>l :exec &conceallevel ? "set conceallevel=0" : "set conceallevel=1"<CR>
-
-
-## Indentation Specific
-
-* `:h cino-:`
-* `:h cino-=`
-* `:h cino-star`
-* `:h cino-(`
-* `:h cino-w`
-* `:h cino-W`
-* `:h cino-U`
-* `:h cino-m`
-* `:h cino-M`
-* `:h 'indentkeys'`
-
-## Contributing
-
-Please follow the general code style
-guides (read the code) and in your pull request explain the reason for the
-proposed change and how it is valuable. All p.r.'s will be reviewed by a
-maintainer(s) then, hopefully, merged.
-
-Thank you!
-
-
-## License
-
-Distributed under the same terms as Vim itself. See `:help license`.
diff --git a/.config/nvim/bundle/vim-javascript/after/ftplugin/javascript.vim b/.config/nvim/bundle/vim-javascript/after/ftplugin/javascript.vim
deleted file mode 100644
index c6c42d6..0000000
--- a/.config/nvim/bundle/vim-javascript/after/ftplugin/javascript.vim
+++ /dev/null
@@ -1,12 +0,0 @@
-" Vim filetype plugin file
-" Language:     JavaScript
-" Maintainer:   vim-javascript community
-" URL:          https://github.com/pangloss/vim-javascript
-
-setlocal iskeyword+=$ suffixesadd+=.js
-
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<'
-else
-  let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
-endif
diff --git a/.config/nvim/bundle/vim-javascript/compiler/eslint.vim b/.config/nvim/bundle/vim-javascript/compiler/eslint.vim
deleted file mode 100644
index 7695a07..0000000
--- a/.config/nvim/bundle/vim-javascript/compiler/eslint.vim
+++ /dev/null
@@ -1,16 +0,0 @@
-" Vim compiler plugin
-" Language:     JavaScript
-" Maintainer:   vim-javascript community
-" URL:          https://github.com/pangloss/vim-javascript
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "eslint"
-
-if exists(":CompilerSet") != 2
-  command! -nargs=* CompilerSet setlocal <args>
-endif
-
-CompilerSet makeprg=eslint\ -f\ compact\ %
-CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m
diff --git a/.config/nvim/bundle/vim-javascript/extras/ctags b/.config/nvim/bundle/vim-javascript/extras/ctags
deleted file mode 100644
index cdc4edc..0000000
--- a/.config/nvim/bundle/vim-javascript/extras/ctags
+++ /dev/null
@@ -1,8 +0,0 @@
---langdef=js
---langmap=js:.js
---regex-js=/([A-Za-z0-9._$]+)[ \t]*[:=][ \t]*\{/\1/,object/
---regex-js=/([A-Za-z0-9._$()]+)[ \t]*[:=][ \t]*function[ \t]*\(/\1/,function/
---regex-js=/function[ \t]+([A-Za-z0-9._$]+)[ \t]*([^)])/\1/,function/
---regex-js=/([A-Za-z0-9._$]+)[ \t]*[:=][ \t]*\[/\1/,array/
---regex-js=/([^= ]+)[ \t]*=[ \t]*[^"]'[^']*/\1/,string/
---regex-js=/([^= ]+)[ \t]*=[ \t]*[^']"[^"]*/\1/,string/
diff --git a/.config/nvim/bundle/vim-javascript/extras/flow.vim b/.config/nvim/bundle/vim-javascript/extras/flow.vim
deleted file mode 100644
index 7703577..0000000
--- a/.config/nvim/bundle/vim-javascript/extras/flow.vim
+++ /dev/null
@@ -1,107 +0,0 @@
-syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
-syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
-syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster,jsComment fold
-syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster,jsComment fold
-syntax region  jsFlowExactObject    contained matchgroup=jsFlowNoise start=/{|/   end=/|}/       contains=@jsFlowCluster,jsComment fold
-syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster keepend fold
-syntax match   jsFlowNoise          contained /[:;,<>]/
-syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array Function object array bool class
-syntax keyword jsFlowTypeof         contained typeof skipempty skipempty nextgroup=jsFlowTypeCustom,jsFlowType
-syntax match   jsFlowTypeCustom     contained /[0-9a-zA-Z_.]*/ skipwhite skipempty nextgroup=jsFlowGroup
-syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster
-syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/  end=/)\%(\s*=>\)\@=/ oneline skipwhite skipempty nextgroup=jsFlowArrow contains=@jsFlowCluster
-syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens
-syntax match   jsFlowObjectKey      contained /[0-9a-zA-Z_$?]*\(\s*:\)\@=/ contains=jsFunctionKey,jsFlowMaybe skipwhite skipempty nextgroup=jsObjectValue containedin=jsObject
-syntax match   jsFlowOrOperator     contained /|/ skipwhite skipempty nextgroup=@jsFlowCluster
-syntax keyword jsFlowImportType     contained type typeof skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
-syntax match   jsFlowWildcard       contained /*/
-
-syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster,jsFlowArrow,jsFlowReturnParens
-syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp fold
-syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp fold
-syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArrow fold
-syntax match   jsFlowReturnArrow    contained /=>/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
-syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArray
-syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword,jsFlowReturnObject
-syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
-syntax match   jsFlowReturnOrOp     contained /\s*|\s*/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
-syntax match   jsFlowWildcardReturn contained /*/ skipwhite skipempty nextgroup=jsFuncBlock
-
-syntax region  jsFlowFunctionGroup      contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
-syntax region  jsFlowClassGroup         contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
-syntax region  jsFlowClassFunctionGroup contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
-
-syntax region  jsFlowTypeStatement                                   start=/\(opaque\s\+\)\?type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
-syntax region  jsFlowTypeValue      contained     matchgroup=jsFlowNoise start=/=/       end=/[\n;]/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
-syntax match   jsFlowTypeOperator   contained /=/ containedin=jsFlowTypeValue
-syntax match   jsFlowTypeOperator   contained /=/
-syntax keyword jsFlowTypeKeyword    contained type
-
-syntax keyword jsFlowDeclare                  declare skipwhite skipempty nextgroup=jsFlowTypeStatement,jsClassDefinition,jsStorageClass,jsFlowModule,jsFlowInterface
-syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlowClassDef containedin=jsClassBlock
-syntax region  jsFlowClassDef       contained start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassValue
-
-syntax region  jsFlowModule         contained start=/module/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowDeclareBlock contains=jsString
-syntax region  jsFlowInterface      contained start=/interface/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowInterfaceBlock contains=@jsFlowCluster
-syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsFlowDeclare,jsFlowNoise fold
-
-" NOTE: It appears the nextgroup was causing a ton of breakages... testing it
-" witout a nextgroup, but keeping this arround for reference incase something breaks
-" syntax match   jsFlowMaybe          contained /?/ nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments,jsFlowObject,jsFlowReturnObject extend keepend
-syntax match   jsFlowMaybe          contained /?/
-syntax region  jsFlowInterfaceBlock contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend fold
-
-syntax region  jsFlowParenAnnotation contained start=/:/ end=/[,=)]\@=/ containedin=jsParen contains=@jsFlowCluster
-
-syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp,jsFlowWildcardReturn,jsFlowReturnArrow
-syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowExactObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator,jsFlowWildcard
-
-if version >= 508 || !exists("did_javascript_syn_inits")
-  if version < 508
-    let did_javascript_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink jsFlowDefinition         PreProc
-  HiLink jsFlowClassDef           jsFlowDefinition
-  HiLink jsFlowArgumentDef        jsFlowDefinition
-  HiLink jsFlowType               Type
-  HiLink jsFlowTypeCustom         PreProc
-  HiLink jsFlowTypeof             PreProc
-  HiLink jsFlowArray              PreProc
-  HiLink jsFlowObject             PreProc
-  HiLink jsFlowExactObject        PreProc
-  HiLink jsFlowParens             PreProc
-  HiLink jsFlowGroup              PreProc
-  HiLink jsFlowReturn             PreProc
-  HiLink jsFlowParenAnnotation    PreProc
-  HiLink jsFlowReturnObject       jsFlowReturn
-  HiLink jsFlowReturnArray        jsFlowArray
-  HiLink jsFlowReturnParens       jsFlowParens
-  HiLink jsFlowReturnGroup        jsFlowGroup
-  HiLink jsFlowFunctionGroup      PreProc
-  HiLink jsFlowClassGroup         PreProc
-  HiLink jsFlowClassFunctionGroup PreProc
-  HiLink jsFlowArrowArguments     PreProc
-  HiLink jsFlowArrow              PreProc
-  HiLink jsFlowReturnArrow        PreProc
-  HiLink jsFlowTypeStatement      PreProc
-  HiLink jsFlowTypeKeyword        PreProc
-  HiLink jsFlowTypeOperator       Operator
-  HiLink jsFlowMaybe              PreProc
-  HiLink jsFlowReturnMaybe        PreProc
-  HiLink jsFlowClassProperty      jsClassProperty
-  HiLink jsFlowDeclare            PreProc
-  HiLink jsFlowModule             PreProc
-  HiLink jsFlowInterface          PreProc
-  HiLink jsFlowNoise              Noise
-  HiLink jsFlowObjectKey          jsObjectKey
-  HiLink jsFlowOrOperator         jsOperator
-  HiLink jsFlowReturnOrOp         jsFlowOrOperator
-  HiLink jsFlowWildcard           PreProc
-  HiLink jsFlowWildcardReturn     PreProc
-  HiLink jsFlowImportType         PreProc
-  HiLink jsFlowTypeValue          PreProc
-  delcommand HiLink
-endif
diff --git a/.config/nvim/bundle/vim-javascript/extras/jsdoc.vim b/.config/nvim/bundle/vim-javascript/extras/jsdoc.vim
deleted file mode 100644
index b1b588f..0000000
--- a/.config/nvim/bundle/vim-javascript/extras/jsdoc.vim
+++ /dev/null
@@ -1,39 +0,0 @@
-"" syntax coloring for javadoc comments (HTML)
-syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
-
-" tags containing a param
-syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" skipwhite nextgroup=jsDocParam
-" tags containing type and param
-syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\|typedef\)\>" skipwhite nextgroup=jsDocType
-" tags containing type but no param
-syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
-" tags containing references
-syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
-" other tags (no extra syntax)
-syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|async\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inherit[dD]oc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
-
-syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
-syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam
-syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRecord extend
-syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
-syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
-syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.\{-}]\|=\)\+"
-syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
-
-if version >= 508 || !exists("did_javascript_syn_inits")
-  if version < 508
-    let did_javascript_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink jsDocTags              Special
-  HiLink jsDocSeeTag            Function
-  HiLink jsDocType              Type
-  HiLink jsDocTypeBrackets      jsDocType
-  HiLink jsDocTypeRecord        jsDocType
-  HiLink jsDocTypeNoParam       Type
-  HiLink jsDocParam             Label
-  delcommand HiLink
-endif
diff --git a/.config/nvim/bundle/vim-javascript/extras/ngdoc.vim b/.config/nvim/bundle/vim-javascript/extras/ngdoc.vim
deleted file mode 100644
index c513d87..0000000
--- a/.config/nvim/bundle/vim-javascript/extras/ngdoc.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
-syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
-syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
diff --git a/.config/nvim/bundle/vim-javascript/ftdetect/javascript.vim b/.config/nvim/bundle/vim-javascript/ftdetect/javascript.vim
deleted file mode 100644
index 1130f97..0000000
--- a/.config/nvim/bundle/vim-javascript/ftdetect/javascript.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-fun! s:SelectJavascript()
-  if getline(1) =~# '^#!.*/bin/\%(env\s\+\)\?node\>'
-    set ft=javascript
-  endif
-endfun
-
-augroup javascript_syntax_detection
-  autocmd!
-  autocmd BufNewFile,BufRead *.{js,mjs,jsm,es,es6},Jakefile setfiletype javascript
-  autocmd BufNewFile,BufRead * call s:SelectJavascript()
-augroup END
diff --git a/.config/nvim/bundle/vim-javascript/indent/javascript.vim b/.config/nvim/bundle/vim-javascript/indent/javascript.vim
deleted file mode 100644
index d9463d6..0000000
--- a/.config/nvim/bundle/vim-javascript/indent/javascript.vim
+++ /dev/null
@@ -1,475 +0,0 @@
-" Vim indent file
-" Language: Javascript
-" Maintainer: Chris Paul ( https://github.com/bounceme )
-" URL: https://github.com/pangloss/vim-javascript
-" Last Change: December 4, 2017
-
-" Only load this indent file when no other was loaded.
-if exists('b:did_indent')
-  finish
-endif
-let b:did_indent = 1
-
-" Now, set up our indentation expression and keys that trigger it.
-setlocal indentexpr=GetJavascriptIndent()
-setlocal autoindent nolisp nosmartindent
-setlocal indentkeys+=0],0)
-" Testable with something like:
-" vim  -eNs "+filetype plugin indent on" "+syntax on" "+set ft=javascript" \
-"       "+norm! gg=G" '+%print' '+:q!' testfile.js \
-"       | diff -uBZ testfile.js -
-
-let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
-
-" Only define the function once.
-if exists('*GetJavascriptIndent')
-  finish
-endif
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-" indent correctly if inside <script>
-" vim/vim@690afe1 for the switch from cindent
-" overridden with b:html_indent_script1
-call extend(g:,{'html_indent_script1': 'inc'},'keep')
-
-" Regex of syntax group names that are or delimit string or are comments.
-let s:bvars = {
-      \ 'syng_strcom': 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!',
-      \ 'syng_str': 'string\|template\|special' }
-" template strings may want to be excluded when editing graphql:
-" au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
-" au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
-
-function s:GetVars()
-  call extend(b:,extend(s:bvars,{'js_cache': [0,0,0]}),'keep')
-endfunction
-
-" Get shiftwidth value
-if exists('*shiftwidth')
-  function s:sw()
-    return shiftwidth()
-  endfunction
-else
-  function s:sw()
-    return &l:shiftwidth ? &l:shiftwidth : &l:tabstop
-  endfunction
-endif
-
-" Performance for forwards search(): start search at pos rather than masking
-" matches before pos.
-let s:z = has('patch-7.4.984') ? 'z' : ''
-
-" Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "s:SynAt(line('.'),col('.')) =~? b:syng_strcom"
-let s:in_comm = s:skip_expr[:-14] . "'comment\\|doc'"
-
-let s:rel = has('reltime')
-" searchpair() wrapper
-if s:rel
-  function s:GetPair(start,end,flags,skip)
-    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,s:l1,a:skip ==# 's:SkipFunc()' ? 2000 : 200)
-  endfunction
-else
-  function s:GetPair(start,end,flags,skip)
-    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,s:l1)
-  endfunction
-endif
-
-function s:SynAt(l,c)
-  let byte = line2byte(a:l) + a:c - 1
-  let pos = index(s:synid_cache[0], byte)
-  if pos == -1
-    let s:synid_cache[:] += [[byte], [synIDattr(synID(a:l, a:c, 0), 'name')]]
-  endif
-  return s:synid_cache[1][pos]
-endfunction
-
-function s:ParseCino(f)
-  let [s, n, divider] = [strridx(&cino, a:f)+1, '', 0]
-  while s && &cino[ s ] =~ '[^,]'
-    if &cino[ s ] == '.'
-      let divider = 1
-    elseif &cino[ s ] ==# 's'
-      if n !~ '\d'
-        return n . s:sw() + 0
-      endif
-      let n = str2nr(n) * s:sw()
-      break
-    else
-      let [n, divider] .= [&cino[ s ], 0]
-    endif
-    let s += 1
-  endwhile
-  return str2nr(n) / max([divider, 1])
-endfunction
-
-" Optimized {skip} expr, only callable from the search loop which
-" GetJavascriptIndent does to find the containing [[{(] (side-effects)
-function s:SkipFunc()
-  if s:top_col == 1
-    throw 'out of bounds'
-  elseif s:check_in
-    if eval(s:skip_expr)
-      return 1
-    endif
-    let s:check_in = 0
-  elseif getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$'
-    if eval(s:skip_expr)
-      return 1
-    endif
-  elseif search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn)
-    if eval(s:skip_expr)
-      let s:check_in = 1
-      return 1
-    endif
-  else
-    let s:synid_cache[:] += [[line2byte('.') + col('.') - 1], ['']]
-  endif
-  let [s:looksyn, s:top_col] = getpos('.')[1:2]
-endfunction
-
-function s:AlternatePair()
-  let [pat, l:for] = ['[][(){};]', 2]
-  while s:SearchLoop(pat,'bW','s:SkipFunc()')
-    if s:LookingAt() == ';'
-      if !l:for
-        if s:GetPair('{','}','bW','s:SkipFunc()')
-          return
-        endif
-        break
-      else
-        let [pat, l:for] = ['[{}();]', l:for - 1]
-      endif
-    else
-      let idx = stridx('])}',s:LookingAt())
-      if idx == -1
-        return
-      elseif !s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()')
-        break
-      endif
-    endif
-  endwhile
-  throw 'out of bounds'
-endfunction
-
-function s:Nat(int)
-  return a:int * (a:int > 0)
-endfunction
-
-function s:LookingAt()
-  return getline('.')[col('.')-1]
-endfunction
-
-function s:Token()
-  return s:LookingAt() =~ '\k' ? expand('<cword>') : s:LookingAt()
-endfunction
-
-function s:PreviousToken(...)
-  let [l:pos, tok] = [getpos('.'), '']
-  if search('\m\k\{1,}\|\S','ebW')
-    if getline('.')[col('.')-2:col('.')-1] == '*/'
-      if eval(s:in_comm) && !s:SearchLoop('\S\ze\_s*\/[/*]','bW',s:in_comm)
-        call setpos('.',l:pos)
-      else
-        let tok = s:Token()
-      endif
-    else
-      let two = a:0 || line('.') != l:pos[1] ? strridx(getline('.')[:col('.')],'//') + 1 : 0
-      if two && eval(s:in_comm)
-        call cursor(0,two)
-        let tok = s:PreviousToken(1)
-        if tok is ''
-          call setpos('.',l:pos)
-        endif
-      else
-        let tok = s:Token()
-      endif
-    endif
-  endif
-  return tok
-endfunction
-
-function s:Pure(f,...)
-  return eval("[call(a:f,a:000),cursor(a:firstline,".col('.').")][0]")
-endfunction
-
-function s:SearchLoop(pat,flags,expr)
-  return s:GetPair(a:pat,'\_$.',a:flags,a:expr)
-endfunction
-
-function s:ExprCol()
-  if getline('.')[col('.')-2] == ':'
-    return 1
-  endif
-  let bal = 0
-  while s:SearchLoop('[{}?:]','bW',s:skip_expr)
-    if s:LookingAt() == ':'
-      let bal -= !search('\m:\%#','bW')
-    elseif s:LookingAt() == '?'
-      if getline('.')[col('.'):col('.')+1] =~ '^\.\d\@!'
-        " ?. conditional chain, not ternary start
-      elseif !bal
-        return 1
-      else
-        let bal += 1
-      endif
-    elseif s:LookingAt() == '{'
-      return !s:IsBlock()
-    elseif !s:GetPair('{','}','bW',s:skip_expr)
-      break
-    endif
-  endwhile
-endfunction
-
-" configurable regexes that define continuation lines, not including (, {, or [.
-let s:opfirst = '^' . get(g:,'javascript_opfirst',
-      \ '\C\%([<>=,.?^%|/&]\|\([-:+]\)\1\@!\|\*\+\|!=\|in\%(stanceof\)\=\>\)')
-let s:continuation = get(g:,'javascript_continuation',
-      \ '\C\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
-
-function s:Continues()
-  let tok = matchstr(strpart(getline('.'),col('.')-15,15),s:continuation)
-  if tok =~ '[a-z:]'
-    return tok == ':' ? s:ExprCol() : s:PreviousToken() != '.'
-  elseif tok !~ '[/>]'
-    return tok isnot ''
-  endif
-  return s:SynAt(line('.'),col('.')) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
-endfunction
-
-" Check if line 'lnum' has a balanced amount of parentheses.
-function s:Balanced(lnum,line)
-  let l:open = 0
-  let pos = match(a:line, '[][(){}]')
-  while pos != -1
-    if s:SynAt(a:lnum,pos + 1) !~? b:syng_strcom
-      let l:open += matchend(a:line[pos],'[[({]')
-      if l:open < 0
-        return
-      endif
-    endif
-    let pos = match(a:line, !l:open ? '[][(){}]' : '()' =~ a:line[pos] ?
-          \ '[()]' : '{}' =~ a:line[pos] ? '[{}]' : '[][]', pos + 1)
-  endwhile
-  return !l:open
-endfunction
-
-function s:OneScope()
-  if s:LookingAt() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr)
-    let tok = s:PreviousToken()
-    return (count(split('for if let while with'),tok) ||
-          \ tok =~# '^await$\|^each$' && s:PreviousToken() ==# 'for') &&
-          \ s:Pure('s:PreviousToken') != '.' && !(tok == 'while' && s:DoWhile())
-  elseif s:Token() =~# '^else$\|^do$'
-    return s:Pure('s:PreviousToken') != '.'
-  elseif strpart(getline('.'),col('.')-2,2) == '=>'
-    call cursor(0,col('.')-1)
-    return s:PreviousToken() != ')' || s:GetPair('(', ')', 'bW', s:skip_expr)
-  endif
-endfunction
-
-function s:DoWhile()
-  let cpos = searchpos('\m\<','cbW')
-  while s:SearchLoop('\C[{}]\|\<\%(do\|while\)\>','bW',s:skip_expr)
-    if s:LookingAt() =~ '\a'
-      if s:Pure('s:IsBlock')
-        if s:LookingAt() ==# 'd'
-          return 1
-        endif
-        break
-      endif
-    elseif s:LookingAt() != '}' || !s:GetPair('{','}','bW',s:skip_expr)
-      break
-    endif
-  endwhile
-  call call('cursor',cpos)
-endfunction
-
-" returns total offset from braceless contexts. 'num' is the lineNr which
-" encloses the entire context, 'cont' if whether a:firstline is a continued
-" expression, which could have started in a braceless context
-function s:IsContOne(cont)
-  let [l:num, pind] = b:js_cache[1] ?
-        \ [b:js_cache[1], indent(b:js_cache[1]) + s:sw()] : [1,0]
-  let [ind, b_l] = [indent('.') + !a:cont, 0]
-  while line('.') > l:num && ind > pind || line('.') == l:num
-    if indent('.') < ind && s:OneScope()
-      let b_l += 1
-    elseif !a:cont || b_l || ind < indent(a:firstline)
-      break
-    else
-      call cursor(0,1)
-    endif
-    let ind = min([ind, indent('.')])
-    if s:PreviousToken() is ''
-      break
-    endif
-  endwhile
-  return b_l
-endfunction
-
-function s:IsSwitch()
-  return search(printf('\m\C\%%%dl\%%%dc%s',b:js_cache[1],b:js_cache[2],
-        \ '{\_s*\%(\%(\/\/.*\_$\|\/\*\_.\{-}\*\/\)\@>\_s*\)*\%(case\|default\)\>'),'nW'.s:z)
-endfunction
-
-" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
-function s:IsBlock()
-  let tok = s:PreviousToken()
-  if join(s:stack) =~? 'xml\|jsx' && s:SynAt(line('.'),col('.')-1) =~? 'xml\|jsx'
-    let s:in_jsx = 1
-    return tok != '{'
-  elseif tok =~ '\k'
-    if tok ==# 'type'
-      return s:Pure('eval',"s:PreviousToken() !~# '^\\%(im\\|ex\\)port$' || s:PreviousToken() == '.'")
-    elseif tok ==# 'of'
-      return s:Pure('eval',"!s:GetPair('[[({]','[])}]','bW',s:skip_expr) || s:LookingAt() != '(' ||"
-            \ ."s:{s:PreviousToken() ==# 'await' ? 'Previous' : ''}Token() !=# 'for' || s:PreviousToken() == '.'")
-    endif
-    return index(split('return const let import export extends yield default delete var await void typeof throw case new in instanceof')
-          \ ,tok) < (line('.') != a:firstline) || s:Pure('s:PreviousToken') == '.'
-  elseif tok == '>'
-    return getline('.')[col('.')-2] == '=' || s:SynAt(line('.'),col('.')) =~? 'jsflow\|^html'
-  elseif tok == '*'
-    return s:Pure('s:PreviousToken') == ':'
-  elseif tok == ':'
-    return s:Pure('eval',"s:PreviousToken() =~ '^\\K\\k*$' && !s:ExprCol()")
-  elseif tok == '/'
-    return s:SynAt(line('.'),col('.')) =~? 'regex'
-  elseif tok !~ '[=~!<,.?^%|&([]'
-    return tok !~ '[-+]' || line('.') != a:firstline && getline('.')[col('.')-2] == tok
-  endif
-endfunction
-
-function GetJavascriptIndent()
-  call s:GetVars()
-  let s:synid_cache = [[],[]]
-  let l:line = getline(v:lnum)
-  " use synstack as it validates syn state and works in an empty line
-  let s:stack = [''] + map(synstack(v:lnum,1),"synIDattr(v:val,'name')")
-
-  " start with strings,comments,etc.
-  if s:stack[-1] =~? 'comment\|doc'
-    if l:line !~ '^\s*\/[/*]'
-      return l:line =~ '^\s*\*' ? cindent(v:lnum) : -1
-    endif
-  elseif s:stack[-1] =~? b:syng_str
-    if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1,getline(v:lnum-1))
-      let b:js_cache[0] = v:lnum
-    endif
-    return -1
-  endif
-
-  let nest = get(get(b:,'hi_indent',{}),'blocklnr')
-  let s:l1 = max([0, prevnonblank(v:lnum) - (s:rel ? 2000 : 1000), nest])
-  call cursor(v:lnum,1)
-  if s:PreviousToken() is ''
-    return
-  endif
-  let [l:lnum, lcol, pline] = getpos('.')[1:2] + [getline('.')[:col('.')-1]]
-
-  let l:line = substitute(l:line,'^\s*','','')
-  let l:line_s = l:line[0]
-  if l:line[:1] == '/*'
-    let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','')
-  endif
-  if l:line =~ '^\/[/*]'
-    let l:line = ''
-  endif
-
-  " the containing paren, bracket, or curly. Many hacks for performance
-  call cursor(v:lnum,1)
-  let idx = index([']',')','}'],l:line[0])
-  if b:js_cache[0] > l:lnum && b:js_cache[0] < v:lnum ||
-        \ b:js_cache[0] == l:lnum && s:Balanced(l:lnum,pline)
-    call call('cursor',b:js_cache[1:])
-  else
-    let [s:looksyn, s:top_col, s:check_in, s:l1] = [v:lnum - 1,0,0,
-          \ max([s:l1, &smc ? search('\m^.\{'.&smc.',}','nbW',s:l1 + 1) + 1 : 0])]
-    try
-      if idx != -1
-        call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()')
-      elseif getline(v:lnum) !~ '^\S' && s:stack[-1] =~? 'block\|^jsobject$'
-        call s:GetPair('{','}','bW','s:SkipFunc()')
-      else
-        call s:AlternatePair()
-      endif
-    catch /^\Cout of bounds$/
-      call cursor(v:lnum,1)
-    endtry
-    let b:js_cache[1:] = line('.') == v:lnum ? [0,0] : getpos('.')[1:2]
-  endif
-
-  let [b:js_cache[0], num] = [v:lnum, b:js_cache[1]]
-
-  let [num_ind, is_op, b_l, l:switch_offset, s:in_jsx] = [s:Nat(indent(num)),0,0,0,0]
-  if !num || s:LookingAt() == '{' && s:IsBlock()
-    let ilnum = line('.')
-    if num && !s:in_jsx && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr)
-      if ilnum == num
-        let [num, num_ind] = [line('.'), indent('.')]
-      endif
-      if idx == -1 && s:PreviousToken() ==# 'switch' && s:IsSwitch()
-        let l:switch_offset = &cino !~ ':' ? s:sw() : s:ParseCino(':')
-        if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
-          return s:Nat(num_ind + l:switch_offset)
-        elseif &cino =~ '='
-          let l:case_offset = s:ParseCino('=')
-        endif
-      endif
-    endif
-    if idx == -1 && pline[-1:] !~ '[{;]'
-      call cursor(l:lnum, lcol)
-      let sol = matchstr(l:line,s:opfirst)
-      if sol is '' || sol == '/' && s:SynAt(v:lnum,
-            \ 1 + len(getline(v:lnum)) - len(l:line)) =~? 'regex'
-        if s:Continues()
-          let is_op = s:sw()
-        endif
-      elseif num && sol =~# '^\%(in\%(stanceof\)\=\|\*\)$' &&
-            \ s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr) &&
-            \ s:PreviousToken() == ')' && s:GetPair('(',')','bW',s:skip_expr) &&
-            \ (s:PreviousToken() == ']' || s:LookingAt() =~ '\k' &&
-            \ s:{s:PreviousToken() == '*' ? 'Previous' : ''}Token() !=# 'function')
-        return num_ind + s:sw()
-      else
-        let is_op = s:sw()
-      endif
-      call cursor(l:lnum, lcol)
-      let b_l = s:Nat(s:IsContOne(is_op) - (!is_op && l:line =~ '^{')) * s:sw()
-    endif
-  elseif idx == -1 && s:LookingAt() == '(' && &cino =~ '(' &&
-        \ (search('\m\S','nbW',num) || s:ParseCino('U'))
-    let pval = s:ParseCino('(')
-    if !pval
-      let [Wval, vcol] = [s:ParseCino('W'), virtcol('.')]
-      if search('\m'.get(g:,'javascript_indent_W_pat','\S'),'W',num)
-        return s:ParseCino('w') ? vcol : virtcol('.')-1
-      endif
-      return Wval ? s:Nat(num_ind + Wval) : vcol
-    endif
-    return s:Nat(num_ind + pval + searchpair('\m(','','\m)','nbrmW',s:skip_expr,num) * s:sw())
-  endif
-
-  " main return
-  if l:line =~ '^[])}]\|^|}'
-    if l:line_s == ')'
-      if s:ParseCino('M')
-        return indent(l:lnum)
-      elseif num && &cino =~# 'm' && !s:ParseCino('m')
-        return virtcol('.') - 1
-      endif
-    endif
-    return num_ind
-  elseif num
-    return s:Nat(num_ind + get(l:,'case_offset',s:sw()) + l:switch_offset + b_l + is_op)
-  elseif nest
-    return indent(nextnonblank(nest+1)) + b_l + is_op
-  endif
-  return b_l + is_op
-endfunction
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
diff --git a/.config/nvim/bundle/vim-javascript/syntax/javascript.vim b/.config/nvim/bundle/vim-javascript/syntax/javascript.vim
deleted file mode 100644
index 7cebb7e..0000000
--- a/.config/nvim/bundle/vim-javascript/syntax/javascript.vim
+++ /dev/null
@@ -1,391 +0,0 @@
-" Vim syntax file
-" Language:     JavaScript
-" Maintainer:   vim-javascript community
-" URL:          https://github.com/pangloss/vim-javascript
-
-if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
-    finish
-  endif
-  let main_syntax = 'javascript'
-endif
-
-" Dollar sign is permitted anywhere in an identifier
-if (v:version > 704 || v:version == 704 && has('patch1142')) && main_syntax == 'javascript'
-  syntax iskeyword @,48-57,_,192-255,$
-else
-  setlocal iskeyword+=$
-endif
-
-syntax sync fromstart
-" TODO: Figure out what type of casing I need
-" syntax case ignore
-syntax case match
-
-syntax match   jsNoise          /[:,;]/
-syntax match   jsDot            /\./ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall,jsPrototype,jsTaggedTemplate
-syntax match   jsObjectProp     contained /\<\K\k*/
-syntax match   jsFuncCall       /\<\K\k*\ze\s*(/
-syntax match   jsParensError    /[)}\]]/
-
-" Program Keywords
-syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock,jsDestructuringArray,jsVariableDef
-syntax match   jsVariableDef    contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFlowDefinition
-syntax keyword jsOperatorKeyword delete instanceof typeof void new in of skipwhite skipempty nextgroup=@jsExpression
-syntax match   jsOperator       "[-!|&+<>=%/*~^]" skipwhite skipempty nextgroup=@jsExpression
-syntax match   jsOperator       /::/ skipwhite skipempty nextgroup=@jsExpression
-syntax keyword jsBooleanTrue    true
-syntax keyword jsBooleanFalse   false
-
-" Modules
-syntax keyword jsImport                       import skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup,jsFlowImportType
-syntax keyword jsExport                       export skipwhite skipempty nextgroup=@jsAll,jsModuleGroup,jsExportDefault,jsModuleAsterisk,jsModuleKeyword,jsFlowTypeStatement
-syntax match   jsModuleKeyword      contained /\<\K\k*/ skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
-syntax keyword jsExportDefault      contained default skipwhite skipempty nextgroup=@jsExpression
-syntax keyword jsExportDefaultGroup contained default skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
-syntax match   jsModuleAsterisk     contained /\*/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAs,jsFrom
-syntax keyword jsModuleAs           contained as skipwhite skipempty nextgroup=jsModuleKeyword,jsExportDefaultGroup
-syntax keyword jsFrom               contained from skipwhite skipempty nextgroup=jsString
-syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAsterisk,jsModuleGroup,jsFlowTypeKeyword
-
-" Strings, Templates, Numbers
-syntax region  jsString           start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend
-syntax region  jsTemplateString   start=+`+  skip=+\\`+  end=+`+     contains=jsTemplateExpression,jsSpecial,@Spell extend
-syntax match   jsTaggedTemplate   /\<\K\k*\ze`/ nextgroup=jsTemplateString
-syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\x\+\)\>/
-syntax keyword jsNumber           Infinity
-syntax match   jsFloat            /\c\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%(e[+-]\=\d\+\)\=\>/
-
-" Regular Expressions
-syntax match   jsSpecial            contained "\v\\%(x\x\x|u%(\x{4}|\{\x{4,5}})|c\u|.)"
-syntax region  jsTemplateExpression contained matchgroup=jsTemplateBraces start=+${+ end=+}+ contains=@jsExpression keepend
-syntax region  jsRegexpCharClass    contained start=+\[+ skip=+\\.+ end=+\]+ contains=jsSpecial
-syntax match   jsRegexpBoundary     contained "\v\c[$^]|\\b"
-syntax match   jsRegexpBackRef      contained "\v\\[1-9]\d*"
-syntax match   jsRegexpQuantifier   contained "\v[^\\]%([?*+]|\{\d+%(,\d*)?})\??"lc=1
-syntax match   jsRegexpOr           contained "|"
-syntax match   jsRegexpMod          contained "\v\(\?[:=!>]"lc=1
-syntax region  jsRegexpGroup        contained start="[^\\]("lc=1 skip="\\.\|\[\(\\.\|[^]]\+\)\]" end=")" contains=jsRegexpCharClass,@jsRegexpSpecial keepend
-syntax region  jsRegexpString   start=+\%(\%(\<return\|\<typeof\|\_[^)\]'"[:blank:][:alnum:]_$]\)\s*\)\@<=/\ze[^*/]+ skip=+\\.\|\[[^]]\{1,}\]+ end=+/[gimyus]\{,6}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
-syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
-
-" Objects
-syntax match   jsObjectShorthandProp contained /\<\k*\ze\s*/ skipwhite skipempty nextgroup=jsObjectSeparator
-syntax match   jsObjectKey         contained /\<\k*\ze\s*:/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
-syntax region  jsObjectKeyString   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
-syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue,jsFuncArgs extend
-syntax match   jsObjectSeparator   contained /,/
-syntax region  jsObjectValue       contained matchgroup=jsObjectColon start=/:/ end=/[,}]\@=/ contains=@jsExpression extend
-syntax match   jsObjectFuncName    contained /\<\K\k*\ze\_s*(/ skipwhite skipempty nextgroup=jsFuncArgs
-syntax match   jsFunctionKey       contained /\<\K\k*\ze\s*:\s*function\>/
-syntax match   jsObjectMethodType  contained /\<[gs]et\ze\s\+\K\k*/ skipwhite skipempty nextgroup=jsObjectFuncName
-syntax region  jsObjectStringKey   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
-
-exe 'syntax keyword jsNull      null             '.(exists('g:javascript_conceal_null')      ? 'conceal cchar='.g:javascript_conceal_null       : '')
-exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')    ? 'conceal cchar='.g:javascript_conceal_return     : '').' skipwhite nextgroup=@jsExpression'
-exe 'syntax keyword jsUndefined undefined        '.(exists('g:javascript_conceal_undefined') ? 'conceal cchar='.g:javascript_conceal_undefined  : '')
-exe 'syntax keyword jsNan       NaN              '.(exists('g:javascript_conceal_NaN')       ? 'conceal cchar='.g:javascript_conceal_NaN        : '')
-exe 'syntax keyword jsPrototype prototype        '.(exists('g:javascript_conceal_prototype') ? 'conceal cchar='.g:javascript_conceal_prototype  : '')
-exe 'syntax keyword jsThis      this             '.(exists('g:javascript_conceal_this')      ? 'conceal cchar='.g:javascript_conceal_this       : '')
-exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal_super')     ? 'conceal cchar='.g:javascript_conceal_super      : '')
-
-" Statement Keywords
-syntax match   jsBlockLabel              /\<\K\k*\s*::\@!/    contains=jsNoise skipwhite skipempty nextgroup=jsBlock
-syntax match   jsBlockLabelKey contained /\<\K\k*\ze\s*\_[;]/
-syntax keyword jsStatement     contained with yield debugger
-syntax keyword jsStatement     contained break continue skipwhite skipempty nextgroup=jsBlockLabelKey
-syntax keyword jsConditional            if              skipwhite skipempty nextgroup=jsParenIfElse
-syntax keyword jsConditional            else            skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock
-syntax keyword jsConditional            switch          skipwhite skipempty nextgroup=jsParenSwitch
-syntax keyword jsRepeat                 while for       skipwhite skipempty nextgroup=jsParenRepeat,jsForAwait
-syntax keyword jsDo                     do              skipwhite skipempty nextgroup=jsRepeatBlock
-syntax region  jsSwitchCase   contained matchgroup=jsLabel start=/\<\%(case\|default\)\>/ end=/:\@=/ contains=@jsExpression,jsLabel skipwhite skipempty nextgroup=jsSwitchColon keepend
-syntax keyword jsTry                    try             skipwhite skipempty nextgroup=jsTryCatchBlock
-syntax keyword jsFinally      contained finally         skipwhite skipempty nextgroup=jsFinallyBlock
-syntax keyword jsCatch        contained catch           skipwhite skipempty nextgroup=jsParenCatch
-syntax keyword jsException              throw
-syntax keyword jsAsyncKeyword           async await
-syntax match   jsSwitchColon   contained /::\@!/        skipwhite skipempty nextgroup=jsSwitchBlock
-
-" Keywords
-syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set WeakSet RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch
-syntax keyword jsGlobalNodeObjects  module exports global process __dirname __filename
-syntax match   jsGlobalNodeObjects  /\<require\>/ containedin=jsFuncCall
-syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
-syntax keyword jsBuiltins           decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
-" DISCUSS: How imporant is this, really? Perhaps it should be linked to an error because I assume the keywords are reserved?
-syntax keyword jsFutureKeys         abstract enum int short boolean interface byte long char final native synchronized float package throws goto private transient implements protected volatile double public
-
-" DISCUSS: Should we really be matching stuff like this?
-" DOM2 Objects
-syntax keyword jsGlobalObjects  DOMImplementation DocumentFragment Document Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction
-syntax keyword jsExceptions     DOMException
-
-" DISCUSS: Should we really be matching stuff like this?
-" DOM2 CONSTANT
-syntax keyword jsDomErrNo       INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR
-syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE
-
-" DISCUSS: Should we really be special matching on these props?
-" HTML events and internal variables
-syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
-
-" Code blocks
-syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression,jsSpreadExpression extend fold
-syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsExpression extend fold nextgroup=jsFlowDefinition
-syntax region  jsParenDecorator     contained matchgroup=jsParensDecorator     start=/(/  end=/)/  contains=@jsAll extend fold
-syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock extend fold
-syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentRepeat,jsRepeatBlock extend fold
-syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
-syntax region  jsParenCatch         contained matchgroup=jsParensCatch         start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
-syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsDestructuringArray,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
-syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsAsyncKeyword,jsNoise extend fold
-syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
-syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
-syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      start=/{/  end=/}/  contains=@jsAll,jsBlock skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
-syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
-syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock,jsSwitchCase extend fold
-syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
-syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment nextgroup=jsFlowDefinition extend fold
-syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment nextgroup=jsFlowDefinition extend fold
-syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
-syntax region  jsBlock                        matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
-syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold
-syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
-syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
-syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|}\@=\)/  contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression
-syntax match   jsOperator       /?\.\ze\_D/
-
-syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs,jsFlowFunctionGroup
-syntax match   jsFuncName             contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowFunctionGroup
-syntax region  jsFuncArgExpression    contained matchgroup=jsFuncArgOperator start=/=/ end=/[,)]\@=/ contains=@jsExpression extend
-syntax match   jsFuncArgCommas        contained ','
-syntax keyword jsArguments            contained arguments
-syntax keyword jsForAwait             contained await skipwhite skipempty nextgroup=jsParenRepeat
-
-" Matches a single keyword argument with no parens
-syntax match   jsArrowFuncArgs  /\<\K\k*\ze\s*=>/ skipwhite contains=jsFuncArgs skipwhite skipempty nextgroup=jsArrowFunction extend
-" Matches a series of arguments surrounded in parens
-syntax match   jsArrowFuncArgs  /([^()]*)\ze\s*=>/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
-
-exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs,jsFlowFunctionGroup skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
-exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction                                   '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
-exe 'syntax match jsArrowFunction /()\ze\s*=>/   skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '')
-exe 'syntax match jsArrowFunction /_\ze\s*=>/    skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
-
-" Classes
-syntax keyword jsClassKeyword           contained class
-syntax keyword jsExtendsKeyword         contained extends skipwhite skipempty nextgroup=@jsExpression
-syntax match   jsClassNoise             contained /\./
-syntax match   jsClassFuncName          contained /\<\K\k*\ze\s*[(<]/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowClassFunctionGroup
-syntax match   jsClassMethodType        contained /\<\%([gs]et\|static\)\ze\s\+\K\k*/ skipwhite skipempty nextgroup=jsAsyncKeyword,jsClassFuncName,jsClassProperty
-syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression,jsFlowClassGroup skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
-syntax match   jsClassProperty          contained /\<\K\k*\ze\s*=/ skipwhite skipempty nextgroup=jsClassValue,jsFlowClassDef
-syntax region  jsClassValue             contained start=/=/ end=/\_[;}]\@=/ contains=@jsExpression
-syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
-syntax region  jsClassStringKey         contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
-
-" Destructuring
-syntax match   jsDestructuringPropertyValue     contained /\k\+/
-syntax match   jsDestructuringProperty          contained /\k\+\ze\s*=/ skipwhite skipempty nextgroup=jsDestructuringValue
-syntax match   jsDestructuringAssignment        contained /\k\+\ze\s*:/ skipwhite skipempty nextgroup=jsDestructuringValueAssignment
-syntax region  jsDestructuringValue             contained start=/=/ end=/[,}\]]\@=/ contains=@jsExpression extend
-syntax region  jsDestructuringValueAssignment   contained start=/:/ end=/[,}=]\@=/ contains=jsDestructuringPropertyValue,jsDestructuringBlock,jsNoise,jsDestructuringNoise skipwhite skipempty nextgroup=jsDestructuringValue extend
-syntax match   jsDestructuringNoise             contained /[,[\]]/
-syntax region  jsDestructuringPropertyComputed  contained matchgroup=jsDestructuringBraces start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsDestructuringValue,jsDestructuringValueAssignment,jsDestructuringNoise extend fold
-
-" Comments
-syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
-syntax region  jsComment        start=+//+ end=/$/ contains=jsCommentTodo,@Spell extend keepend
-syntax region  jsComment        start=+/\*+  end=+\*/+ contains=jsCommentTodo,@Spell fold extend keepend
-syntax region  jsEnvComment     start=/\%^#!/ end=/$/ display
-
-" Specialized Comments - These are special comment regexes that are used in
-" odd places that maintain the proper nextgroup functionality. It sucks we
-" can't make jsComment a skippable type of group for nextgroup
-syntax region  jsCommentFunction    contained start=+//+ end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn extend keepend
-syntax region  jsCommentFunction    contained start=+/\*+ end=+\*/+ contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn fold extend keepend
-syntax region  jsCommentClass       contained start=+//+ end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClassGroup extend keepend
-syntax region  jsCommentClass       contained start=+/\*+ end=+\*/+ contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClassGroup fold extend keepend
-syntax region  jsCommentIfElse      contained start=+//+ end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsIfElseBlock extend keepend
-syntax region  jsCommentIfElse      contained start=+/\*+ end=+\*/+ contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsIfElseBlock fold extend keepend
-syntax region  jsCommentRepeat      contained start=+//+ end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsRepeatBlock extend keepend
-syntax region  jsCommentRepeat      contained start=+/\*+ end=+\*/+ contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsRepeatBlock fold extend keepend
-
-" Decorators
-syntax match   jsDecorator                    /^\s*@/ nextgroup=jsDecoratorFunction
-syntax match   jsDecoratorFunction  contained /\h[a-zA-Z0-9_.]*/ nextgroup=jsParenDecorator
-
-if exists("javascript_plugin_jsdoc")
-  runtime extras/jsdoc.vim
-  " NGDoc requires JSDoc
-  if exists("javascript_plugin_ngdoc")
-    runtime extras/ngdoc.vim
-  endif
-endif
-
-if exists("javascript_plugin_flow")
-  runtime extras/flow.vim
-endif
-
-syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsOperatorKeyword,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait,jsAsyncKeyword,jsStatement,jsDot
-syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsException,jsTry,jsNoise,jsBlockLabel
-
-" 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_javascript_syn_inits")
-  if version < 508
-    let did_javascript_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink jsComment              Comment
-  HiLink jsEnvComment           PreProc
-  HiLink jsParensIfElse         jsParens
-  HiLink jsParensRepeat         jsParens
-  HiLink jsParensSwitch         jsParens
-  HiLink jsParensCatch          jsParens
-  HiLink jsCommentTodo          Todo
-  HiLink jsString               String
-  HiLink jsObjectKeyString      String
-  HiLink jsTemplateString       String
-  HiLink jsObjectStringKey      String
-  HiLink jsClassStringKey       String
-  HiLink jsTaggedTemplate       StorageClass
-  HiLink jsTernaryIfOperator    Operator
-  HiLink jsRegexpString         String
-  HiLink jsRegexpBoundary       SpecialChar
-  HiLink jsRegexpQuantifier     SpecialChar
-  HiLink jsRegexpOr             Conditional
-  HiLink jsRegexpMod            SpecialChar
-  HiLink jsRegexpBackRef        SpecialChar
-  HiLink jsRegexpGroup          jsRegexpString
-  HiLink jsRegexpCharClass      Character
-  HiLink jsCharacter            Character
-  HiLink jsPrototype            Special
-  HiLink jsConditional          Conditional
-  HiLink jsBranch               Conditional
-  HiLink jsLabel                Label
-  HiLink jsReturn               Statement
-  HiLink jsRepeat               Repeat
-  HiLink jsDo                   Repeat
-  HiLink jsStatement            Statement
-  HiLink jsException            Exception
-  HiLink jsTry                  Exception
-  HiLink jsFinally              Exception
-  HiLink jsCatch                Exception
-  HiLink jsAsyncKeyword         Keyword
-  HiLink jsForAwait             Keyword
-  HiLink jsArrowFunction        Type
-  HiLink jsFunction             Type
-  HiLink jsGenerator            jsFunction
-  HiLink jsArrowFuncArgs        jsFuncArgs
-  HiLink jsFuncName             Function
-  HiLink jsFuncCall             Function
-  HiLink jsClassFuncName        jsFuncName
-  HiLink jsObjectFuncName       Function
-  HiLink jsArguments            Special
-  HiLink jsError                Error
-  HiLink jsParensError          Error
-  HiLink jsOperatorKeyword      jsOperator
-  HiLink jsOperator             Operator
-  HiLink jsOf                   Operator
-  HiLink jsStorageClass         StorageClass
-  HiLink jsClassKeyword         Keyword
-  HiLink jsExtendsKeyword       Keyword
-  HiLink jsThis                 Special
-  HiLink jsSuper                Constant
-  HiLink jsNan                  Number
-  HiLink jsNull                 Type
-  HiLink jsUndefined            Type
-  HiLink jsNumber               Number
-  HiLink jsFloat                Float
-  HiLink jsBooleanTrue          Boolean
-  HiLink jsBooleanFalse         Boolean
-  HiLink jsObjectColon          jsNoise
-  HiLink jsNoise                Noise
-  HiLink jsDot                  Noise
-  HiLink jsBrackets             Noise
-  HiLink jsParens               Noise
-  HiLink jsBraces               Noise
-  HiLink jsFuncBraces           Noise
-  HiLink jsFuncParens           Noise
-  HiLink jsClassBraces          Noise
-  HiLink jsClassNoise           Noise
-  HiLink jsIfElseBraces         Noise
-  HiLink jsTryCatchBraces       Noise
-  HiLink jsModuleBraces         Noise
-  HiLink jsObjectBraces         Noise
-  HiLink jsObjectSeparator      Noise
-  HiLink jsFinallyBraces        Noise
-  HiLink jsRepeatBraces         Noise
-  HiLink jsSwitchBraces         Noise
-  HiLink jsSpecial              Special
-  HiLink jsTemplateBraces       Noise
-  HiLink jsGlobalObjects        Constant
-  HiLink jsGlobalNodeObjects    Constant
-  HiLink jsExceptions           Constant
-  HiLink jsBuiltins             Constant
-  HiLink jsImport               Include
-  HiLink jsExport               Include
-  HiLink jsExportDefault        StorageClass
-  HiLink jsExportDefaultGroup   jsExportDefault
-  HiLink jsModuleAs             Include
-  HiLink jsModuleComma          jsNoise
-  HiLink jsModuleAsterisk       Noise
-  HiLink jsFrom                 Include
-  HiLink jsDecorator            Special
-  HiLink jsDecoratorFunction    Function
-  HiLink jsParensDecorator      jsParens
-  HiLink jsFuncArgOperator      jsFuncArgs
-  HiLink jsClassProperty        jsObjectKey
-  HiLink jsObjectShorthandProp  jsObjectKey
-  HiLink jsSpreadOperator       Operator
-  HiLink jsRestOperator         Operator
-  HiLink jsRestExpression       jsFuncArgs
-  HiLink jsSwitchColon          Noise
-  HiLink jsClassMethodType      Type
-  HiLink jsObjectMethodType     Type
-  HiLink jsClassDefinition      jsFuncName
-  HiLink jsBlockLabel           Identifier
-  HiLink jsBlockLabelKey        jsBlockLabel
-
-  HiLink jsDestructuringBraces     Noise
-  HiLink jsDestructuringProperty   jsFuncArgs
-  HiLink jsDestructuringAssignment jsObjectKey
-  HiLink jsDestructuringNoise      Noise
-
-  HiLink jsCommentFunction      jsComment
-  HiLink jsCommentClass         jsComment
-  HiLink jsCommentIfElse        jsComment
-  HiLink jsCommentRepeat        jsComment
-
-  HiLink jsDomErrNo             Constant
-  HiLink jsDomNodeConsts        Constant
-  HiLink jsDomElemAttrs         Label
-  HiLink jsDomElemFuncs         PreProc
-
-  HiLink jsHtmlEvents           Special
-  HiLink jsHtmlElemAttrs        Label
-  HiLink jsHtmlElemFuncs        PreProc
-
-  HiLink jsCssStyles            Label
-
-  delcommand HiLink
-endif
-
-" Define the htmlJavaScript for HTML syntax html.vim
-syntax cluster  htmlJavaScript       contains=@jsAll,jsImport,jsExport
-syntax cluster  javaScriptExpression contains=@jsAll
-
-" Vim's default html.vim highlights all javascript as 'Special'
-hi! def link javaScript              NONE
-
-let b:current_syntax = "javascript"
-if main_syntax == 'javascript'
-  unlet main_syntax
-endif
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 6154ad0..d9422c1 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,23 +1,22 @@
-execute pathogen#infect()
 filetype plugin on
-
 set hlsearch
 set modelines=10
 set textwidth=79
 set mouse=
+set undofile
 
 if has('nvim')
   set termguicolors
   hi Visual guifg=white guibg=Grey term=reverse cterm=reverse
   " if on a light background, set this:
   "set background=light
+  set undodir=~/.nvimundo
 else
+  syntax on
   hi Visual term=reverse cterm=reverse
+  set undodir=~/.vimundo
 endif
 
-set undofile
-set undodir=~/.vimundo
-
 " toggle between tabs and spaces
 function! ChangeIndent()
   if &expandtab
@@ -86,7 +85,6 @@ let g:terraform_fmt_on_save=1
 " Formatting options
 " ============================================================================
 autocmd FileType python let g:formatCmd="yapf"
-" autocmd FileType python let g:formatCmd="yapf3"
 autocmd FileType json let g:formatCmd="python -m json.tool"
 autocmd FileType json execute Indent4Spaces()
 autocmd FileType rust let g:formatCmd="rustfmt"
diff --git a/.local/overlay-directory b/.local/overlay-directory
new file mode 100644
index 0000000..6862469
--- /dev/null
+++ b/.local/overlay-directory
@@ -0,0 +1 @@
+This file tells deploy.sh not to link directly to this directory.
diff --git a/.local/share/nvim/overlay-directory b/.local/share/nvim/overlay-directory
new file mode 100644
index 0000000..6862469
--- /dev/null
+++ b/.local/share/nvim/overlay-directory
@@ -0,0 +1 @@
+This file tells deploy.sh not to link directly to this directory.
diff --git a/.local/share/nvim/site/overlay-directory b/.local/share/nvim/site/overlay-directory
new file mode 100644
index 0000000..6862469
--- /dev/null
+++ b/.local/share/nvim/site/overlay-directory
@@ -0,0 +1 @@
+This file tells deploy.sh not to link directly to this directory.
diff --git a/.config/nvim/bundle/vim-bufferline/.gitignore b/.local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/.gitignore
similarity index 100%
rename from .config/nvim/bundle/vim-bufferline/.gitignore
rename to .local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/.gitignore
diff --git a/.config/nvim/bundle/vim-bufferline/LICENSE b/.local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/LICENSE
similarity index 100%
rename from .config/nvim/bundle/vim-bufferline/LICENSE
rename to .local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/LICENSE
diff --git a/.config/nvim/bundle/vim-bufferline/README.md b/.local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/README.md
similarity index 100%
rename from .config/nvim/bundle/vim-bufferline/README.md
rename to .local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/README.md
diff --git a/.config/nvim/bundle/vim-bufferline/autoload/bufferline.vim b/.local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/autoload/bufferline.vim
similarity index 100%
rename from .config/nvim/bundle/vim-bufferline/autoload/bufferline.vim
rename to .local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/autoload/bufferline.vim
diff --git a/.config/nvim/bundle/vim-bufferline/autoload/bufferline/algos/fixed_position.vim b/.local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/autoload/bufferline/algos/fixed_position.vim
similarity index 100%
rename from .config/nvim/bundle/vim-bufferline/autoload/bufferline/algos/fixed_position.vim
rename to .local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/autoload/bufferline/algos/fixed_position.vim
diff --git a/.config/nvim/bundle/vim-bufferline/doc/bufferline.txt b/.local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/doc/bufferline.txt
similarity index 100%
rename from .config/nvim/bundle/vim-bufferline/doc/bufferline.txt
rename to .local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/doc/bufferline.txt
diff --git a/.config/nvim/bundle/vim-bufferline/img/bufferline-command.png b/.local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/img/bufferline-command.png
similarity index 100%
rename from .config/nvim/bundle/vim-bufferline/img/bufferline-command.png
rename to .local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/img/bufferline-command.png
diff --git a/.config/nvim/bundle/vim-bufferline/img/bufferline-status.png b/.local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/img/bufferline-status.png
similarity index 100%
rename from .config/nvim/bundle/vim-bufferline/img/bufferline-status.png
rename to .local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/img/bufferline-status.png
diff --git a/.config/nvim/bundle/vim-bufferline/plugin/bufferline.vim b/.local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/plugin/bufferline.vim
similarity index 100%
rename from .config/nvim/bundle/vim-bufferline/plugin/bufferline.vim
rename to .local/share/nvim/site/pack/vim-bufferline/start/vim-bufferline/plugin/bufferline.vim
diff --git a/.config/nvim/bundle/vim-commentary/.gitignore b/.local/share/nvim/site/pack/vim-commentary/start/vim-commentary/.gitignore
similarity index 100%
rename from .config/nvim/bundle/vim-commentary/.gitignore
rename to .local/share/nvim/site/pack/vim-commentary/start/vim-commentary/.gitignore
diff --git a/.config/nvim/bundle/vim-commentary/CONTRIBUTING.markdown b/.local/share/nvim/site/pack/vim-commentary/start/vim-commentary/CONTRIBUTING.markdown
similarity index 100%
rename from .config/nvim/bundle/vim-commentary/CONTRIBUTING.markdown
rename to .local/share/nvim/site/pack/vim-commentary/start/vim-commentary/CONTRIBUTING.markdown
diff --git a/.config/nvim/bundle/vim-commentary/README.markdown b/.local/share/nvim/site/pack/vim-commentary/start/vim-commentary/README.markdown
similarity index 100%
rename from .config/nvim/bundle/vim-commentary/README.markdown
rename to .local/share/nvim/site/pack/vim-commentary/start/vim-commentary/README.markdown
diff --git a/.config/nvim/bundle/vim-commentary/doc/commentary.txt b/.local/share/nvim/site/pack/vim-commentary/start/vim-commentary/doc/commentary.txt
similarity index 100%
rename from .config/nvim/bundle/vim-commentary/doc/commentary.txt
rename to .local/share/nvim/site/pack/vim-commentary/start/vim-commentary/doc/commentary.txt
diff --git a/.config/nvim/bundle/vim-commentary/plugin/commentary.vim b/.local/share/nvim/site/pack/vim-commentary/start/vim-commentary/plugin/commentary.vim
similarity index 100%
rename from .config/nvim/bundle/vim-commentary/plugin/commentary.vim
rename to .local/share/nvim/site/pack/vim-commentary/start/vim-commentary/plugin/commentary.vim
diff --git a/.config/nvim/bundle/vim-gnupg/.gitattributes b/.local/share/nvim/site/pack/vim-gnupg/start/vim-gnupg/.gitattributes
similarity index 100%
rename from .config/nvim/bundle/vim-gnupg/.gitattributes
rename to .local/share/nvim/site/pack/vim-gnupg/start/vim-gnupg/.gitattributes
diff --git a/.config/nvim/bundle/vim-gnupg/.gitignore b/.local/share/nvim/site/pack/vim-gnupg/start/vim-gnupg/.gitignore
similarity index 100%
rename from .config/nvim/bundle/vim-gnupg/.gitignore
rename to .local/share/nvim/site/pack/vim-gnupg/start/vim-gnupg/.gitignore
diff --git a/.config/nvim/bundle/vim-gnupg/README.md b/.local/share/nvim/site/pack/vim-gnupg/start/vim-gnupg/README.md
similarity index 100%
rename from .config/nvim/bundle/vim-gnupg/README.md
rename to .local/share/nvim/site/pack/vim-gnupg/start/vim-gnupg/README.md
diff --git a/.config/nvim/bundle/vim-gnupg/autoload/gnupg.vim b/.local/share/nvim/site/pack/vim-gnupg/start/vim-gnupg/autoload/gnupg.vim
similarity index 100%
rename from .config/nvim/bundle/vim-gnupg/autoload/gnupg.vim
rename to .local/share/nvim/site/pack/vim-gnupg/start/vim-gnupg/autoload/gnupg.vim
diff --git a/.config/nvim/bundle/vim-gnupg/doc/gnupg.txt b/.local/share/nvim/site/pack/vim-gnupg/start/vim-gnupg/doc/gnupg.txt
similarity index 100%
rename from .config/nvim/bundle/vim-gnupg/doc/gnupg.txt
rename to .local/share/nvim/site/pack/vim-gnupg/start/vim-gnupg/doc/gnupg.txt
diff --git a/.config/nvim/bundle/vim-gnupg/plugin/gnupg.vim b/.local/share/nvim/site/pack/vim-gnupg/start/vim-gnupg/plugin/gnupg.vim
similarity index 100%
rename from .config/nvim/bundle/vim-gnupg/plugin/gnupg.vim
rename to .local/share/nvim/site/pack/vim-gnupg/start/vim-gnupg/plugin/gnupg.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/.codecov.yml b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.codecov.yml
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/.codecov.yml
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.codecov.yml
diff --git a/.config/nvim/bundle/vim-go-1.19/.coveragerc b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.coveragerc
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/.coveragerc
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.coveragerc
diff --git a/.config/nvim/bundle/vim-go-1.19/.dockerignore b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.dockerignore
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/.dockerignore
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.dockerignore
diff --git a/.config/nvim/bundle/vim-go-1.19/.editorconfig b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.editorconfig
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/.editorconfig
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.editorconfig
diff --git a/.config/nvim/bundle/vim-go-1.19/.github/CONTRIBUTING.md b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.github/CONTRIBUTING.md
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/.github/CONTRIBUTING.md
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.github/CONTRIBUTING.md
diff --git a/.config/nvim/bundle/vim-go-1.19/.github/ISSUE_TEMPLATE.md b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/.github/ISSUE_TEMPLATE.md
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.github/ISSUE_TEMPLATE.md
diff --git a/.config/nvim/bundle/vim-go-1.19/.gitignore b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.gitignore
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/.gitignore
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.gitignore
diff --git a/.config/nvim/bundle/vim-go-1.19/.travis.yml b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.travis.yml
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/.travis.yml
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.travis.yml
diff --git a/.config/nvim/bundle/vim-go-1.19/.vintrc.yaml b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.vintrc.yaml
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/.vintrc.yaml
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/.vintrc.yaml
diff --git a/.config/nvim/bundle/vim-go-1.19/CHANGELOG.md b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/CHANGELOG.md
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/CHANGELOG.md
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/CHANGELOG.md
diff --git a/.config/nvim/bundle/vim-go-1.19/Dockerfile b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/Dockerfile
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/Dockerfile
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/Dockerfile
diff --git a/.config/nvim/bundle/vim-go-1.19/LICENSE b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/LICENSE
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/LICENSE
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/LICENSE
diff --git a/.config/nvim/bundle/vim-go-1.19/Makefile b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/Makefile
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/Makefile
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/Makefile
diff --git a/.config/nvim/bundle/vim-go-1.19/README.md b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/README.md
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/README.md
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/README.md
diff --git a/.config/nvim/bundle/vim-go-1.19/addon-info.json b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/addon-info.json
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/addon-info.json
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/addon-info.json
diff --git a/.config/nvim/bundle/vim-go-1.19/assets/vim-go.png b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/assets/vim-go.png
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/assets/vim-go.png
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/assets/vim-go.png
diff --git a/.config/nvim/bundle/vim-go-1.19/assets/vim-go.svg b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/assets/vim-go.svg
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/assets/vim-go.svg
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/assets/vim-go.svg
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/ctrlp/decls.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/ctrlp/decls.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/ctrlp/decls.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/ctrlp/decls.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/fzf/decls.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/fzf/decls.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/fzf/decls.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/fzf/decls.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/alternate.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/alternate.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/alternate.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/alternate.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/asmfmt.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/asmfmt.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/asmfmt.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/asmfmt.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/cmd.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/cmd.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/cmd.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/cmd.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/cmd_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/cmd_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/cmd_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/cmd_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/complete.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/complete.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/complete.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/complete.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/complete_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/complete_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/complete_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/complete_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/config.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/config.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/config.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/config.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/coverage.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/coverage.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/coverage.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/coverage.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/debug.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/debug.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/debug.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/debug.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/decls.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/decls.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/decls.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/decls.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/def.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/def.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/def.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/def.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/def_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/def_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/def_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/def_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/doc.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/doc.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/doc.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/doc.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/fillstruct.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/fillstruct.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/fillstruct.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/fillstruct.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/fillstruct_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/fillstruct_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/fillstruct_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/fillstruct_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/fmt.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/fmt.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/fmt.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/fmt.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/fmt_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/fmt_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/fmt_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/fmt_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/guru.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/guru.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/guru.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/guru.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/guru_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/guru_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/guru_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/guru_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/highlight_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/highlight_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/highlight_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/highlight_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/iferr.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/iferr.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/iferr.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/iferr.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/impl.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/impl.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/impl.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/impl.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/impl_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/impl_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/impl_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/impl_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/import.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/import.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/import.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/import.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/indent_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/indent_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/indent_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/indent_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/issue.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/issue.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/issue.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/issue.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/job.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/job.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/job.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/job.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/keyify.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/keyify.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/keyify.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/keyify.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/lint.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/lint.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/lint.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/lint.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/lint_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/lint_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/lint_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/lint_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/list.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/list.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/list.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/list.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/mod.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/mod.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/mod.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/mod.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/package.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/package.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/package.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/package.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/path.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/path.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/path.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/path.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/play.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/play.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/play.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/play.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/rename.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/rename.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/rename.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/rename.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/statusline.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/statusline.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/statusline.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/statusline.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/tags.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/tags.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/tags.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/tags.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/tags_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/tags_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/tags_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/tags_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/template.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/template.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/template.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/template.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/term.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/term.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/term.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/term.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/term_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/term_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/term_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/term_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/cmd/bad.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/cmd/bad.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/cmd/bad.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/cmd/bad.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/complete/complete.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/complete/complete.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/complete/complete.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/complete/complete.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/def/jump.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/def/jump.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/def/jump.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/def/jump.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/fmt/hello.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/fmt/hello.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/fmt/hello.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/fmt/hello.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/fmt/hello_golden.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/fmt/hello_golden.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/fmt/hello_golden.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/fmt/hello_golden.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/goimports.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/goimports.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/goimports.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/goimports.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/goimports_golden.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/goimports_golden.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/goimports_golden.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/goimports_golden.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/vendor/gh.com/gi/foo-logging/logger.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/vendor/gh.com/gi/foo-logging/logger.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/vendor/gh.com/gi/foo-logging/logger.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/fmt/imports/vendor/gh.com/gi/foo-logging/logger.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/fmt/src/imports b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/fmt/src/imports
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/fmt/src/imports
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/fmt/src/imports
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/lint/src/foo/foo.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/lint/src/foo/foo.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/lint/src/foo/foo.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/lint/src/foo/foo.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/lint/src/lint/lint.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/lint/src/lint/lint.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/lint/src/lint/lint.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/lint/src/lint/lint.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/lint/src/lint/quux.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/lint/src/lint/quux.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/lint/src/lint/quux.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/lint/src/lint/quux.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/lint/src/vet/vet.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/lint/src/vet/vet.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/lint/src/vet/vet.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/lint/src/vet/vet.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/tags/add_all_golden.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/tags/add_all_golden.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/tags/add_all_golden.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/tags/add_all_golden.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/tags/add_all_input.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/tags/add_all_input.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/tags/add_all_input.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/tags/add_all_input.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/tags/remove_all_golden.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/tags/remove_all_golden.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/tags/remove_all_golden.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/tags/remove_all_golden.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/tags/remove_all_input.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/tags/remove_all_input.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/tags/remove_all_input.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/tags/remove_all_input.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/term/term.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/term/term.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/term/term.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/term/term.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/.gitignore b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/.gitignore
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/.gitignore
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/.gitignore
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/compilerror/compilerror.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/compilerror/compilerror.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/compilerror/compilerror.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/compilerror/compilerror.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/play/mock/controller.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/play/mock/controller.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/play/mock/controller.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/play/mock/controller.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/play/play_test.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/play/play_test.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/play/play_test.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/play/play_test.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/showname/showname_test.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/showname/showname_test.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/showname/showname_test.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/showname/showname_test.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/testcompilerror/testcompilerror_test.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/testcompilerror/testcompilerror_test.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/testcompilerror/testcompilerror_test.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/testcompilerror/testcompilerror_test.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/timeout/timeout_test.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/timeout/timeout_test.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/timeout/timeout_test.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/timeout/timeout_test.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/veterror/veterror.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/veterror/veterror.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test-fixtures/test/src/veterror/veterror.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test-fixtures/test/src/veterror/veterror.go
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/test_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/test_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/test_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/textobj.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/textobj.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/textobj.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/textobj.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/tool.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/tool.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/tool.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/tool.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/tool_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/tool_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/tool_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/tool_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/ui.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/ui.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/ui.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/ui.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/go/util.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/util.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/go/util.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/go/util.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/gotest.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/gotest.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/gotest.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/gotest.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/autoload/unite/sources/decls.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/unite/sources/decls.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/autoload/unite/sources/decls.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/autoload/unite/sources/decls.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/compiler/go.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/compiler/go.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/compiler/go.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/compiler/go.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/doc/vim-go.txt b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/doc/vim-go.txt
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/doc/vim-go.txt
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/doc/vim-go.txt
diff --git a/.config/nvim/bundle/vim-go-1.19/ftdetect/gofiletype.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftdetect/gofiletype.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/ftdetect/gofiletype.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftdetect/gofiletype.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/ftplugin/asm.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/asm.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/ftplugin/asm.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/asm.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/ftplugin/go.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/go.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/ftplugin/go.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/go.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/ftplugin/go/commands.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/go/commands.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/ftplugin/go/commands.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/go/commands.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/ftplugin/go/mappings.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/go/mappings.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/ftplugin/go/mappings.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/go/mappings.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/ftplugin/go/snippets.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/go/snippets.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/ftplugin/go/snippets.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/go/snippets.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/ftplugin/go/tagbar.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/go/tagbar.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/ftplugin/go/tagbar.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/go/tagbar.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/ftplugin/gohtmltmpl.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/gohtmltmpl.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/ftplugin/gohtmltmpl.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/gohtmltmpl.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/ftplugin/gomod.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/gomod.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/ftplugin/gomod.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/gomod.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/ftplugin/gomod/commands.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/gomod/commands.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/ftplugin/gomod/commands.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/gomod/commands.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/ftplugin/gomod/mappings.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/gomod/mappings.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/ftplugin/gomod/mappings.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/ftplugin/gomod/mappings.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/gosnippets/UltiSnips/go.snippets b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/UltiSnips/go.snippets
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/gosnippets/UltiSnips/go.snippets
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/UltiSnips/go.snippets
diff --git a/.config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_eq b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_eq
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_eq
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_eq
diff --git a/.config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_err b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_err
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_err
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_err
diff --git a/.config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_errt b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_errt
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_errt
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_errt
diff --git a/.config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_errw b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_errw
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_errw
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_errw
diff --git a/.config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_f b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_f
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_f
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_f
diff --git a/.config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_ff b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_ff
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_ff
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_ff
diff --git a/.config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_fori b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_fori
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_fori
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_fori
diff --git a/.config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_pkg b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_pkg
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_pkg
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_pkg
diff --git a/.config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_sp b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_sp
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_sp
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_sp
diff --git a/.config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_tt b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_tt
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/gosnippets/minisnip/_go_tt
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/minisnip/_go_tt
diff --git a/.config/nvim/bundle/vim-go-1.19/gosnippets/snippets/go.snip b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/snippets/go.snip
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/gosnippets/snippets/go.snip
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/gosnippets/snippets/go.snip
diff --git a/.config/nvim/bundle/vim-go-1.19/indent/go.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/indent/go.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/indent/go.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/indent/go.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/indent/gohtmltmpl.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/indent/gohtmltmpl.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/indent/gohtmltmpl.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/indent/gohtmltmpl.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/plugin/go.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/plugin/go.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/plugin/go.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/plugin/go.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/rplugin/python3/denite/source/decls.py b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/rplugin/python3/denite/source/decls.py
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/rplugin/python3/denite/source/decls.py
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/rplugin/python3/denite/source/decls.py
diff --git a/.config/nvim/bundle/vim-go-1.19/scripts/bench-syntax b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/bench-syntax
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/scripts/bench-syntax
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/bench-syntax
diff --git a/.config/nvim/bundle/vim-go-1.19/scripts/docker-test b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/docker-test
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/scripts/docker-test
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/docker-test
diff --git a/.config/nvim/bundle/vim-go-1.19/scripts/install-vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/install-vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/scripts/install-vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/install-vim
diff --git a/.config/nvim/bundle/vim-go-1.19/scripts/lint b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/lint
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/scripts/lint
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/lint
diff --git a/.config/nvim/bundle/vim-go-1.19/scripts/run-vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/run-vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/scripts/run-vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/run-vim
diff --git a/.config/nvim/bundle/vim-go-1.19/scripts/runbench.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/runbench.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/scripts/runbench.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/runbench.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/scripts/runtest.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/runtest.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/scripts/runtest.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/runtest.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/scripts/test b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/test
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/scripts/test
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/scripts/test
diff --git a/.config/nvim/bundle/vim-go-1.19/syntax/go.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/go.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/syntax/go.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/go.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/syntax/godebugoutput.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/godebugoutput.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/syntax/godebugoutput.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/godebugoutput.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/syntax/godebugstacktrace.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/godebugstacktrace.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/syntax/godebugstacktrace.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/godebugstacktrace.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/syntax/godebugvariables.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/godebugvariables.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/syntax/godebugvariables.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/godebugvariables.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/syntax/godefstack.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/godefstack.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/syntax/godefstack.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/godefstack.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/syntax/gohtmltmpl.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/gohtmltmpl.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/syntax/gohtmltmpl.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/gohtmltmpl.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/syntax/gomod.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/gomod.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/syntax/gomod.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/gomod.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/syntax/gotexttmpl.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/gotexttmpl.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/syntax/gotexttmpl.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/gotexttmpl.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/syntax/vimgo.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/vimgo.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/syntax/vimgo.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/syntax/vimgo.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/templates/hello_world.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/templates/hello_world.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/templates/hello_world.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/templates/hello_world.go
diff --git a/.config/nvim/bundle/vim-go-1.19/templates/hello_world_test.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/templates/hello_world_test.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/templates/hello_world_test.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/templates/hello_world_test.go
diff --git a/.config/nvim/bundle/vim-go-1.19/test/gopath_test.vim b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/test/gopath_test.vim
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/test/gopath_test.vim
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/test/gopath_test.vim
diff --git a/.config/nvim/bundle/vim-go-1.19/test/parse.go b/.local/share/nvim/site/pack/vim-go/start/vim-go-1.19/test/parse.go
similarity index 100%
rename from .config/nvim/bundle/vim-go-1.19/test/parse.go
rename to .local/share/nvim/site/pack/vim-go/start/vim-go-1.19/test/parse.go
diff --git a/.config/nvim/bundle/vim-terraform/.editorconfig b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/.editorconfig
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/.editorconfig
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/.editorconfig
diff --git a/.config/nvim/bundle/vim-terraform/.gitignore b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/.gitignore
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/.gitignore
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/.gitignore
diff --git a/.config/nvim/bundle/vim-terraform/.travis.yml b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/.travis.yml
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/.travis.yml
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/.travis.yml
diff --git a/.config/nvim/bundle/vim-terraform/CHANGELOG.md b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/CHANGELOG.md
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/CHANGELOG.md
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/CHANGELOG.md
diff --git a/.config/nvim/bundle/vim-terraform/CODE_OF_CONDUCT.md b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/CODE_OF_CONDUCT.md
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/CODE_OF_CONDUCT.md
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/CODE_OF_CONDUCT.md
diff --git a/.config/nvim/bundle/vim-terraform/CONTRIBUTING.md b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/CONTRIBUTING.md
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/CONTRIBUTING.md
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/CONTRIBUTING.md
diff --git a/.config/nvim/bundle/vim-terraform/LICENSE b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/LICENSE
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/LICENSE
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/LICENSE
diff --git a/.config/nvim/bundle/vim-terraform/Makefile b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/Makefile
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/Makefile
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/Makefile
diff --git a/.config/nvim/bundle/vim-terraform/README.md b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/README.md
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/README.md
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/README.md
diff --git a/.config/nvim/bundle/vim-terraform/autoload/terraform.vim b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/autoload/terraform.vim
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/autoload/terraform.vim
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/autoload/terraform.vim
diff --git a/.config/nvim/bundle/vim-terraform/doc/terraform.txt b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/doc/terraform.txt
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/doc/terraform.txt
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/doc/terraform.txt
diff --git a/.config/nvim/bundle/vim-terraform/ftdetect/terraform.vim b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/ftdetect/terraform.vim
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/ftdetect/terraform.vim
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/ftdetect/terraform.vim
diff --git a/.config/nvim/bundle/vim-terraform/ftplugin/terraform.vim b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/ftplugin/terraform.vim
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/ftplugin/terraform.vim
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/ftplugin/terraform.vim
diff --git a/.config/nvim/bundle/vim-terraform/get_providers.sh b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/get_providers.sh
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/get_providers.sh
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/get_providers.sh
diff --git a/.config/nvim/bundle/vim-terraform/indent/terraform.vim b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/indent/terraform.vim
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/indent/terraform.vim
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/indent/terraform.vim
diff --git a/.config/nvim/bundle/vim-terraform/syntax/terraform.vim b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/syntax/terraform.vim
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/syntax/terraform.vim
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/syntax/terraform.vim
diff --git a/.config/nvim/bundle/vim-terraform/test/syntax.vader b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/test/syntax.vader
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/test/syntax.vader
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/test/syntax.vader
diff --git a/.config/nvim/bundle/vim-terraform/test/terraform_align.vader b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/test/terraform_align.vader
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/test/terraform_align.vader
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/test/terraform_align.vader
diff --git a/.config/nvim/bundle/vim-terraform/test/terraform_fold_sections.vader b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/test/terraform_fold_sections.vader
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/test/terraform_fold_sections.vader
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/test/terraform_fold_sections.vader
diff --git a/.config/nvim/bundle/vim-terraform/test/terraform_remap_spacebar.vader b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/test/terraform_remap_spacebar.vader
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/test/terraform_remap_spacebar.vader
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/test/terraform_remap_spacebar.vader
diff --git a/.config/nvim/bundle/vim-terraform/update_automagic.sh b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/update_automagic.sh
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/update_automagic.sh
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/update_automagic.sh
diff --git a/.config/nvim/bundle/vim-terraform/update_commands.rb b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/update_commands.rb
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/update_commands.rb
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/update_commands.rb
diff --git a/.config/nvim/bundle/vim-terraform/update_data_sources.rb b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/update_data_sources.rb
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/update_data_sources.rb
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/update_data_sources.rb
diff --git a/.config/nvim/bundle/vim-terraform/update_resources.rb b/.local/share/nvim/site/pack/vim-terraform/start/vim-terraform/update_resources.rb
similarity index 100%
rename from .config/nvim/bundle/vim-terraform/update_resources.rb
rename to .local/share/nvim/site/pack/vim-terraform/start/vim-terraform/update_resources.rb
diff --git a/.local/share/overlay-directory b/.local/share/overlay-directory
new file mode 100644
index 0000000..6862469
--- /dev/null
+++ b/.local/share/overlay-directory
@@ -0,0 +1 @@
+This file tells deploy.sh not to link directly to this directory.
diff --git a/.tmux.conf b/.tmux.conf
index 1173089..716be5b 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -8,7 +8,7 @@ bind-key C-a last-window
 bind-key k select-pane -U
 bind-key j select-pane -D
 
-##set-option -g status-bg cyan
+set-option -g status-bg cyan
 
 # Fix standout/reverse video. This is because of an unfortunate interaction
 # between screen's terminfo entry, rxvt, tmux, and sometimes mosh. It deserves
diff --git a/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim
deleted file mode 100644
index 3582fbf..0000000
--- a/.vim/autoload/pathogen.vim
+++ /dev/null
@@ -1,264 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" 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() 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.
-" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}"
-" on versions of Vim without native package support.
-function! pathogen#infect(...) abort
-  if a:0
-    let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")')
-  else
-    let paths = ['bundle/{}', 'pack/{}/start/{}']
-  endif
-  if has('packages')
-    call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"')
-  endif
-  let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$'
-  for path in filter(copy(paths), 'v:val =~# static')
-    call pathogen#surround(path)
-  endfor
-  for path in filter(copy(paths), 'v:val !~# static')
-    if path =~# '^\%([$~\\/]\|\w:[\\/]\)'
-      call pathogen#surround(path)
-    else
-      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_blacklist or the
-" comma delimited environment variable $VIMBLACKLIST.
-function! pathogen#is_disabled(path) abort
-  if a:path =~# '\~$'
-    return 1
-  endif
-  let sep = pathogen#slash()
-  let blacklist = get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) + pathogen#split($VIMBLACKLIST)
-  if !empty(blacklist)
-    call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
-  endif
-  return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
-endfunction
-
-" 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, ':s?[\\/]\=$??')
-  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
-  let after = a:0 ? a:1 : ''
-  let pattern = substitute(a:pattern, '^[~$][^\/]*', '\=expand(submatch(0))', '')
-  if pattern =~# '{[^{}]\+}'
-    let [pre, pat, post] = split(substitute(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
-  elseif pattern =~# '{}'
-    let pat = matchstr(pattern, '^.*{}[^*]*\%($\|[\\/]\)')
-    let post = pattern[strlen(pat) : -1]
-    let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
-  else
-    let results = [pattern]
-  endif
-  let vf = pathogen#slash() . 'vimfiles'
-  call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
-  return filter(results, '!empty(v:val)')
-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
-
-" 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
-
-" 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
-  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
-
-" 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/vim-bufferline b/.vim/bundle/vim-bufferline
deleted file mode 120000
index e44f186..0000000
--- a/.vim/bundle/vim-bufferline
+++ /dev/null
@@ -1 +0,0 @@
-../../.config/nvim/bundle/vim-bufferline/
\ No newline at end of file
diff --git a/.vim/bundle/vim-commentary b/.vim/bundle/vim-commentary
deleted file mode 120000
index c188693..0000000
--- a/.vim/bundle/vim-commentary
+++ /dev/null
@@ -1 +0,0 @@
-../../.config/nvim/bundle/vim-commentary/
\ No newline at end of file
diff --git a/.vim/bundle/vim-gnupg b/.vim/bundle/vim-gnupg
deleted file mode 120000
index e8ae2ce..0000000
--- a/.vim/bundle/vim-gnupg
+++ /dev/null
@@ -1 +0,0 @@
-../../.config/nvim/bundle/vim-gnupg/
\ No newline at end of file
diff --git a/.vim/bundle/vim-go-1.19 b/.vim/bundle/vim-go-1.19
deleted file mode 120000
index 69bc4e8..0000000
--- a/.vim/bundle/vim-go-1.19
+++ /dev/null
@@ -1 +0,0 @@
-../../.config/nvim/bundle/vim-go-1.19/
\ No newline at end of file
diff --git a/.vim/bundle/vim-javascript b/.vim/bundle/vim-javascript
deleted file mode 120000
index 70799d2..0000000
--- a/.vim/bundle/vim-javascript
+++ /dev/null
@@ -1 +0,0 @@
-../../.config/nvim/bundle/vim-javascript/
\ No newline at end of file
diff --git a/.vim/bundle/vim-sensible/README.markdown b/.vim/bundle/vim-sensible/README.markdown
deleted file mode 100644
index a31bc57..0000000
--- a/.vim/bundle/vim-sensible/README.markdown
+++ /dev/null
@@ -1,94 +0,0 @@
-# sensible.vim
-
-Think of sensible.vim as one step above `'nocompatible'` mode: a universal
-set of defaults that (hopefully) everyone can agree on.
-
-* If you're new to Vim, you can install this as a starting point, rather than
-  copying some random vimrc you found.
-* If you're pair programming and you can't agree on whose vimrc to use, this
-  can be your neutral territory.
-* If you're administrating a server with an account that's not exclusively
-  yours, you can `scp` this up to make things a bit more tolerable.
-* If you're troubleshooting a plugin and need to rule out interference from
-  your vimrc, having this installed will ensure you still have some basic
-  amenities.
-
-## Installation
-
-If you don't have a preferred installation method, I recommend
-installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
-then simply copy and paste:
-
-    cd ~/.vim/bundle
-    git clone git://github.com/tpope/vim-sensible.git
-
-## Features
-
-See the [source][] for the authoritative list of features.  (Don't worry, it's
-mostly `:set` calls.)  Here's a taste:
-
-* `'backspace'`: Backspace through anything in insert mode.
-* `'incsearch'`: Start searching before pressing enter.
-* `'listchars'`: Makes `:set list` (visible whitespace) prettier.
-* `'scrolloff'`: Always show at least one line above/below the cursor.
-* `runtime! macros/matchit.vim`: Load the version of matchit.vim that ships
-  with Vim.
-
-[source]: https://github.com/tpope/vim-sensible/tree/master/plugin/sensible.vim
-
-## FAQ
-
-> How can I see what this plugin actually does?
-
-The [source][] is authoritative.  Use `:help 'option'` to see the
-documentation for an option.  If you install [scriptease.vim][], you can press
-`K` on an option (or command, or function) to jump to its documentation.
-
-[scriptease.vim]: https://github.com/tpope/vim-scriptease
-
-> How can I override a setting?
-
-Normally, sensible.vim loads after your vimrc, making it a bit tricky to
-override (although you could use `after/plugin/sensible.vim`).  If you want to
-load it earlier, add the following line to you vimrc, then put your overrides
-below.
-
-    runtime! plugin/sensible.vim
-
-Feel free to [let me know][GitHub issues] which setting you object to, so I
-can reassess whether it makes sense to include it.
-
-## Contributing
-
-I want this to be a plugin nobody objects to installing.  [Let me
-know][GitHub issues] if you have any objections to *anything*.  There are a
-handful of settings I figured *might* be controversial, but I included
-anyways, just to settle the question once and for all.  It won't take much
-persuasion for me to remove them.  Everything else is negotiable.
-
-Feel free to ask a question if you're not sure why I've set something, as I
-haven't put much effort into documenting that.
-
-I'm a stickler for [commit messages][], so if you send me a pull request with
-so much as a superfluous period in the subject line, I will close it without
-so much as a second thought, and save my precious attention for someone who
-can actually follow directions.
-
-[GitHub issues]: http://github.com/tpope/vim-sensible/issues
-[commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-
-## Self-Promotion
-
-Like sensible.vim? Follow the repository on
-[GitHub](https://github.com/tpope/vim-sensible) and vote for it on
-[vim.org](http://www.vim.org/scripts/script.php?script_id=4391). And if
-you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
-[Twitter](http://twitter.com/tpope) and
-[GitHub](https://github.com/tpope).
-
-This pairs great with [sleuth.vim](https://github.com/tpope/vim-sleuth).
-
-## License
-
-Copyright © Tim Pope.  Distributed under the same terms as Vim itself.
-See `:help license`.
diff --git a/.vim/bundle/vim-sensible/plugin/sensible.vim b/.vim/bundle/vim-sensible/plugin/sensible.vim
deleted file mode 100644
index 614fe0e..0000000
--- a/.vim/bundle/vim-sensible/plugin/sensible.vim
+++ /dev/null
@@ -1,88 +0,0 @@
-" sensible.vim - Defaults everyone can agree on
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      1.0
-
-if exists('g:loaded_sensible') || &compatible
-  finish
-else
-  let g:loaded_sensible = 1
-endif
-
-if has('autocmd')
-  filetype plugin indent on
-endif
-if has('syntax') && !exists('g:syntax_on')
-  syntax enable
-endif
-
-" Use :help 'option' to see the documentation for the given option.
-
-set autoindent
-set backspace=indent,eol,start
-set complete-=i
-set smarttab
-
-set nrformats-=octal
-set shiftround
-
-set ttimeout
-set ttimeoutlen=100
-
-set incsearch
-" Use <C-L> to clear the highlighting of :set hlsearch.
-if maparg('<C-L>', 'n') ==# ''
-  nnoremap <silent> <C-L> :nohlsearch<CR><C-L>
-endif
-
-set laststatus=2
-set ruler
-set showcmd
-set wildmenu
-
-if !&scrolloff
-  set scrolloff=1
-endif
-if !&sidescrolloff
-  set sidescrolloff=5
-endif
-set display+=lastline
-
-if &encoding ==# 'latin1' && has('gui_running')
-  set encoding=utf-8
-endif
-
-if &listchars ==# 'eol:$'
-  set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
-endif
-
-if &shell =~# 'fish$'
-  set shell=/bin/bash
-endif
-
-set autoread
-set fileformats+=mac
-
-if &history < 1000
-  set history=1000
-endif
-if &tabpagemax < 50
-  set tabpagemax=50
-endif
-if !empty(&viminfo)
-  set viminfo^=!
-endif
-set sessionoptions-=options
-
-" Allow color schemes to do bright colors without forcing bold.
-if &t_Co == 8 && $TERM !~# '^linux'
-  set t_Co=16
-endif
-
-" Load matchit.vim, but only if the user hasn't installed a newer version.
-if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
-  runtime! macros/matchit.vim
-endif
-
-inoremap <C-U> <C-G>u<C-U>
-
-" vim:set ft=vim et sw=2:
diff --git a/.vim/bundle/vim-terraform b/.vim/bundle/vim-terraform
deleted file mode 120000
index caa78a2..0000000
--- a/.vim/bundle/vim-terraform
+++ /dev/null
@@ -1 +0,0 @@
-../../.config/nvim/bundle/vim-terraform
\ No newline at end of file
diff --git a/.vim/pack b/.vim/pack
new file mode 120000
index 0000000..f6c5c4f
--- /dev/null
+++ b/.vim/pack
@@ -0,0 +1 @@
+/home/mkelly/.local/share/nvim/site/pack
\ No newline at end of file
-- 
2.45.2