epiloque theme

11 years ago · 5af1834622
parent 11a1d27e61
commit 5af1834622
2 changed files with 118 additions and 121 deletions
--- a/modules/prompt/functions/prompt_epiloque_setup
+++ b/modules/prompt/functions/prompt_epiloque_setup
@ -0,0 +1,118 @@
+# epiloque by Mark Milstein
+# mod of pure by Sindre Sorhus https://github.com/sindresorhus/pure
+# MIT License
+
+# For my own and others sanity
+# git:
+# %b => current branch
+# %a => current action (rebase/merge)
+# prompt:
+# %F => color dict
+# %f => reset color
+# %~ => current path
+# %* => time
+# %n => username
+# %m => shortname host
+# %(?..) => prompt conditional - %(condition.true.false)
+
+
+# turns seconds into human readable time
+# 165392 => 1d 21h 56m 32s
+prompt_epiloque_human_time() {
+        local tmp=$1
+        local days=$(( tmp / 60 / 60 / 24 ))
+        local hours=$(( tmp / 60 / 60 % 24 ))
+        local minutes=$(( tmp / 60 % 60 ))
+        local seconds=$(( tmp % 60 ))
+        (( $days > 0 )) && echo -n "${days}d "
+        (( $hours > 0 )) && echo -n "${hours}h "
+        (( $minutes > 0 )) && echo -n "${minutes}m "
+        echo "${seconds}s "
+}
+
+# fastest possible way to check if repo is dirty
+prompt_epiloque_git_dirty() {
+        # check if we're in a git repo
+        command git rev-parse --is-inside-work-tree &>/dev/null || return
+        # check if it's dirty
+        command git diff --quiet --ignore-submodules HEAD &>/dev/null
+
+        (($? == 1)) && echo '*'
+}
+
+# displays the exec time of the last command if set threshold was exceeded
+prompt_epiloque_cmd_exec_time() {
+        local stop=$EPOCHSECONDS
+        local start=${cmd_timestamp:-$stop}
+        integer elapsed=$stop-$start
+        (($elapsed > ${epiloque_CMD_MAX_EXEC_TIME:=5})) && prompt_epiloque_human_time $elapsed
+}
+
+prompt_epiloque_preexec() {
+        cmd_timestamp=$EPOCHSECONDS
+
+        # shows the current dir and executed command in the title when a process is active
+        print -Pn "\e]0;"
+        echo -nE "$PWD:t: $2"
+        print -Pn "\a"
+}
+
+prompt_epiloque_precmd() {
+        # git info
+        vcs_info
+
+        local VIRTUAL_ENV_PROMPT_PREFIX="%F{blue}‹%F{black}"
+        local VIRTUAL_ENV_PROMPT_SUFFIX="%F{blue}› %f"
+        local PYENV_PROMPT_PREFIX='%F{blue}‹%F{black}'
+        local PYENV_PROMPT_SUFFIX="%F{blue}› %f"
+
+        if which pyenv &> /dev/null
+        then
+            local pyenv_version=$(pyenv version | awk '{print $1}')
+            if [ -n "$pyenv_version" ]; then
+                local pyenv_prompt="$PYENV_PROMPT_PREFIX$pyenv_version$PYENV_PROMPT_SUFFIX"
+            fi
+        fi
+
+        if [ -n "$VIRTUAL_ENV" ]; then
+            if [ -f "$VIRTUAL_ENV/__name__" ]; then
+                local name=`cat $VIRTUAL_ENV/__name__`
+            elif [ `basename $VIRTUAL_ENV` = "__" ]; then
+                local name=$(basename $(dirname $VIRTUAL_ENV))
+            else
+                local name=$(basename $VIRTUAL_ENV)
+            fi
+            local virtual_env_prompt="$VIRTUAL_ENV_PROMPT_PREFIX$name$VIRTUAL_ENV_PROMPT_SUFFIX"
+        fi
+
+        prompt_epiloque_preprompt="$prompt_epiloque_username%f %F{blue}%~%F{242}$vcs_info_msg_0_`prompt_epiloque_git_dirty` %F{yellow}`prompt_epiloque_cmd_exec_time`%f"
+        prompt_epiloque_prerprompt="$virtual_env_prompt$pyenv_prompt"
+        # reset value since `preexec` isn't always triggered
+        unset cmd_timestamp
+}
+
+prompt_epiloque_setup() {
+        # prevent percentage showing up
+        # if output doesn't end with a newline
+        export PROMPT_EOL_MARK=''
+
+        prompt_opts=(cr subst percent)
+
+        zmodload zsh/datetime
+        autoload -Uz add-zsh-hook
+        autoload -Uz vcs_info
+
+        add-zsh-hook precmd prompt_epiloque_precmd
+        add-zsh-hook preexec prompt_epiloque_preexec
+
+        zstyle ':vcs_info:*' enable git
+        zstyle ':vcs_info:git*' formats ' %b'
+        zstyle ':vcs_info:git*' actionformats ' %b|%a'
+
+        prompt_epiloque_username='%n@%m'
+        # prompt turns red if the previous command didn't exit with 0
+        PROMPT='$prompt_epiloque_preprompt%(?.%F{magenta}.%F{red})¬%f '
+        RPROMPT='%{${fg[black]}%}$prompt_epiloque_prerprompt%{${reset_color}%}'
+}
+
+prompt_epiloque_setup "$@"
--- a/modules/prompt/functions/prompt_pure_setup
+++ b/modules/prompt/functions/prompt_pure_setup
@ -1,121 +0,0 @@
-# Pure
-# by Sindre Sorhus
-# https://github.com/sindresorhus/pure
-# MIT License
-
-# For my own and others sanity
-# git:
-# %b => current branch
-# %a => current action (rebase/merge)
-# prompt:
-# %F => color dict
-# %f => reset color
-# %~ => current path
-# %* => time
-# %n => username
-# %m => shortname host
-# %(?..) => prompt conditional - %(condition.true.false)
-
-
-# turns seconds into human readable time
-# 165392 => 1d 21h 56m 32s
-prompt_pure_human_time() {
-	local tmp=$1
-	local days=$(( tmp / 60 / 60 / 24 ))
-	local hours=$(( tmp / 60 / 60 % 24 ))
-	local minutes=$(( tmp / 60 % 60 ))
-	local seconds=$(( tmp % 60 ))
-	(( $days > 0 )) && echo -n "${days}d "
-	(( $hours > 0 )) && echo -n "${hours}h "
-	(( $minutes > 0 )) && echo -n "${minutes}m "
-	echo "${seconds}s"
-}
-
-# fastest possible way to check if repo is dirty
-prompt_pure_git_dirty() {
-	# check if we're in a git repo
-	command git rev-parse --is-inside-work-tree &>/dev/null || return
-	# check if it's dirty
-	command git diff --quiet --ignore-submodules HEAD &>/dev/null
-
-	(($? == 1)) && echo '*'
-}
-
-# displays the exec time of the last command if set threshold was exceeded
-prompt_pure_cmd_exec_time() {
-	local stop=$EPOCHSECONDS
-	local start=${cmd_timestamp:-$stop}
-	integer elapsed=$stop-$start
-	(($elapsed > ${PURE_CMD_MAX_EXEC_TIME:=5})) && prompt_pure_human_time $elapsed
-}
-
-prompt_pure_preexec() {
-	cmd_timestamp=$EPOCHSECONDS
-
-	# shows the current dir and executed command in the title when a process is active
-	print -Pn "\e]0;"
-	echo -nE "$PWD:t: $2"
-	print -Pn "\a"
-}
-
-# string length ignoring ansi escapes
-prompt_pure_string_length() {
-	echo ${#${(S%%)1//(\%([KF1]|)\{*\}|\%[Bbkf])}}
-}
-
-prompt_pure_precmd() {
-	# shows the full path in the title
-	print -Pn '\e]0;%~\a'
-
-	# git info
-	vcs_info
-
-	local prompt_pure_preprompt="\n%F{blue}%~%F{242}$vcs_info_msg_0_`prompt_pure_git_dirty` $prompt_pure_username%f %F{yellow}`prompt_pure_cmd_exec_time`%f"
-	print -P $prompt_pure_preprompt
-
-	# check async if there is anything to pull
-	(( ${PURE_GIT_PULL:-1} )) && {
-		# check if we're in a git repo
-		command git rev-parse --is-inside-work-tree &>/dev/null &&
-		# check check if there is anything to pull
-		command git fetch &>/dev/null &&
-		# check if there is an upstream configured for this branch
-		command git rev-parse --abbrev-ref @'{u}' &>/dev/null && {
-			local arrows=''
-			(( $(command git rev-list --right-only --count HEAD...@'{u}' 2>/dev/null) > 0 )) && arrows='⇣'
-			(( $(command git rev-list --left-only --count HEAD...@'{u}' 2>/dev/null) > 0 )) && arrows+='⇡'
-			print -Pn "\e7\e[A\e[1G\e[`prompt_pure_string_length $prompt_pure_preprompt`C%F{cyan}${arrows}%f\e8"
-		}
-	} &!
-
-	# reset value since `preexec` isn't always triggered
-	unset cmd_timestamp
-}
-
-
-prompt_pure_setup() {
-	# prevent percentage showing up
-	# if output doesn't end with a newline
-	export PROMPT_EOL_MARK=''
-
-	prompt_opts=(cr subst percent)
-
-	zmodload zsh/datetime
-	autoload -Uz add-zsh-hook
-	autoload -Uz vcs_info
-
-	add-zsh-hook precmd prompt_pure_precmd
-	add-zsh-hook preexec prompt_pure_preexec
-
-	zstyle ':vcs_info:*' enable git
-	zstyle ':vcs_info:git*' formats ' %b'
-	zstyle ':vcs_info:git*' actionformats ' %b|%a'
-
-	# show username@host if logged in through SSH
-	[[ "$SSH_CONNECTION" != '' ]] && prompt_pure_username='%n@%m '
-
-	# prompt turns red if the previous command didn't exit with 0
-	PROMPT='%(?.%F{magenta}.%F{red})❯%f '
-}
-
-prompt_pure_setup "$@"