From 207f441b23c51eb33f4c26fde7208e1a6e6fed72 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 9 Sep 2016 16:13:16 +0200 Subject: zsh: Simplify prompt Remove pure and git information --- tag-zsh/config/zsh/zshrc | 44 ++++++++++---------------------------------- 1 file changed, 10 insertions(+), 34 deletions(-) diff --git a/tag-zsh/config/zsh/zshrc b/tag-zsh/config/zsh/zshrc index d7da3da..00915ea 100644 --- a/tag-zsh/config/zsh/zshrc +++ b/tag-zsh/config/zsh/zshrc @@ -2,8 +2,6 @@ source $ZPLUG_HOME/init.zsh zplug "zsh-users/zsh-completions" -zplug "mafredri/zsh-async", use:async.zsh, if:"[[ $TERM != \"dumb\" ]]" -zplug "sindresorhus/pure", on:"mafredri/zsh-async", as:plugin, use:pure.zsh, if:"[[ $TERM != \"dumb\" ]]" zplug "Tarrasch/zsh-autoenv", as:plugin zplug "clvv/fasd", hook-build:"PREFIX=$HOME make install" zplug "alanpearce/zsh-directory-history", at:"dirlog-as-zsh-function", as:command, use:"dirhist" @@ -110,11 +108,6 @@ then AUTOENV_LOOK_UPWARDS=1 fi -if zplug check sindresorhus/pure -then - PURE_GIT_PULL=0 -fi - if zplug check gerges/oh-my-zsh-jira-plus then JIRA_RAPID_BOARD=true @@ -135,34 +128,17 @@ if [[ $TERM == "dumb" ]] then PROMPT="> " else - if zplug check sindresorhus/pure - then - autoload -Uz promptinit && promptinit - prompt pure &> /dev/null - else - autoload -Uz vcs_info - - zstyle ':vcs_info:*' enable git - zstyle ':vcs_info:*' use-simple true - # only export two msg variables from vcs_info - zstyle ':vcs_info:*' max-exports 2 - # vcs_info_msg_0_ = ' %b' (for branch) - # vcs_info_msg_1_ = 'x%R' git top level (%R), x-prefix prevents creation of a named path (AUTO_NAME_DIRS) - zstyle ':vcs_info:git*' formats ' %b' 'x%R' - zstyle ':vcs_info:git*' actionformats ' %b|%a' 'x%R' - - # show username@host if logged in through SSH - [[ "$SSH_CONNECTION" != '' ]] && prompt_pure_username=' %F{242}%n@%m%f' - - # show username@host if root, with username in white - [[ $UID -eq 0 ]] && prompt_pure_username=' %F{white}%n%f%F{242}@%m%f' - - setopt prompt_subst - setopt prompt_cr - PROMPT=' -%F{blue}%~%f%F{242}${vcs_info_msg_0_}%f${prompt_pure_username} + # show username@host if logged in through SSH + [[ "$SSH_CONNECTION" != '' ]] && prompt_pure_username=' %F{242}%n@%m%f' + + # show username@host if root, with username in white + [[ $UID -eq 0 ]] && prompt_pure_username=' %F{white}%n%f%F{242}@%m%f' + + setopt prompt_subst + setopt prompt_cr + PROMPT=' +%F{blue}%~%f${prompt_pure_username} %(?.%F{magenta}.%F{red})>%f ' - fi fi if zplug check clvv/fasd -- cgit 1.4.1