diff --git a/.gitmodules b/.gitmodules
index 35cb719..2aaf4b1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "meeting_backgrounds"]
 	path = meeting_backgrounds
 	url = https://github.com/ChrisHirsch/dotfiles_meeting_backgrounds.git
+[submodule "nvim"]
+	path = nvim
+	url = https://gitlab.com/klevermonicker/nvim.git
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 0000000..f9bbe86
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1,2 @@
+nodejs 14.15.0
+
diff --git a/Brewfile b/Brewfile
index 630d4cb..da238fd 100644
--- a/Brewfile
+++ b/Brewfile
@@ -34,9 +34,8 @@ brew "ansible-lint"
 # CLI For ArgoCD
 brew "argocd"
 brew "asciiquarium"
-# Tool version Manager used for Elixir http://asdf-vm.com/guide/introduction.html#how-it-works
-# No longer supported (ie malware?)
-# brew "asdf"
+# Ruby/Node/etc Tool Version Manager
+brew "asdf"
 brew "awscli"
 brew "aws-sam-cli"
 brew "aws-vault"
@@ -66,8 +65,7 @@ brew "coreutils"
 brew "curl"
 #brew "elixir"
 #brew "dnsmasq", restart_service: true
-# A tool for exploring a docker image, layer contents, and discovering ways to shrink the size of your Docker/OCI image.
-# https://github.com/wagoodman/dive
+
 brew "dive"
 # https://github.com/goodwithtech/dockle
 # Contianer Image Linter
@@ -126,6 +124,9 @@ brew "kube-linter"
 brew "kustomize"
 # For heif-convert cli tool
 brew "libheif"
+# For Ruby on Rails with libpq
+brew "libpq"
+
 brew "maven"
 brew "make"
 # For Git -> Confluence Documentation
@@ -135,12 +136,15 @@ brew "minikube"
 brew "most"
 brew "mplayer"
 brew "newsboat"
+brew "neovim"
 brew "npm"
 brew "node"
 # NodeJS Version Manager
 brew "nvm"
 # LLM Cli 
 brew "ollama"
+# Terraform replacement
+brew "opentofu"
 # https://github.com/vmware-tanzu/octant
 # Shows how applications run on k8s
 # Dead?
@@ -159,8 +163,12 @@ brew "pyenv-virtualenv"
 brew "qemu"
 # Remove PDF Passowrd
 brew "qpdf"
+# Python sytax highlighter
+brew "pygments"
 # CLI tool for working with CloudFormation https://github.com/aws-cloudformation/rain
 brew "rain"
+# Fast alternative to grep https://github.com/BurntSushi/ripgrep (needed for neovim telescope too)
+brew "ripgrep"
 brew "rename"
 brew "rust"
 # https://github.com/mozilla/sops manages secrets for helmfile
@@ -182,8 +190,8 @@ brew "tree"
 #brew "unrar"
 brew "unnethack"
 brew "wireshark"
-# FAST Swagger linter for cli
-brew "install daveshanley/vacuum/vacuum"
+# OpenAPI Swagger validator and linter for cli
+brew "daveshanley/vacuum/vacuum"
 brew "vim"
 # Versatile HTTP load tester 
 brew "vegeta"
@@ -203,20 +211,21 @@ cask "1password-cli"
 cask "apptrap"
 # Great USB Imager
 cask "balenaetcher"
+cask "bruno"
 # Don't let the mac fall asleep (clickable)
 cask "caffeine"
 cask "chef/chef/inspec"
 # Ebook Organizer
 cask "calibre"
 # Amazon Java JDK https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/what-is-corretto-11.html
-cask "corretto11"
+cask "corretto@11"
 cask "cyberduck"
 # Database GUI
 cask "dbeaver-community"
 cask "discord"
 # Not sure we really want this any more given that Docker wants a license for your desktop use
 # Try Rancher Desktop for an alternative
-# cask "docker"
+cask "docker"
 cask "evernote"
 cask "firefox"
 # Best screen color changer (for day/night)
@@ -240,7 +249,8 @@ cask "keybase"
 cask "lens"
 # Animated Screen Capture
 cask "licecap"
-cask "microsoft-teams"
+# For working with latex
+cask "mactex"
 # Like Charlesproxy but opensource https://mitmproxy.org
 cask "mitmproxy"
 # An opensource Redis Client GUI
@@ -275,10 +285,8 @@ cask "postico"
 cask "powershell"
 # SMS across devices
 cask "pulse-sms"
-# Python sytax highlighter
-cask "pygments"
 # Rancher Desktop rancherdesktop.io is an alternative to Docker Desktop (and free)
-cask "rancher"
+#cask "rancher"
 # Replaced spectacle
 cask "rectangle"
 # Quickly prototype react apps
@@ -303,6 +311,8 @@ cask "vlc"
 # This includes the GUI
 cask "wireshark"
 cask "xscreensaver"
+# Comic CBZ reader
+cask "yacreader"
 # OWASP Web App Scanner - Zed Attack Proxy
 cask "zap"
 
diff --git a/emojis/Chris Frowny.png b/emojis/Chris Frowny.png
new file mode 100644
index 0000000..bc51c61
Binary files /dev/null and b/emojis/Chris Frowny.png differ
diff --git a/emojis/merged.png b/emojis/merged.png
new file mode 100644
index 0000000..5ffce86
Binary files /dev/null and b/emojis/merged.png differ
diff --git a/install/install.sh b/install/install.sh
index 4e7dff9..82921f9 100755
--- a/install/install.sh
+++ b/install/install.sh
@@ -256,7 +256,7 @@ gitinstall() {
   fi
 
 
-  logger "Updating meeting backgrounds submodule..."
+  logger "Updating meeting backgrounds and neovim submodules..."
   cd ~/dotfiles && git submodule update --init --recursive
 }
 
@@ -288,9 +288,14 @@ editors() {
       logger "Error! YouCompleteMe doesn't exist, but it should now that Plugins are installed. Try going into vim and running :PlugInstall"
       exit 1
     fi
-
   fi
 
+  if [ -L ~/.config/nvim ]; then
+    logger "NeoVim config already linked at ~/.config/nvim"
+  else
+    logger "NeoVim config linked to ~/.config/nvim"
+    ln -sf ~/dotfiles/nvim ~/.config/nvim
+  fi
 
   if [ ${machine} == 'Mac' ] ; then
     # Allow Key repeat for Visual Studio Code on a mac (for vim plugin)
@@ -298,7 +303,7 @@ editors() {
     # VSCodium
     # defaults write com.visualstudio.code.oss ApplePressAndHoldEnabled -bool false
   fi
-}
+  }
 
 
 set_os_vars
diff --git a/keyboard/zsa/zsa_voyager_chris .bin b/keyboard/zsa/zsa_voyager_chris .bin
new file mode 100644
index 0000000..1ea92a5
Binary files /dev/null and b/keyboard/zsa/zsa_voyager_chris .bin differ
diff --git a/meeting_backgrounds b/meeting_backgrounds
index eb0e512..391ca99 160000
--- a/meeting_backgrounds
+++ b/meeting_backgrounds
@@ -1 +1 @@
-Subproject commit eb0e512e5ba7a2f27d9387197d448fa8488cd587
+Subproject commit 391ca99346e614d561f8aadc8646b8168fa065d7
diff --git a/nvim b/nvim
new file mode 160000
index 0000000..bdcbb68
--- /dev/null
+++ b/nvim
@@ -0,0 +1 @@
+Subproject commit bdcbb6801078c3807ecb80e87c457760516821a2
diff --git a/tmux.conf b/tmux.conf
index ef32cff..3e307ed 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,5 +1,7 @@
 # Good resource explaining windows, panes and how to navigate
 # http://tmuxp.git-pull.com/en/latest/about_tmux.html
+# The most awesomest place to get tmux info
+# https://github.com/rothgar/awesome-tmux?tab=readme-ov-file#themes
 
 # Enable mouse
 setw -g mouse on
diff --git a/zsh/aliases b/zsh/aliases
index 90f48cb..0e53ac6 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -110,3 +110,9 @@ alias java21='export JAVA_HOME=$JAVA_21_HOME'
 # default to Java 21 Corsetto
 java21
 
+
+# NeoVim
+alias vi=nvim
+
+# Alias grep to ripgrep
+alias grep=rg
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 7422754..f85ee3f 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -63,4 +63,3 @@ alias mytest="echo Make it say: $1"
 # Alias jql to a much better experience
 alias jql=jless
 
-