Pimped zsh config

.zlogin

@@ -1,11 +1,23 @@
-if [[ $UID == 0 || $EUID == 0 ]]; then
+# Set $PATH
-  PATH="/root/bin:$PATH"
+# Put only directories in $PATH that exist and remove duplicates
-fi
+typeset -U path  # No duplicates
+path=()
 
-PATH="$HOME/bin:$PATH"
+_prepath() {
+    for dir in "$@"; do
+        dir=${dir:A}
+        [[ ! -d "$dir" ]] && return
+        path=("$dir" $path[@])
+    done
+}
 
-PATH="$PATH:/usr/local/sbin:/usr/sbin:/sbin"
+_prepath /usr/local/bin /bin /usr/local/sbin # General
-PATH="/usr/local/bin:$PATH"
+_prepath /usr/bin  /usr/sbin /sbin /Library/Apple/usr/bin  # macOS
+_prepath /usr/sbin /sbin # FreeBSD
+
+_prepath "$HOME/bin"
+
+unfunction _prepath
 
 uname -npsr
 uptime

.zsh/lib/aliases.zsh

@@ -1,3 +1,16 @@
+_exists() { (( $+commands[$1] )) }
+
+_exists vim      && export EDITOR=vim
+_exists less     && export PAGER=less
+
+if _exists vim; then
+    alias vim="vim -p"
+    alias vi="vim"
+fi
+
+unfunction _exists
+
+
 alias ls='ls --color=always -h'
 alias ll='ls -la'
 alias ...='cd ../..'

.zsh/lib/history.zsh

@@ -11,3 +11,10 @@ setopt hist_ignore_space
 setopt hist_verify
 setopt inc_append_history
 setopt share_history # share command history data
+
+# Make up and down arrow take what’s typed on the commandline in to account.
+
+autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
+
+zle -N up-line-or-beginning-search
+zle -N down-line-or-beginning-search

.zsh/lib/key_bindings.zsh

@@ -9,8 +9,10 @@ bindkey "^[[5~" up-line-or-history
 bindkey "^[[6~" down-line-or-history
 
 # make search up and down work, so partially type and hit up/down to find relevant stuff
-bindkey '^[[A' up-line-or-search
+bindkey '^[[A'  up-line-or-beginning-search    # Arrow up
-bindkey '^[[B' down-line-or-search
+bindkey '^[OA'  up-line-or-beginning-search
+bindkey '^[[B'  down-line-or-beginning-search  # Arrow down
+bindkey '^[OB'  down-line-or-beginning-search
 
 bindkey "^[[H" beginning-of-line
 bindkey "^[[1~" beginning-of-line

.zsh/lib/misc.zsh

@@ -9,10 +9,5 @@ bindkey "^[m" copy-prev-shell-word
 setopt long_list_jobs
 
 ## pager
-export PAGER=less
 export LC_CTYPE=$LANG
 export LC_ALL=de_DE.UTF-8
-
-## editor
-
-export EDITOR=vim

.zsh/lib/shortcuts.zsh

@@ -14,3 +14,12 @@ case `uname` in
     hash -d www=/usr/local/www/ngineerx
   ;;
 esac
+
+insert_doas() { zle beginning-of-line; zle -U "doas " }
+replace_rm()  { zle beginning-of-line; zle delete-word; zle -U "rm " }
+
+zle -N insert-doas insert_doas
+zle -N replace-rm replace_rm
+
+bindkey '^s'    insert-doas
+bindkey '^r'    replace-rm