3 files changed, 25 insertions, 11 deletions
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index d8675d4..0665533 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -5,9 +5,9 @@ then
 	clear
 	if [ "/dev/tty1" = "$TTY" ]
 	then
-		startw > /dev/null 2>&1
+		exec startw > /dev/null 2>&1
 	else
-		startx > /dev/null 2>&1
+		exec startx > /dev/null 2>&1
 	fi
 	exit
 fi
diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh
index 3884582..461546a 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -128,6 +128,7 @@ alias xrandr-default='xrandr --auto --output VGA-1 --mode 1920x1080 --left-of HD
 alias d='du -d 0 -h'
 alias dud='du .* * -d 0 -h 2>/dev/null | sort -h'
 alias df='df -h'
+alias diff='diff -u --color'
 alias shred='shred -uz'
 alias lsblk='lsblk -o name,type,fsused,fsavail,size,fstype,label,mountpoint'
 alias floc='doas find / -type "f" 2> /dev/null | grep'
@@ -181,7 +182,7 @@ alias wf='doas wipefs -a'
 alias dmci="doas make clean install"
 alias rmd='rm -f *.{orig,rej}'
 alias cdzot='mkdir -p /tmp/zottesite && cd /tmp/zottesite'
-alias gdate="date +%y%m%d_%H%M%S"
+alias gdate='date +%y_%m_%d-%T'
 alias tpid='tail -f /dev/null --pid'
 
 alias vbm='vboxmanage'
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index 671e6fb..3c5f11f 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -39,23 +39,30 @@ nnn() { test -z "$NNNLVL" && /usr/bin/nnn "$@" || exit }
 ranger() { test -z "$RANGER_LEVEL" && /usr/bin/ranger "$@" || exit }
 
 # googoo aliases
-ff () { goo f "$1" | fzf }
-fd () { goo d "$1" | fzf }
-fdf () { goo f "$1" | fzf | xargs -I {} dirname "{}" }
+_googoo_fzf_opt ()
+{
+	if [ "$1" ]
+	then
+		[ -d "$1" ] && dest="$1" || opt="-q $1"
+	fi
+}
 o ()
 {
-	f="$(ff $1)"
+	_googoo_fzf_opt "$1"
+	f="$(goo f "dest" | fzf $opt)"
 	test "$1" && shift
-	test -n "$f" && $EDITOR $@ "$f"
+	test -f "$f" && $EDITOR $@ "$f"
 }
 go ()
 {
-	d="$(fd $1)"
+	_googoo_fzf_opt "$1"
+	d="$(goo d "$dest" | fzf $opt)"
 	test -d "$d" && cd "$d"
 }
 ogo ()
 {
-	d="$(fdf $1)"
+	_googoo_fzf_opt "$1"
+	d="$(dirname "$(goo f "$dest")" | fzf $opt)"
 	test -d "$d" && cd "$d"
 }
 
@@ -69,7 +76,13 @@ ipc ()
    fi
 }
 
-calc () { echo "$@" | bc -l }
+calc () { echo "$@" | bc -l | numfmt --grouping; }
+
+psgrep ()
+{
+	[ $# -eq 0 ] && return 1
+	pgrep "$@" | xargs ps
+}
 
 unique () {
 	local f