diff --git a/.gitmodules b/.gitmodules
index 3431b82..9c666e7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,3 +40,12 @@
 [submodule "vim/.vim/bundle/ale"]
 	path = vim/.vim/bundle/ale
 	url = https://github.com/dense-analysis/ale
+[submodule "vim/.vim/nvim-bundle/plenary"]
+	path = vim/.vim/nvim-bundle/plenary
+	url = https://github.com/nvim-lua/plenary.nvim.git
+[submodule "vim/.vim/nvim-bundle/telescope"]
+	path = vim/.vim/nvim-bundle/telescope
+	url = https://github.com/nvim-telescope/telescope.nvim.git
+[submodule "vim/.vim/nvim-bundle/nvim-lspconfig"]
+	path = vim/.vim/nvim-bundle/nvim-lspconfig
+	url = https://github.com/neovim/nvim-lspconfig.git
diff --git a/bash/.aliases b/bash/.aliases
index e867850..c1b1a92 100644
--- a/bash/.aliases
+++ b/bash/.aliases
@@ -1,5 +1,7 @@
 #{- ~/.aliases -}#
 
+alias vim="nvim "
+
 #{- FILE OPERATIONS -}#
 
 # Allow alias expansion for commands executed with sudo
diff --git a/vim/.config/nvim/init.lua b/vim/.config/nvim/init.lua
new file mode 100644
index 0000000..e69de29
diff --git a/vim/.config/nvim/init.vim b/vim/.config/nvim/init.vim
new file mode 100644
index 0000000..58dddd4
--- /dev/null
+++ b/vim/.config/nvim/init.vim
@@ -0,0 +1,9 @@
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath = &runtimepath
+source ~/.vimrc
+
+" Beginner keybinds for telescope
+nnoremap <leader>ff <cmd>Telescope find_files<cr>
+nnoremap <leader>fg <cmd>Telescope live_grep<cr>
+nnoremap <leader>fb <cmd>Telescope buffers<cr>
+nnoremap <leader>fh <cmd>Telescope help_tags<cr>
diff --git a/vim/.vim/bundle/commentary b/vim/.vim/bundle/commentary
index 627308e..f67e3e6 160000
--- a/vim/.vim/bundle/commentary
+++ b/vim/.vim/bundle/commentary
@@ -1 +1 @@
-Subproject commit 627308e30639be3e2d5402808ce18690557e8292
+Subproject commit f67e3e67ea516755005e6cccb178bc8439c6d402
diff --git a/vim/.vim/bundle/eunuch b/vim/.vim/bundle/eunuch
index 7a48f9f..084946f 160000
--- a/vim/.vim/bundle/eunuch
+++ b/vim/.vim/bundle/eunuch
@@ -1 +1 @@
-Subproject commit 7a48f9ff0ef5f21447b2354ee52dc18b5567e05c
+Subproject commit 084946fb1c8103ae0cb7342e9be3a2c69374958c
diff --git a/vim/.vim/bundle/filetype-nix b/vim/.vim/bundle/filetype-nix
index 63b47b3..048c71f 160000
--- a/vim/.vim/bundle/filetype-nix
+++ b/vim/.vim/bundle/filetype-nix
@@ -1 +1 @@
-Subproject commit 63b47b39c8d481ebca3092822ca8972e08df769b
+Subproject commit 048c71f1ed2c679cd55acd2c807c2c96aea82e65
diff --git a/vim/.vim/bundle/fugitive b/vim/.vim/bundle/fugitive
index 2064312..f116dcc 160000
--- a/vim/.vim/bundle/fugitive
+++ b/vim/.vim/bundle/fugitive
@@ -1 +1 @@
-Subproject commit 2064312ad7bb80050baf9acbdfb7641162919e53
+Subproject commit f116dcc8e21021e6fbfb6b0a9f8f7b9566d933f4
diff --git a/vim/.vim/bundle/pathogen b/vim/.vim/bundle/pathogen
index e0a3efb..ac4dd94 160000
--- a/vim/.vim/bundle/pathogen
+++ b/vim/.vim/bundle/pathogen
@@ -1 +1 @@
-Subproject commit e0a3efbda5ea8e5b181b2b232ef6453c05d07732
+Subproject commit ac4dd9494fa9008754e49dff85bff1b5746c89b4
diff --git a/vim/.vim/bundle/sleuth b/vim/.vim/bundle/sleuth
index 228e511..1cc4557 160000
--- a/vim/.vim/bundle/sleuth
+++ b/vim/.vim/bundle/sleuth
@@ -1 +1 @@
-Subproject commit 228e51160ca49d61d18b03e0656d4b631729e5c2
+Subproject commit 1cc4557420f215d02c4d2645a748a816c220e99b
diff --git a/vim/.vim/bundle/supertab b/vim/.vim/bundle/supertab
index 40fe711..f0093ae 160000
--- a/vim/.vim/bundle/supertab
+++ b/vim/.vim/bundle/supertab
@@ -1 +1 @@
-Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172
+Subproject commit f0093ae12a9115498f887199809a6114659fc858
diff --git a/vim/.vim/bundle/tagbar b/vim/.vim/bundle/tagbar
index 56399f4..12edcb5 160000
--- a/vim/.vim/bundle/tagbar
+++ b/vim/.vim/bundle/tagbar
@@ -1 +1 @@
-Subproject commit 56399f446c64d187c106e112afa4d97985508eba
+Subproject commit 12edcb59449b335555652898f82dd6d5c59d519a
diff --git a/vim/.vim/bundle/vim-terraform b/vim/.vim/bundle/vim-terraform
index f0b17ac..3d1cfc8 160000
--- a/vim/.vim/bundle/vim-terraform
+++ b/vim/.vim/bundle/vim-terraform
@@ -1 +1 @@
-Subproject commit f0b17ac9f1bbdf3a29dba8b17ab429b1eed5d443
+Subproject commit 3d1cfc8e183f1a58f71587442849510462f5857b
diff --git a/vim/.vim/bundle/vinegar b/vim/.vim/bundle/vinegar
index fcce70f..bb1bcdd 160000
--- a/vim/.vim/bundle/vinegar
+++ b/vim/.vim/bundle/vinegar
@@ -1 +1 @@
-Subproject commit fcce70f1403ba4101668a4c960c577bddbd00f06
+Subproject commit bb1bcddf43cfebe05eb565a84ab069b357d0b3d6
diff --git a/vim/.vim/colors/halfdab.vim b/vim/.vim/colors/halfdab.vim
index 3fcb58a..e9aca64 100644
--- a/vim/.vim/colors/halfdab.vim
+++ b/vim/.vim/colors/halfdab.vim
@@ -53,7 +53,7 @@ exe "let s:bg_white          = ' ctermbg=".s:white"'"
 exe "let s:fg_none           = ' ctermfg=NONE'"
 exe "let s:fg_default        = ' ctermfg=".s:foreground"'"
 exe "let s:fg_black          = ' ctermfg=".s:black"'"
-exe "let s:fg_red            = ' ctermfg=".s:red"'"
+exe "let s:fg_red            = ' ctermfg=".s:bright_red"'"
 exe "let s:fg_green          = ' ctermfg=".s:green"'"
 exe "let s:fg_yellow         = ' ctermfg=".s:yellow"'"
 exe "let s:fg_blue           = ' ctermfg=".s:blue"'"
@@ -135,20 +135,20 @@ exe "hi! Todo"           .s:fmt_bold   .s:fg_magenta.s:bg_none
 "       *Todo            anything that needs extra attention; mostly the
 "                        keywords TODO FIXME and XXX
 
-exe "hi! StatusLine"     .s:fg_dark_grey .s:bg_bright_red
-exe "hi! StatusLineNC"   .s:fg_dark_grey .s:bg_bright_magenta
+exe "hi! StatusLine"     .s:fg_blue .s:bg_none
+exe "hi! StatusLineNC"   .s:fg_blue .s:bg_none
 
 exe "hi! LineNr" .s:fg_dark_grey .s:bg_none
 exe "hi! CursorLineNr" .s:fg_bright_magenta .s:bg_none
 
-exe "hi! TabLine"     .s:fmt_none .s:fg_bright_red .s:bg_dark_grey
-exe "hi! TabLineSel"  .s:fmt_none .s:fg_bright_magenta .s:bg_dark_grey
-exe "hi! TabLineFill" .s:fmt_none .s:fg_none .s:bg_dark_grey
+exe "hi! TabLine"     .s:fmt_none .s:fg_black .s:bg_blue
+exe "hi! TabLineSel"  .s:fmt_bold .s:fg_black .s:bg_cyan
+exe "hi! TabLineFill" .s:fmt_none .s:fg_none .s:bg_bright_blue
 
-exe "hi! CursorLine"   .s:fmt_none .s:bg_dark_grey
-exe "hi! CursorColumn" .s:fmt_none .s:bg_dark_grey
+exe "hi! CursorLine"   .s:fmt_none .s:bg_blue
+exe "hi! CursorColumn" .s:fmt_none .s:bg_blue
 
-exe "hi! VertSplit" .s:fg_dark_grey .s:bg_dark_grey
+exe "hi! VertSplit" .s:fg_blue .s:bg_blue
 
 "if &background == "light"
 "	highlight Normal ctermfg=0 ctermbg=15
diff --git a/vim/.vim/nvim-bundle/nvim-lspconfig b/vim/.vim/nvim-bundle/nvim-lspconfig
new file mode 160000
index 0000000..b901432
--- /dev/null
+++ b/vim/.vim/nvim-bundle/nvim-lspconfig
@@ -0,0 +1 @@
+Subproject commit b901432100112c6d356f760be14ab1b2a44fdca0
diff --git a/vim/.vim/nvim-bundle/plenary b/vim/.vim/nvim-bundle/plenary
new file mode 160000
index 0000000..4f71c0c
--- /dev/null
+++ b/vim/.vim/nvim-bundle/plenary
@@ -0,0 +1 @@
+Subproject commit 4f71c0c4a196ceb656c824a70792f3df3ce6bb6d
diff --git a/vim/.vim/nvim-bundle/telescope b/vim/.vim/nvim-bundle/telescope
new file mode 160000
index 0000000..e54fbf4
--- /dev/null
+++ b/vim/.vim/nvim-bundle/telescope
@@ -0,0 +1 @@
+Subproject commit e54fbf4ab2b64640b639b75c006c23b4bc51c86f