From e53667c7ee8d6fde268dfd48b308f0e38f729013 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 21 Aug 2014 00:14:54 +0200 Subject: [PATCH] Restore zsh config --- bash_profile => zsh/.bash_profile | 0 zprofile => zsh/.zprofile | 0 zsh/{ => .zsh}/functions/add-to-list | 0 zsh/{ => .zsh}/functions/add_to_list | 0 zsh/{ => .zsh}/functions/chpwd_show_todo | 0 zsh/{ => .zsh}/functions/chpwd_update_git_vars | 0 zsh/{ => .zsh}/functions/emacs-backward-kill-word | 0 zsh/{ => .zsh}/functions/env | 0 zsh/{ => .zsh}/functions/get_cnt | 0 zsh/{ => .zsh}/functions/insert-sudo | 0 zsh/{ => .zsh}/functions/line | 0 zsh/{ => .zsh}/functions/mailcount | 0 zsh/{ => .zsh}/functions/precmd_maybe_festival | 0 zsh/{ => .zsh}/functions/precmd_update_git_vars | 0 zsh/{ => .zsh}/functions/precmd_update_updates | 0 zsh/{ => .zsh}/functions/preexec_update_vars | 0 zsh/{ => .zsh}/functions/prompt | 0 zsh/{ => .zsh}/functions/prompt_git_info | 0 zsh/{ => .zsh}/functions/rprompt | 0 zsh/{ => .zsh}/functions/shorten-dir | 0 zsh/{ => .zsh}/functions/update_current_git_vars | 0 zsh/{ => .zsh}/functions/venv | 0 zsh/{ => .zsh}/functions/welcome | 0 zshrc => zsh/.zshrc | 14 +++++++++----- 24 files changed, 9 insertions(+), 5 deletions(-) rename bash_profile => zsh/.bash_profile (100%) rename zprofile => zsh/.zprofile (100%) rename zsh/{ => .zsh}/functions/add-to-list (100%) rename zsh/{ => .zsh}/functions/add_to_list (100%) rename zsh/{ => .zsh}/functions/chpwd_show_todo (100%) rename zsh/{ => .zsh}/functions/chpwd_update_git_vars (100%) rename zsh/{ => .zsh}/functions/emacs-backward-kill-word (100%) rename zsh/{ => .zsh}/functions/env (100%) rename zsh/{ => .zsh}/functions/get_cnt (100%) rename zsh/{ => .zsh}/functions/insert-sudo (100%) rename zsh/{ => .zsh}/functions/line (100%) rename zsh/{ => .zsh}/functions/mailcount (100%) rename zsh/{ => .zsh}/functions/precmd_maybe_festival (100%) rename zsh/{ => .zsh}/functions/precmd_update_git_vars (100%) rename zsh/{ => .zsh}/functions/precmd_update_updates (100%) rename zsh/{ => .zsh}/functions/preexec_update_vars (100%) rename zsh/{ => .zsh}/functions/prompt (100%) rename zsh/{ => .zsh}/functions/prompt_git_info (100%) rename zsh/{ => .zsh}/functions/rprompt (100%) rename zsh/{ => .zsh}/functions/shorten-dir (100%) rename zsh/{ => .zsh}/functions/update_current_git_vars (100%) rename zsh/{ => .zsh}/functions/venv (100%) rename zsh/{ => .zsh}/functions/welcome (100%) rename zshrc => zsh/.zshrc (90%) diff --git a/bash_profile b/zsh/.bash_profile similarity index 100% rename from bash_profile rename to zsh/.bash_profile diff --git a/zprofile b/zsh/.zprofile similarity index 100% rename from zprofile rename to zsh/.zprofile diff --git a/zsh/functions/add-to-list b/zsh/.zsh/functions/add-to-list similarity index 100% rename from zsh/functions/add-to-list rename to zsh/.zsh/functions/add-to-list diff --git a/zsh/functions/add_to_list b/zsh/.zsh/functions/add_to_list similarity index 100% rename from zsh/functions/add_to_list rename to zsh/.zsh/functions/add_to_list diff --git a/zsh/functions/chpwd_show_todo b/zsh/.zsh/functions/chpwd_show_todo similarity index 100% rename from zsh/functions/chpwd_show_todo rename to zsh/.zsh/functions/chpwd_show_todo diff --git a/zsh/functions/chpwd_update_git_vars b/zsh/.zsh/functions/chpwd_update_git_vars similarity index 100% rename from zsh/functions/chpwd_update_git_vars rename to zsh/.zsh/functions/chpwd_update_git_vars diff --git a/zsh/functions/emacs-backward-kill-word b/zsh/.zsh/functions/emacs-backward-kill-word similarity index 100% rename from zsh/functions/emacs-backward-kill-word rename to zsh/.zsh/functions/emacs-backward-kill-word diff --git a/zsh/functions/env b/zsh/.zsh/functions/env similarity index 100% rename from zsh/functions/env rename to zsh/.zsh/functions/env diff --git a/zsh/functions/get_cnt b/zsh/.zsh/functions/get_cnt similarity index 100% rename from zsh/functions/get_cnt rename to zsh/.zsh/functions/get_cnt diff --git a/zsh/functions/insert-sudo b/zsh/.zsh/functions/insert-sudo similarity index 100% rename from zsh/functions/insert-sudo rename to zsh/.zsh/functions/insert-sudo diff --git a/zsh/functions/line b/zsh/.zsh/functions/line similarity index 100% rename from zsh/functions/line rename to zsh/.zsh/functions/line diff --git a/zsh/functions/mailcount b/zsh/.zsh/functions/mailcount similarity index 100% rename from zsh/functions/mailcount rename to zsh/.zsh/functions/mailcount diff --git a/zsh/functions/precmd_maybe_festival b/zsh/.zsh/functions/precmd_maybe_festival similarity index 100% rename from zsh/functions/precmd_maybe_festival rename to zsh/.zsh/functions/precmd_maybe_festival diff --git a/zsh/functions/precmd_update_git_vars b/zsh/.zsh/functions/precmd_update_git_vars similarity index 100% rename from zsh/functions/precmd_update_git_vars rename to zsh/.zsh/functions/precmd_update_git_vars diff --git a/zsh/functions/precmd_update_updates b/zsh/.zsh/functions/precmd_update_updates similarity index 100% rename from zsh/functions/precmd_update_updates rename to zsh/.zsh/functions/precmd_update_updates diff --git a/zsh/functions/preexec_update_vars b/zsh/.zsh/functions/preexec_update_vars similarity index 100% rename from zsh/functions/preexec_update_vars rename to zsh/.zsh/functions/preexec_update_vars diff --git a/zsh/functions/prompt b/zsh/.zsh/functions/prompt similarity index 100% rename from zsh/functions/prompt rename to zsh/.zsh/functions/prompt diff --git a/zsh/functions/prompt_git_info b/zsh/.zsh/functions/prompt_git_info similarity index 100% rename from zsh/functions/prompt_git_info rename to zsh/.zsh/functions/prompt_git_info diff --git a/zsh/functions/rprompt b/zsh/.zsh/functions/rprompt similarity index 100% rename from zsh/functions/rprompt rename to zsh/.zsh/functions/rprompt diff --git a/zsh/functions/shorten-dir b/zsh/.zsh/functions/shorten-dir similarity index 100% rename from zsh/functions/shorten-dir rename to zsh/.zsh/functions/shorten-dir diff --git a/zsh/functions/update_current_git_vars b/zsh/.zsh/functions/update_current_git_vars similarity index 100% rename from zsh/functions/update_current_git_vars rename to zsh/.zsh/functions/update_current_git_vars diff --git a/zsh/functions/venv b/zsh/.zsh/functions/venv similarity index 100% rename from zsh/functions/venv rename to zsh/.zsh/functions/venv diff --git a/zsh/functions/welcome b/zsh/.zsh/functions/welcome similarity index 100% rename from zsh/functions/welcome rename to zsh/.zsh/functions/welcome diff --git a/zshrc b/zsh/.zshrc similarity index 90% rename from zshrc rename to 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