From e6f7191cc1a770748805f78766822e603aa18738 Mon Sep 17 00:00:00 2001 From: xero Date: Thu, 1 Jan 2015 21:17:07 -0500 Subject: combine zsh user and root themes and files. install root theme with [sudo stow zsh -t /root] --- zsh-root/.zsh/functions/chpwd_update_git_vars | 1 - zsh-root/.zsh/functions/precmd_update_git_vars | 4 ---- zsh-root/.zsh/functions/preexec_update_git_vars | 5 ---- zsh-root/.zsh/functions/prompt_git_info | 21 ----------------- zsh-root/.zsh/functions/update_current_git_vars | 31 ------------------------- 5 files changed, 62 deletions(-) delete mode 100644 zsh-root/.zsh/functions/chpwd_update_git_vars delete mode 100644 zsh-root/.zsh/functions/precmd_update_git_vars delete mode 100644 zsh-root/.zsh/functions/preexec_update_git_vars delete mode 100644 zsh-root/.zsh/functions/prompt_git_info delete mode 100644 zsh-root/.zsh/functions/update_current_git_vars (limited to 'zsh-root/.zsh/functions') diff --git a/zsh-root/.zsh/functions/chpwd_update_git_vars b/zsh-root/.zsh/functions/chpwd_update_git_vars deleted file mode 100644 index 2cc7ffa..0000000 --- a/zsh-root/.zsh/functions/chpwd_update_git_vars +++ /dev/null @@ -1 +0,0 @@ -update_current_git_vars \ No newline at end of file diff --git a/zsh-root/.zsh/functions/precmd_update_git_vars b/zsh-root/.zsh/functions/precmd_update_git_vars deleted file mode 100644 index 7fa32df..0000000 --- a/zsh-root/.zsh/functions/precmd_update_git_vars +++ /dev/null @@ -1,4 +0,0 @@ -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-root/.zsh/functions/preexec_update_git_vars b/zsh-root/.zsh/functions/preexec_update_git_vars deleted file mode 100644 index 998de21..0000000 --- a/zsh-root/.zsh/functions/preexec_update_git_vars +++ /dev/null @@ -1,5 +0,0 @@ -case "$1" in - git*) - __EXECUTED_GIT_COMMAND=1 - ;; -esac \ No newline at end of file diff --git a/zsh-root/.zsh/functions/prompt_git_info b/zsh-root/.zsh/functions/prompt_git_info deleted file mode 100644 index d492ac8..0000000 --- a/zsh-root/.zsh/functions/prompt_git_info +++ /dev/null @@ -1,21 +0,0 @@ -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-root/.zsh/functions/update_current_git_vars b/zsh-root/.zsh/functions/update_current_git_vars deleted file mode 100644 index 716d984..0000000 --- a/zsh-root/.zsh/functions/update_current_git_vars +++ /dev/null @@ -1,31 +0,0 @@ -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