X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/71cb488302f217503db64f5b098d2939485b3266..refs/heads/main:/zsh/modules/prompt.zsh?ds=inline diff --git a/zsh/modules/prompt.zsh b/zsh/modules/prompt.zsh index beeb85d..615ca95 100644 --- a/zsh/modules/prompt.zsh +++ b/zsh/modules/prompt.zsh @@ -1,57 +1,9 @@ autoload -Uz promptinit && promptinit -function tool_versions() { - if [[ -s ".tool-versions" ]]; then - echo '.tool-versions' - return - fi - echo "${HOME}/.tool-versions" -} - if [[ "$TERM" == (dumb|linux|*bsd*) ]] || (( $#prompt_argv < 1 )); then prompt 'off' fi -# -# Precmd -# - -function prompt_precmd { - git-info -} - -# -# Functions -# - -function env_info_provider() { echo "%{%F{green}%}n/a"; } -function env_info { - echo "[%{%F{cyan}%}ENV%{%F{black}%} $(env_info_provider)%{%F{black}%}]" -} - -function python_info { - pythoninfo=`cat "$(tool_versions)" | rg python | cut -d ' ' -f 2` - pythoninfo=${ASDF_PYTHON_VERSION:-$pythoninfo} - venv="${VIRTUAL_ENV##*/}" - echo "%{%F{green}%}py%{%F{black}%} ${pythoninfo:-no}@${venv:-default}" -} - -function ruby_info { - rubyinfo=`cat "$(tool_versions)" | rg ruby | cut -d ' ' -f 2` - rubyinfo=${ASDF_RUBY_VERSION:-$rubyinfo} - echo "%{%F{red}%}rb%{%F{black}%} ${rubyinfo:-no}" -} - -function node_info { - nodeinfo=`cat "$(tool_versions)" | rg nodejs | cut -d ' ' -f 2` - nodeinfo=${ASDF_NODEJS_VERSION:-$nodeinfo} - echo "%{%F{yellow}%}js%{%F{black}%} ${nodeinfo:-no}" -} - -function box_name { - [ -f ~/.box-name ] && cat ~/.box-name || hostname -s -} - # # ZLE widgets # @@ -92,24 +44,11 @@ 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}%}$(env_info) $(node_info) $(ruby_info) $(python_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 "$@"