diff --git a/executable_dot_env b/executable_dot_env index 119aab0..3dc9641 100644 --- a/executable_dot_env +++ b/executable_dot_env @@ -61,6 +61,10 @@ fi export PNPM_HOME="$XDG_DATA_HOME/pnpm" [ "${PATH#*$PNPM_HOME:}" = "$PATH" ] && export PATH="$PNPM_HOME:$PATH" +# npm +export NPM_CONFIG_PREFIX="$XDG_DATA_HOME/npm-global" +[ "${PATH#*$NPM_CONFIG_PREFIX/bin:}" = "$PATH" ] && export PATH="$NPM_CONFIG_PREFIX/bin:$PATH" + # Make Cargo install to user bin directory export CARGO_HOME="$XDG_DATA_HOME/cargo" export CARGO_INSTALL_ROOT="$HOME/.local" diff --git a/executable_dot_zshrc b/executable_dot_zshrc index df7c0ea..587d204 100644 --- a/executable_dot_zshrc +++ b/executable_dot_zshrc @@ -63,9 +63,49 @@ COMPLETION_WAITING_DOTS="true" ZSH_AUTOSUGGEST_MANUAL_REBIND="true" # fix home end and delete buttons -bindkey "${terminfo[khome]}" beginning-of-line -bindkey "${terminfo[kend]}" end-of-line -bindkey "${terminfo[kdch1]}" delete-char +# create a zkbd compatible hash; +# to add other keys to this hash, see: man 5 terminfo +typeset -g -A key + +key[Home]="${terminfo[khome]}" +key[End]="${terminfo[kend]}" +key[Insert]="${terminfo[kich1]}" +key[Backspace]="${terminfo[kbs]}" +key[Delete]="${terminfo[kdch1]}" +key[Up]="${terminfo[kcuu1]}" +key[Down]="${terminfo[kcud1]}" +key[Left]="${terminfo[kcub1]}" +key[Right]="${terminfo[kcuf1]}" +key[PageUp]="${terminfo[kpp]}" +key[PageDown]="${terminfo[knp]}" +key[Shift-Tab]="${terminfo[kcbt]}" + +# setup key accordingly +[[ -n "${key[Home]}" ]] && bindkey -- "${key[Home]}" beginning-of-line +[[ -n "${key[End]}" ]] && bindkey -- "${key[End]}" end-of-line +[[ -n "${key[Insert]}" ]] && bindkey -- "${key[Insert]}" overwrite-mode +[[ -n "${key[Backspace]}" ]] && bindkey -- "${key[Backspace]}" backward-delete-char +[[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}" delete-char +[[ -n "${key[Up]}" ]] && bindkey -- "${key[Up]}" up-line-or-history +[[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-history +[[ -n "${key[Left]}" ]] && bindkey -- "${key[Left]}" backward-char +[[ -n "${key[Right]}" ]] && bindkey -- "${key[Right]}" forward-char +[[ -n "${key[PageUp]}" ]] && bindkey -- "${key[PageUp]}" beginning-of-buffer-or-history +[[ -n "${key[PageDown]}" ]] && bindkey -- "${key[PageDown]}" end-of-buffer-or-history +[[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}" reverse-menu-complete + +# Finally, make sure the terminal is in application mode, when zle is +# active. Only then are the values from $terminfo valid. +if (( ${+terminfo[smkx]} && ${+terminfo[rmkx]} )); then + autoload -Uz add-zle-hook-widget + function zle_application_mode_start { echoti smkx } + function zle_application_mode_stop { echoti rmkx } + add-zle-hook-widget -Uz zle-line-init zle_application_mode_start + add-zle-hook-widget -Uz zle-line-finish zle_application_mode_stop +fi +#bindkey "${terminfo[khome]}" beginning-of-line +#bindkey "${terminfo[kend]}" end-of-line +#bindkey "${terminfo[kdch1]}" delete-char #if ! checkCommand gum && checkCommand go; then # # TODO