3 files changed, 33 insertions, 20 deletions
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 843180b..37acce6 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -113,7 +113,37 @@ lfcd () {
         [ -d "$dir" ] && [ "$dir" != "$(pwd)" ] && cd "$dir"
     fi
 }
-bindkey -s '^o' '^ulfcd\n'
+nnncd ()
+{
+    # Block nesting of nnn in subshells
+    [ "${NNNLVL:-0}" -eq 0 ] || {
+        echo "nnn is already running"
+        return
+    }
+
+    # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
+    # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
+    # see. To cd on quit only on ^G, remove the "export" and make sure not to
+    # use a custom path, i.e. set NNN_TMPFILE *exactly* as follows:
+    #      NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
+    export NNN_TMPFILE="/tmp/nnn_lastd"
+
+    # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
+    # stty start undef
+    # stty stop undef
+    # stty lwrap undef
+    # stty lnext undef
+
+    # The command builtin allows one to alias nnn to n, if desired, without
+    # making an infinitely recursive alias
+    command nnn "$@"
+
+    [ ! -f "$NNN_TMPFILE" ] || {
+        . "$NNN_TMPFILE"
+        rm -f -- "$NNN_TMPFILE" > /dev/null
+    }
+}
+bindkey -s '^o' '^unnncd\n'
 
 bindkey -v "^ " globalias
 bindkey -v " " magic-space
diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh
index 4b01038..41b090c 100644
--- a/.config/zsh/alias.zsh
+++ b/.config/zsh/alias.zsh
@@ -60,6 +60,7 @@ alias \
 	irssi='irssi --config="$XDG_CONFIG_HOME"/irssi/config --home="$XDG_DATA_HOME"/irssi' \
 	irc='irssi' \
 	free='freecolor' \
+	n='nnn' \
 	gt='gpg-tui' \
 	lg='lazygit' \
 	tf='terraform' \
@@ -158,24 +159,6 @@ de() {
 	$VISUAL $sc
 	cd $p
 }
-eebin() {
-	file=$(find "$HOME"/.local/bin -type f | fzf)
-	[ $? -ne 0 ] && return
-	bsdsetsid emacsclient -c "$file"
-	kill -9 "$(ps -p $$ -oppid=)"
-}
-eeconf() {
-	file=$(find "$HOME"/.config -type f | fzf)
-	[ $? -ne 0 ] && return
-	bsdsetsid emacsclient -c "$file"
-	kill -9 "$(ps -p $$ -oppid=)"
-}
-ee() {
-	file=$(find . -type f | fzf)
-	[ $? -ne 0 ] && return
-	bsdsetsid emacsclient -c "$file"
-	kill -9 "$(ps -p $$ -oppid=)"
-}
 pa() {
 	if [ -d $HOME/.local/packs ] && cd $HOME/.local/packs || return 1
 	dir=$(\ls $HOME/.local/packs | fzf)
diff --git a/.config/zsh/plugins.zsh b/.config/zsh/plugins.zsh
index 9e13701..77bffa1 100644
--- a/.config/zsh/plugins.zsh
+++ b/.config/zsh/plugins.zsh
@@ -13,4 +13,4 @@
 
 source $HOME/.local/packs/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh >/dev/null
 source $HOME/.local/packs/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh >/dev/null
-[[ -r "/usr/share/z/z.sh" ]] && source /usr/share/z/z.sh
+# [[ -r "/usr/share/z/z.sh" ]] && source /usr/share/z/z.sh