X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/f88f2a1b9d2284c13f69030a94a72079320a7d4b..967de9a270bccf66da73eda4e17d78d41c4e14d6:/zsh/modules/prompt.zsh?ds=inline diff --git a/zsh/modules/prompt.zsh b/zsh/modules/prompt.zsh index f0a776d..615ca95 100644 --- a/zsh/modules/prompt.zsh +++ b/zsh/modules/prompt.zsh @@ -5,62 +5,28 @@ if [[ "$TERM" == (dumb|linux|*bsd*) ]] || (( $#prompt_argv < 1 )); then fi # -# Precmd -# - -function prompt_precmd { - git-info -} - -# -# Functions +# ZLE widgets # -function virtualenv_info { - if [[ -z "$VIRTUAL_ENV" ]]; then - venv="default" - else - venv="${VIRTUAL_ENV##*/}" - fi - echo "🐍${venv}" -} - -function rvm_info { - if [[ -z "$RUBY_VERSION" ]]; then - rvminfo="default" - else - rvminfo=`rvm-prompt` - fi - echo "💎${rvminfo}" -} +function zle-line-init zle-keymap-select { -function nvm_info { - if [[ -z "$NVM_BIN" ]]; then - nvminfo="default" - else - nvminfo=`nvm current` - fi - echo "💛${nvminfo}" -} + # Couldn't figure out how to get tmux and iTerm to agree on how to render + # these characters... so there you go. -function box_name { - [ -f ~/.box-name ] && cat ~/.box-name || hostname -s -} + local normal_symbol="N" + local insert_symbol="I" + local error_symbol="X" -# -# ZLE widgets -# + # Show vi status / return status on the right side -function zle-line-init zle-keymap-select { - local return_status="%{%F{red}%}%(?..🆇)%{$reset_color%}" + local return_status="%{%F{red}%}%(?.. $error_symbol)%{$reset_color%}" if [ $KEYMAP = 'vicmd' ]; then - local edit_status="%{%F{cyan}%}🅽" + local edit_status="%{%F{cyan}%}$normal_symbol" else - local edit_status="%{%F{green}%}🅸" + local edit_status="%{%F{green}%}$insert_symbol" fi - RPS1="${edit_status} ${return_status} %{$reset_color%}" - RPS2=$RPS1 + RPROMPT="${edit_status}${return_status}%{$reset_color%}" zle reset-prompt } zle -N zle-line-init @@ -78,25 +44,14 @@ function prompt_setup { # Load required functions. autoload -Uz add-zsh-hook - # Add hook for calling git-info before each command. - add-zsh-hook precmd prompt_precmd - - # Set git-info parameters. - zstyle ':git:info' verbose 'no' - zstyle ':git:info:branch' format '@%F{cyan}%b%f' - zstyle ':git:info:clean' format '' - zstyle ':git:info:added' format '%{%F{green}%}!' - zstyle ':git:info:modified' format '%{%F{green}%}?' - zstyle ':git:info:untracked' format '%{%F{magenta}%}?' - zstyle ':git:info:keys' format \ - 'prompt' '%b%a%m%u' - # Define prompts. PROMPT=' -%{%F{black}%}$(nvm_info) $(rvm_info) $(virtualenv_info) -%{%F{magenta}%}%n%{%f%}@%{%F{yellow}%}$(box_name)%{%f%} %{%B%F{green}%}${PWD/#$HOME/~}%{%f%b%}${git_info[prompt]} %{%f%} -%(?,,%{${%B%F{white}%}[%?]%{%f%b%} )$ ' +%{%F{black}%}$(env_info) $(node_info) $(rust_info) $(python_info) +%{%F{magenta}%}%n%{%f%}@%{%F{yellow}%}$(hostname -s)%{%f%} %{%B%F{green}%}${PWD/#$HOME/~}%{%f%b%}$(git_info)%{%f%} +%(?,,%{${%B%F{white}%}[%?]%{%f%b%} )%% ' } prompt_setup "$@" setopt PROMPT_SUBST +setopt PROMPT_PERCENT +setopt TRANSIENT_RPROMPT