diff --git a/.README.md b/.README.md
index 31a91eb..6e48537 100644
--- a/.README.md
+++ b/.README.md
@@ -94,7 +94,7 @@ git apply --stat --apply 2604.patch
 ## Debian Packages
 
 ```sh
-apt install curl fd-find fzf ripgrep wget xdg-utils
+apt install curl fd-find fzf grc ripgrep wget xdg-utils
 
 dpkg-divert --divert /usr/bin/fd --rename /usr/bin/fdfind
 dpkg-divert --divert /usr/share/man/man1/fd.1.gz --rename /usr/share/man/man1/fdfind.1.gz
diff --git a/.config/lazygit/config.yml b/.config/lazygit/config.yml
index cff44ef..2989057 100644
--- a/.config/lazygit/config.yml
+++ b/.config/lazygit/config.yml
@@ -1,8 +1,5 @@
 # Documentation:
 # https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md
-#
-# To upgrade to latest binary:
-# `go install github.com/jesseduffield/lazygit@latest`
 
 customCommands:
 
@@ -71,6 +68,9 @@ keybinding:
 
 notARepository: 'skip'
 
+os:
+  editPreset: 'nvim'
+
 refresher:
   refreshInterval: 30
   fetchInterval: 3600
diff --git a/.zshrc b/.zshrc
index 558d12f..e670d52 100644
--- a/.zshrc
+++ b/.zshrc
@@ -242,7 +242,7 @@ export NNN_BMS="d:~/Downloads"
 export NNN_OPENER="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/plugins/nuke"
 export NNN_OPTS='ABeGo'
 export NNN_ORDER="t:$HOME/Downloads"
-export NNN_PLUG='b:-!bat --paging=always "$nnn"*;d:fzcd;m:mimelist;o:-!mimeopen --ask "$nnn"*;O:-!mimeopen "$nnn"*;U:umounttree;z:fzopen'
+export NNN_PLUG=';:-!bat --paging=always "$nnn"*;d:fzcd;m:mimelist;o:-!mimeopen --ask "$nnn"*;O:-!mimeopen "$nnn"*;U:umounttree;z:fzopen'
 if (( ${+commands[trash-put]} )); then
   export NNN_TRASH=1
 elif (( ${+commands[gio]} )); then
@@ -430,6 +430,7 @@ export BROWSER=firefox
 export EDITOR=vi
 export LESS=-iFRS
 export SYSTEMD_LESS='iFRSXMK'
+export VISUAL=bat
 
 # KeePassXC SSH Agent
 [[ -v SSH_AUTH_SOCK ]] || export SSH_AUTH_SOCK=$(echo /tmp/ssh-*/agent.*(U))