From 9f810eec6a98011b551c40f8686b88a4fb0b0862 Mon Sep 17 00:00:00 2001 From: neodarz Date: Mon, 9 Sep 2019 07:02:56 +0200 Subject: Add zsh config --- dotfiles/zsh/functions/chpwd_update_git_vars | 1 + dotfiles/zsh/functions/precmd_update_git_vars | 4 ++++ dotfiles/zsh/functions/preexec_update_git_vars | 5 +++++ dotfiles/zsh/functions/prompt_git_info | 21 +++++++++++++++++ dotfiles/zsh/functions/update_current_git_vars | 31 ++++++++++++++++++++++++++ 5 files changed, 62 insertions(+) create mode 100755 dotfiles/zsh/functions/chpwd_update_git_vars create mode 100755 dotfiles/zsh/functions/precmd_update_git_vars create mode 100755 dotfiles/zsh/functions/preexec_update_git_vars create mode 100755 dotfiles/zsh/functions/prompt_git_info create mode 100755 dotfiles/zsh/functions/update_current_git_vars (limited to 'dotfiles/zsh/functions') diff --git a/dotfiles/zsh/functions/chpwd_update_git_vars b/dotfiles/zsh/functions/chpwd_update_git_vars new file mode 100755 index 0000000..2cc7ffa --- /dev/null +++ b/dotfiles/zsh/functions/chpwd_update_git_vars @@ -0,0 +1 @@ +update_current_git_vars \ No newline at end of file diff --git a/dotfiles/zsh/functions/precmd_update_git_vars b/dotfiles/zsh/functions/precmd_update_git_vars new file mode 100755 index 0000000..7fa32df --- /dev/null +++ b/dotfiles/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/dotfiles/zsh/functions/preexec_update_git_vars b/dotfiles/zsh/functions/preexec_update_git_vars new file mode 100755 index 0000000..998de21 --- /dev/null +++ b/dotfiles/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/dotfiles/zsh/functions/prompt_git_info b/dotfiles/zsh/functions/prompt_git_info new file mode 100755 index 0000000..d6d3acb --- /dev/null +++ b/dotfiles/zsh/functions/prompt_git_info @@ -0,0 +1,21 @@ +if [ -n "$__CURRENT_GIT_BRANCH" ]; then + local s="${USER_LEVEL}-[%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+="${USER_LEVEL}]" + + printf "%s%s" $s +fi \ No newline at end of file diff --git a/dotfiles/zsh/functions/update_current_git_vars b/dotfiles/zsh/functions/update_current_git_vars new file mode 100755 index 0000000..716d984 --- /dev/null +++ b/dotfiles/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