From 56560fd597f94dfe6fe5fa79648398ab29d05775 Mon Sep 17 00:00:00 2001 From: xero Date: Mon, 14 Jul 2014 13:23:05 -0400 Subject: updated repo to manage dotfiles via gnu stow, the symlink farm manager. happy birthday commit! :birthday: :sparkles: --- zsh/.zsh/colored-man-pages.zsh | 8 ++++++++ zsh/.zsh/functions/chpwd_update_git_vars | 1 + zsh/.zsh/functions/precmd_update_git_vars | 4 ++++ zsh/.zsh/functions/preexec_update_git_vars | 5 +++++ zsh/.zsh/functions/prompt_git_info | 21 ++++++++++++++++++++ zsh/.zsh/functions/update_current_git_vars | 31 ++++++++++++++++++++++++++++++ 6 files changed, 70 insertions(+) create mode 100644 zsh/.zsh/colored-man-pages.zsh create mode 100644 zsh/.zsh/functions/chpwd_update_git_vars create mode 100644 zsh/.zsh/functions/precmd_update_git_vars create mode 100644 zsh/.zsh/functions/preexec_update_git_vars create mode 100644 zsh/.zsh/functions/prompt_git_info create mode 100644 zsh/.zsh/functions/update_current_git_vars (limited to 'zsh/.zsh') diff --git a/zsh/.zsh/colored-man-pages.zsh b/zsh/.zsh/colored-man-pages.zsh new file mode 100644 index 0000000..6854d97 --- /dev/null +++ b/zsh/.zsh/colored-man-pages.zsh @@ -0,0 +1,8 @@ +#█▓▒░ source: https://github.com/imkira/dotfiles/blob/master/.zsh/colored-man-pages.zsh +export LESS_TERMCAP_mb=$'\E[01;31m' +export LESS_TERMCAP_md=$'\E[01;38;5;74m' +export LESS_TERMCAP_me=$'\E[0m' +export LESS_TERMCAP_se=$'\E[0m' +export LESS_TERMCAP_so=$'\E[38;33;246m' +export LESS_TERMCAP_ue=$'\E[0m' +export LESS_TERMCAP_us=$'\E[04;38;5;146m' diff --git a/zsh/.zsh/functions/chpwd_update_git_vars b/zsh/.zsh/functions/chpwd_update_git_vars new file mode 100644 index 0000000..2cc7ffa --- /dev/null +++ b/zsh/.zsh/functions/chpwd_update_git_vars @@ -0,0 +1 @@ +update_current_git_vars \ No newline at end of file diff --git a/zsh/.zsh/functions/precmd_update_git_vars b/zsh/.zsh/functions/precmd_update_git_vars new file mode 100644 index 0000000..7fa32df --- /dev/null +++ b/zsh/.zsh/functions/precmd_update_git_vars @@ -0,0 +1,4 @@ +if [ -n "$__EXECUTED_GIT_COMMAND" ]; then + update_current_git_vars + unset __EXECUTED_GIT_COMMAND +fi \ No newline at end of file diff --git a/zsh/.zsh/functions/preexec_update_git_vars b/zsh/.zsh/functions/preexec_update_git_vars new file mode 100644 index 0000000..998de21 --- /dev/null +++ b/zsh/.zsh/functions/preexec_update_git_vars @@ -0,0 +1,5 @@ +case "$1" in + git*) + __EXECUTED_GIT_COMMAND=1 + ;; +esac \ No newline at end of file diff --git a/zsh/.zsh/functions/prompt_git_info b/zsh/.zsh/functions/prompt_git_info new file mode 100644 index 0000000..d492ac8 --- /dev/null +++ b/zsh/.zsh/functions/prompt_git_info @@ -0,0 +1,21 @@ +if [ -n "$__CURRENT_GIT_BRANCH" ]; then + local s="%F{cyan}-[%F{white}" + s+="$__CURRENT_GIT_BRANCH" + case "$__CURRENT_GIT_BRANCH_STATUS" in + ahead) + s+="↑" + ;; + diverged) + s+="↕" + ;; + behind) + s+="↓" + ;; + esac + if [ -n "$__CURRENT_GIT_BRANCH_IS_DIRTY" ]; then + s+="⚡" + fi + s+="%F{cyan}]" + + printf "%s%s" $s +fi \ No newline at end of file diff --git a/zsh/.zsh/functions/update_current_git_vars b/zsh/.zsh/functions/update_current_git_vars new file mode 100644 index 0000000..716d984 --- /dev/null +++ b/zsh/.zsh/functions/update_current_git_vars @@ -0,0 +1,31 @@ +unset __CURRENT_GIT_BRANCH +unset __CURRENT_GIT_BRANCH_STATUS +unset __CURRENT_GIT_BRANCH_IS_DIRTY + +local st="$(git status 2>/dev/null)" +local st2="$(git log -1 --pretty=%h 2>/dev/null)" + +if [[ -n "$st" ]]; then + local -a arr + arr=(${(f)st}) + + if [[ $arr[1] =~ 'Not currently on any branch.' ]]; then + __CURRENT_GIT_BRANCH="$st2" + else + __CURRENT_GIT_BRANCH="${arr[1][(w)4]}"; + fi + + if [[ $arr[2] =~ 'Your branch is' ]]; then + if [[ $arr[2] =~ 'ahead' ]]; then + __CURRENT_GIT_BRANCH_STATUS='ahead' + elif [[ $arr[2] =~ 'diverged' ]]; then + __CURRENT_GIT_BRANCH_STATUS='diverged' + else + __CURRENT_GIT_BRANCH_STATUS='behind' + fi + fi + + if [[ ! $st =~ 'nothing to commit' ]]; then + __CURRENT_GIT_BRANCH_IS_DIRTY='1' + fi +fi \ No newline at end of file -- cgit v1.2.1