diff --git a/nvim/ftplugin/swift.lua b/nvim/m-housh/ftplugin/swift.lua
similarity index 100%
rename from nvim/ftplugin/swift.lua
rename to nvim/m-housh/ftplugin/swift.lua
diff --git a/nvim/init.lua b/nvim/m-housh/init.lua
similarity index 100%
rename from nvim/init.lua
rename to nvim/m-housh/init.lua
diff --git a/nvim/m-housh/lazy-lock.json b/nvim/m-housh/lazy-lock.json
new file mode 100644
index 0000000..52fe1fa
--- /dev/null
+++ b/nvim/m-housh/lazy-lock.json
@@ -0,0 +1,33 @@
+{
+  "bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
+  "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
+  "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" },
+  "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
+  "diffview.nvim": { "branch": "main", "commit": "a111d19ccceac6530448d329c63f998f77b5626e" },
+  "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "bdf3dc7bb03edd25c2173e0e31c2fb122052ed23" },
+  "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
+  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "2451adb9bdb0fd32140bf3aa8dbc17ff60050db3" },
+  "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "2d89ca96e08eb6e9c8e50e1bb4738bc5125c9f12" },
+  "neogit": { "branch": "master", "commit": "dfacf16679b120c50c8a2dcefe00f77932523708" },
+  "nightfox.nvim": { "branch": "main", "commit": "ee3525fdfbe2ed81270a336ccbe62f433165357b" },
+  "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
+  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
+  "nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ede4114e1fd41acb121c70a27e1b026ac68c42d6" },
+  "nvim-treesitter": { "branch": "master", "commit": "af6b3ecea9b3cff18b9244027e23e7f2c34ebdd5" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
+  "nvim-web-devicons": { "branch": "master", "commit": "b844d3da4affb77fb2ba56ed235946f0ba0ab200" },
+  "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "54930e1abfc94409e1bb9266e752ef8379008592" },
+  "vim-vsnip": { "branch": "master", "commit": "be277461265f1e5c7db470aa479f30956597ea9e" },
+  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }
+}
\ No newline at end of file
diff --git a/nvim/lua/autocmd.lua b/nvim/m-housh/lua/autocmd.lua
similarity index 100%
rename from nvim/lua/autocmd.lua
rename to nvim/m-housh/lua/autocmd.lua
diff --git a/nvim/lua/mappings.lua b/nvim/m-housh/lua/mappings.lua
similarity index 100%
rename from nvim/lua/mappings.lua
rename to nvim/m-housh/lua/mappings.lua
diff --git a/nvim/lua/plugin-config/cmp.lua b/nvim/m-housh/lua/plugin-config/cmp.lua
similarity index 100%
rename from nvim/lua/plugin-config/cmp.lua
rename to nvim/m-housh/lua/plugin-config/cmp.lua
diff --git a/nvim/lua/plugin-config/diffview.lua b/nvim/m-housh/lua/plugin-config/diffview.lua
similarity index 100%
rename from nvim/lua/plugin-config/diffview.lua
rename to nvim/m-housh/lua/plugin-config/diffview.lua
diff --git a/nvim/lua/plugin-config/init.lua b/nvim/m-housh/lua/plugin-config/init.lua
similarity index 100%
rename from nvim/lua/plugin-config/init.lua
rename to nvim/m-housh/lua/plugin-config/init.lua
diff --git a/nvim/lua/plugin-config/lsp-installer.lua b/nvim/m-housh/lua/plugin-config/lsp-installer.lua
similarity index 100%
rename from nvim/lua/plugin-config/lsp-installer.lua
rename to nvim/m-housh/lua/plugin-config/lsp-installer.lua
diff --git a/nvim/lua/plugin-config/lspconfig.lua b/nvim/m-housh/lua/plugin-config/lspconfig.lua
similarity index 100%
rename from nvim/lua/plugin-config/lspconfig.lua
rename to nvim/m-housh/lua/plugin-config/lspconfig.lua
diff --git a/nvim/lua/plugin-config/lualine.lua b/nvim/m-housh/lua/plugin-config/lualine.lua
similarity index 100%
rename from nvim/lua/plugin-config/lualine.lua
rename to nvim/m-housh/lua/plugin-config/lualine.lua
diff --git a/nvim/lua/plugin-config/mason.lua b/nvim/m-housh/lua/plugin-config/mason.lua
similarity index 100%
rename from nvim/lua/plugin-config/mason.lua
rename to nvim/m-housh/lua/plugin-config/mason.lua
diff --git a/nvim/lua/plugin-config/neo-tree.lua b/nvim/m-housh/lua/plugin-config/neo-tree.lua
similarity index 100%
rename from nvim/lua/plugin-config/neo-tree.lua
rename to nvim/m-housh/lua/plugin-config/neo-tree.lua
diff --git a/nvim/lua/plugin-config/neogit.lua b/nvim/m-housh/lua/plugin-config/neogit.lua
similarity index 100%
rename from nvim/lua/plugin-config/neogit.lua
rename to nvim/m-housh/lua/plugin-config/neogit.lua
diff --git a/nvim/lua/plugin-config/nightfox.lua b/nvim/m-housh/lua/plugin-config/nightfox.lua
similarity index 100%
rename from nvim/lua/plugin-config/nightfox.lua
rename to nvim/m-housh/lua/plugin-config/nightfox.lua
diff --git a/nvim/lua/plugin-config/telescope.lua b/nvim/m-housh/lua/plugin-config/telescope.lua
similarity index 100%
rename from nvim/lua/plugin-config/telescope.lua
rename to nvim/m-housh/lua/plugin-config/telescope.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/cmp.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/cmp.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/cmp.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/cmp.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/colorizer.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/colorizer.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/colorizer.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/colorizer.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/diffview.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/diffview.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/diffview.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/diffview.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/lsp-installer.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/lsp-installer.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/lsp-installer.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/lsp-installer.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/lsp.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/lsp.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/lsp.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/lsp.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/lualine.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/lualine.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/lualine.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/lualine.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/neogit.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/neogit.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/neogit.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/neogit.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/nightfox.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/nightfox.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/nightfox.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/nightfox.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/nvim-tree.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/nvim-tree.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/nvim-tree.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/nvim-tree.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/telescope.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/telescope.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/telescope.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/telescope.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/treesitter.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/treesitter.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/treesitter.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/treesitter.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/vsnip.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/vsnip.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/vsnip.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/vsnip.lua
diff --git a/nvim/lua/plugin-config/tmp-old-packer-configs/which.lua b/nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/which.lua
similarity index 100%
rename from nvim/lua/plugin-config/tmp-old-packer-configs/which.lua
rename to nvim/m-housh/lua/plugin-config/tmp-old-packer-configs/which.lua
diff --git a/nvim/lua/plugin-config/treesitter.lua b/nvim/m-housh/lua/plugin-config/treesitter.lua
similarity index 100%
rename from nvim/lua/plugin-config/treesitter.lua
rename to nvim/m-housh/lua/plugin-config/treesitter.lua
diff --git a/nvim/lua/plugin-config/which-key.lua b/nvim/m-housh/lua/plugin-config/which-key.lua
similarity index 100%
rename from nvim/lua/plugin-config/which-key.lua
rename to nvim/m-housh/lua/plugin-config/which-key.lua
diff --git a/nvim/lua/plugins.lua b/nvim/m-housh/lua/plugins.lua
similarity index 100%
rename from nvim/lua/plugins.lua
rename to nvim/m-housh/lua/plugins.lua
diff --git a/nvim/lua/settings.lua b/nvim/m-housh/lua/settings.lua
similarity index 100%
rename from nvim/lua/settings.lua
rename to nvim/m-housh/lua/settings.lua
diff --git a/nvim/lua/theme.lua b/nvim/m-housh/lua/theme.lua
similarity index 100%
rename from nvim/lua/theme.lua
rename to nvim/m-housh/lua/theme.lua
diff --git a/scripts/scripts/newx b/scripts/scripts/newx
index 01add0d..01f20f5 100755
--- a/scripts/scripts/newx
+++ b/scripts/scripts/newx
@@ -22,5 +22,5 @@ fi
 
 printf "#!/bin/%s\n\n" "${shell}" > "${path}"
 chmod +x "${path}"
-exec vim +2 "${path}"
+exec "${EDITOR}" +2 "${path}"
 
diff --git a/scripts/scripts/nvims b/scripts/scripts/nvims
new file mode 100755
index 0000000..764423c
--- /dev/null
+++ b/scripts/scripts/nvims
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Change / select an nvim configuration.
+main() {
+  items=("default" "m-housh" "kickstart" "lazy")
+  config=$(printf "%s\n" "${items[@]}" | fzf --prompt=" Neovim Config ➣ " --height=50% --layout=reverse --border --exit-0)
+  if [[ -z $config ]]; then
+    echo "Nothing selected"
+    return 0
+  elif [[ $config == "default" ]]; then
+    config=""
+  fi
+  unset VIMINIT && unset MYVIMRC && export NVIM_APPNAME=$config && nvim $@
+}
+
+main "$@"
diff --git a/zsh/config/.zshrc b/zsh/config/.zshrc
index 5a55a82..0a659b7 100644
--- a/zsh/config/.zshrc
+++ b/zsh/config/.zshrc
@@ -35,12 +35,12 @@ export DESKTOP="$HOME/Desktop"
 export SCRIPTS="$HOME/.local/scripts"
 export WORK="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work"
 export TERM=xterm-256color
-export EDITOR=vi
-export VISUAL=vi
-export EDITOR_PREFIX=vi
+export EDITOR=nvim
+export VISUAL=nvim
+export EDITOR_PREFIX=nvim
 export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
-export VIMINIT='source $MYVIMRC'
-export MYVIMRC="$HOME/.vim/vimrc"
+#export VIMINIT='source $MYVIMRC'
+#export MYVIMRC="$HOME/.vim/vimrc"
 export MYZSHRC="$ZDOTDIR/.zshrc"
 export PROPOSALS="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work/Proposals"
 
@@ -192,14 +192,23 @@ alias gs='git status'
 alias l='ls -lah --color=auto'
 alias reload='exec zsh -l'
 alias temp='cd $(mktemp -d)'
-alias vi='vim'
-alias nvim='unset VIMINIT && unset MYVIMRC && nvim'
+alias vi='nvim'
+alias nvim='unset VIMINIT && unset MYVIMRC && /opt/homebrew/bin/nvim'
+alias nvim-mhoush='NVIM_APPNAME=m-housh && /opt/homebrew/bin/nvim'
+alias nvim-kickstart='NVIM_APPNAME=kickstart /opt/homebrew/bin/nvim'
+alias nvim-lazy='NVIM_APPNAME=lazy /opt/homebrew/bin/nvim'
+
+
 #------------------------------ functions ------------------------------
+
+# Create a directory and move into it.
 mkcd() {
   local dir="$1"
   mkdir -p "$dir" && cd "$dir"
 } && export mkcd
 
+
+
 #------------------------------ local configs ------------------------------
 _source_if "$ZDOTDIR/.zshrc-local"