24 files changed, 9 insertions, 5 deletions
diff --git a/bash_profile b/zsh/.bash_profile
index c1abe3f..c1abe3f 120000
--- a/bash_profile
+++ b/zsh/.bash_profile
diff --git a/zprofile b/zsh/.zprofile
index 290b7c1..290b7c1 100644
--- a/zprofile
+++ b/zsh/.zprofile
diff --git a/zsh/functions/add-to-list b/zsh/.zsh/functions/add-to-list
index 18720e0..18720e0 100644
--- a/zsh/functions/add-to-list
+++ b/zsh/.zsh/functions/add-to-list
diff --git a/zsh/functions/add_to_list b/zsh/.zsh/functions/add_to_list
index 801e662..801e662 100644
--- a/zsh/functions/add_to_list
+++ b/zsh/.zsh/functions/add_to_list
diff --git a/zsh/functions/chpwd_show_todo b/zsh/.zsh/functions/chpwd_show_todo
index 88ee853..88ee853 100644
--- a/zsh/functions/chpwd_show_todo
+++ b/zsh/.zsh/functions/chpwd_show_todo
diff --git a/zsh/functions/chpwd_update_git_vars b/zsh/.zsh/functions/chpwd_update_git_vars
index 0ef846a..0ef846a 100644
--- a/zsh/functions/chpwd_update_git_vars
+++ b/zsh/.zsh/functions/chpwd_update_git_vars
diff --git a/zsh/functions/emacs-backward-kill-word b/zsh/.zsh/functions/emacs-backward-kill-word
index 8453454..8453454 100644
--- a/zsh/functions/emacs-backward-kill-word
+++ b/zsh/.zsh/functions/emacs-backward-kill-word
diff --git a/zsh/functions/env b/zsh/.zsh/functions/env
index a79fd5d..a79fd5d 100644
--- a/zsh/functions/env
+++ b/zsh/.zsh/functions/env
diff --git a/zsh/functions/get_cnt b/zsh/.zsh/functions/get_cnt
index 5fc3d4f..5fc3d4f 100644
--- a/zsh/functions/get_cnt
+++ b/zsh/.zsh/functions/get_cnt
diff --git a/zsh/functions/insert-sudo b/zsh/.zsh/functions/insert-sudo
index 4fc68e6..4fc68e6 100644
--- a/zsh/functions/insert-sudo
+++ b/zsh/.zsh/functions/insert-sudo
diff --git a/zsh/functions/line b/zsh/.zsh/functions/line
index 58f7aed..58f7aed 100644
--- a/zsh/functions/line
+++ b/zsh/.zsh/functions/line
diff --git a/zsh/functions/mailcount b/zsh/.zsh/functions/mailcount
index afe6736..afe6736 100755
--- a/zsh/functions/mailcount
+++ b/zsh/.zsh/functions/mailcount
diff --git a/zsh/functions/precmd_maybe_festival b/zsh/.zsh/functions/precmd_maybe_festival
index 3f8baa3..3f8baa3 100644
--- a/zsh/functions/precmd_maybe_festival
+++ b/zsh/.zsh/functions/precmd_maybe_festival
diff --git a/zsh/functions/precmd_update_git_vars b/zsh/.zsh/functions/precmd_update_git_vars
index 172456a..172456a 100644
--- a/zsh/functions/precmd_update_git_vars
+++ b/zsh/.zsh/functions/precmd_update_git_vars
diff --git a/zsh/functions/precmd_update_updates b/zsh/.zsh/functions/precmd_update_updates
index 639fd5c..639fd5c 100644
--- a/zsh/functions/precmd_update_updates
+++ b/zsh/.zsh/functions/precmd_update_updates
diff --git a/zsh/functions/preexec_update_vars b/zsh/.zsh/functions/preexec_update_vars
index f8c1b44..f8c1b44 100644
--- a/zsh/functions/preexec_update_vars
+++ b/zsh/.zsh/functions/preexec_update_vars
diff --git a/zsh/functions/prompt b/zsh/.zsh/functions/prompt
index 6fe927b..6fe927b 100644
--- a/zsh/functions/prompt
+++ b/zsh/.zsh/functions/prompt
diff --git a/zsh/functions/prompt_git_info b/zsh/.zsh/functions/prompt_git_info
index 76d889a..76d889a 100644
--- a/zsh/functions/prompt_git_info
+++ b/zsh/.zsh/functions/prompt_git_info
diff --git a/zsh/functions/rprompt b/zsh/.zsh/functions/rprompt
index 3392379..3392379 100644
--- a/zsh/functions/rprompt
+++ b/zsh/.zsh/functions/rprompt
diff --git a/zsh/functions/shorten-dir b/zsh/.zsh/functions/shorten-dir
index a630971..a630971 100644
--- a/zsh/functions/shorten-dir
+++ b/zsh/.zsh/functions/shorten-dir
diff --git a/zsh/functions/update_current_git_vars b/zsh/.zsh/functions/update_current_git_vars
index 71f37e7..71f37e7 100644
--- a/zsh/functions/update_current_git_vars
+++ b/zsh/.zsh/functions/update_current_git_vars
diff --git a/zsh/functions/venv b/zsh/.zsh/functions/venv
index 03ec83d..03ec83d 100644
--- a/zsh/functions/venv
+++ b/zsh/.zsh/functions/venv
diff --git a/zsh/functions/welcome b/zsh/.zsh/functions/welcome
index bd6aacd..bd6aacd 100644
--- a/zsh/functions/welcome
+++ b/zsh/.zsh/functions/welcome
diff --git a/zshrc b/zsh/.zshrc
index 6eea812..5083a19 100644
--- a/zshrc
+++ b/zsh/.zshrc
@@ -30,6 +30,7 @@ alias grep="grep --color=always"
 alias ls="ls -F --color=always"
 alias mysql="mysql --pager"
 alias sbcl="rlwrap sbcl"
+alias scrot="/usr/bin/scrot -e 'mv \$f ~/pictures/screenshots/'"
 
 # Suffix aliases
 alias -s pdf="zathura"
@@ -51,15 +52,18 @@ typeset -ga chpwd_functions
 
 add-zsh-hook precmd vcs_info
 
-zstyle ':vcs_info:*' actionformats '%B%F{1}%a%f%%b (%F{3}%s%f) %F{5}%r%f:%F{4}%b%f %F{2}%S%f'
+zstyle ':vcs_info:*' actionformats '%u%c %B%F{1}%a%f%%b (%F{3}%s%f) %F{5}%r%f:%F{4}%b%f %F{2}%S%f'
 zstyle ':vcs_info:*' enable bzr git hg svn
-zstyle ':vcs_info:*' formats '(%F{3}%s%f) %F{5}%r%f:%F{4}%b%f %F{2}%S%f'
+zstyle ':vcs_info:*' formats '%u%c (%F{3}%s%f) %F{5}%r%f:%F{4}%b%f %F{2}%S%f'
 zstyle ':vcs_info:*' nvcsformats '%F{2}%~%f'
 zstyle ':vcs_info:bzr:*' branchformat '%b'
+zstyle ':vcs_info:git:*' check-for-changes 1
+zstyle ':vcs_info:*' stagedstr '%F{2}Δ%f'
+zstyle ':vcs_info:*' unstagedstr '%F{1}Δ%f'
 
 # Set the prompt.
 PROMPT='${vcs_info_msg_0_}
-%B%F{6}%m%b%f %B%(?.%F{2}+.%F{1}-)%b> '
+%B%(?.%F{2}.%F{1})→%b '
 
 # Set terminal name to current running application
 case $TERM in
@@ -69,8 +73,8 @@ case $TERM in
         precmd () { print -P "\eAnSiTu %n\n\eAnSiTc %~" }
         ;;
     rxvt*)
-        precmd () { print -Pn "\e]0;%~\a" }
-        preexec () { print -Pn "\e]0;$1\a" }
+        precmd () { print -Pn "\e]0;%m: %~\a" }
+        preexec () { print -Pn "\e]0;%m: $1\a" }
         ;;
     screen)
         # Make screen show the current running command as window title