diff options
author | Tom Willemsen | 2013-04-11 15:37:01 +0200 |
---|---|---|
committer | Tom Willemsen | 2013-04-11 15:37:01 +0200 |
commit | 55ca176cd5022d2fc35bc2c06d5f9a764315f238 (patch) | |
tree | 3ee9e0df6dced4282af9116a8c93d888e30b7213 /.zshrc | |
parent | caf0ec0fb16b3f911d5d596766ee3048fe07fa66 (diff) | |
parent | 9ab70194a65f1d7ab726aaacdb43a58a02a048b6 (diff) | |
download | dotfiles-55ca176cd5022d2fc35bc2c06d5f9a764315f238.tar.gz dotfiles-55ca176cd5022d2fc35bc2c06d5f9a764315f238.zip |
Merge remote-tracking branch 'ryuslash/drd' into phoenix
Conflicts:
.config/herbstluftwm/autostart
.emacs.d/init.el
.xinitrc
.zprofile
Makefile
xmonad/xmonad.hs
Diffstat (limited to '.zshrc')
-rw-r--r-- | .zshrc | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -33,6 +33,7 @@ alias mysql="mysql --pager" # Suffix aliases alias -s pdf="zathura" +alias -s xls="libreoffice" setopt notify setopt PROMPT_SUBST # Allow for functions in the prompt @@ -52,17 +53,14 @@ add-zsh-hook precmd precmd_maybe_festival add-zsh-hook precmd vcs_info add-zsh-hook chpwd chpwd_update_git_vars -zstyle ':vcs_info:*' actionformats '%F{2}(%f%s %r %b%F{2})%f %a - %S' +zstyle ':vcs_info:*' actionformats '%B%F{5}%a%f%%b %s:%r-%b %S' zstyle ':vcs_info:*' enable bzr git hg svn -zstyle ':vcs_info:*' formats '%F{2}(%f%s %r %b%F{2})%f - %S' -zstyle ':vcs_info:*' nvcsformats ' - %~' +zstyle ':vcs_info:*' formats '%s:%r-%b %S' +zstyle ':vcs_info:*' nvcsformats '%~' zstyle ':vcs_info:bzr:*' branchformat '%b' # Set the prompt. -PROMPT='%F{1}(%F{2}(%f%m %l%F{2})%f ${vcs_info_msg_0_}%F{1})%f %# ' +PROMPT='%B%(?.%F{2}+.%F{1}-) %F{6}%m%b%f ${vcs_info_msg_0_} %# ' # Set terminal name to current running application case $TERM in |