Update zsh themes

gerardbm · Dec 25, 2017 · f987e0b · f987e0b
1 parent 6da398e
commit f987e0b
Show file tree

Hide file tree

Showing 4 changed files with 237 additions and 65 deletions.
diff --git a/install.sh b/install.sh
@@ -61,9 +61,11 @@ for ARG in "$@"; do
 		dir_zsh="$HOME/.oh-my-zsh/themes/"
 		atomic_zsh1="$script_dir/zsh/atomic.zsh-theme"
 		atomic_zsh2="$script_dir/zsh/atomic-powerline.zsh-theme"
+		atomic_zsh3="$script_dir/zsh/atomic-lambda.zsh-theme"
 		mkdir -p "$dir_zsh"
 		$USE "$atomic_zsh1" "$dir_zsh"
 		$USE "$atomic_zsh2" "$dir_zsh"
+		$USE "$atomic_zsh3" "$dir_zsh"
 	fi
 	if [ "$ARG" == "vim" ]; then
 		dir_vim="$HOME/.vim/colors/"

diff --git a/zsh/atomic-lambda.zsh-theme b/zsh/atomic-lambda.zsh-theme
@@ -0,0 +1,80 @@
+# vim:ft=zsh
+# -----------------------------------------------------------------------------
+#           __                  _
+#    ____ _/ /_____  ____ ___  (_)____
+#   / __ `/ __/ __ \/ __ `__ \/ / ___/
+#  / /_/ / /_/ /_/ / / / / / / / /__
+#  \__,_/\__/\____/_/ /_/ /_/_/\___/ series
+#
+# -----------------------------------------------------------------------------
+#  Theme   : atomic-lambda
+#  Version : 1.0.0
+#  License : MIT
+#  Author  : Gerard Bajona
+#  URL     : https://github.com/gerardbm/atomic
+# -----------------------------------------------------------------------------
+
+# Status lambda
+function status_lambda() {
+	echo "%(?:%{$fg[cyan]%}λ:%{$fg[red]%}λ%s)"
+}
+
+# PWD
+function get_pwd() {
+	echo "${PWD/$HOME/~}"
+}
+
+# Git information
+function atomic_git() {
+	ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+	GIT_STATUS=$(git_prompt_status)
+	PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
+	SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
+	HEADS="${ref#refs/heads/}%{$reset_color%}"
+	DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
+	CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
+	if [[ -n $GIT_STATUS ]] && GIT_STATUS="$GIT_STATUS"; then
+		echo "$PREFIX$HEADS $DIRTY : $GIT_STATUS$SUFFIX "
+	else
+		echo "$PREFIX$HEADS $CLEAN$SUFFIX "
+	fi
+}
+
+# Git prompt: info
+GIT_PREFIX="%{$fg[cyan]%}git%{$reset_color%}:%{$fg_bold[cyan]%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="${GIT_PREFIX}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+
+# Git prompt: dirty/clean
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}x%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}o%{$reset_color%}"
+
+# Git prompt: status
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}+%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[green]%}>%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[red]%}!%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}-%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%}#%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[magenta]%}?%{$reset_color%}"
+
+# Git prompt: remote status
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[blue]%}↑%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[blue]%}↓%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIVERGED="%{$fg[blue]%}/%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE="%{$fg[blue]%}=%{$reset_color%}"
+
+# Git right prompt
+function atomic_rprompt() {
+	SHORT_SHA=$(git_prompt_short_sha)
+	if [[ -n $SHORT_SHA ]] && SHORT_SHA="$SHORT_SHA"; then
+		echo "%{$fg[cyan]%}[$SHORT_SHA]"
+	fi
+}
+
+# Prompt
+PROMPT='
+$(status_lambda) \
+%{$fg_bold[yellow]%}$(get_pwd)%{$reset_color%} \
+$(atomic_git)» %{$reset_color%}'
+
+RPROMPT='$(atomic_rprompt)%{$reset_color%}'
diff --git a/zsh/atomic-powerline.zsh-theme b/zsh/atomic-powerline.zsh-theme
@@ -1,48 +1,90 @@
-#----------------------------------------------------------------
-#   _____    _
-#  |__  /___| |__
-#    / // __| '_ \
-#   / /_\__ \ | | |
-#  /____|___/_| |_|
+# vim:ft=zsh
+# -----------------------------------------------------------------------------
+#           __                  _
+#    ____ _/ /_____  ____ ___  (_)____
+#   / __ `/ __/ __ \/ __ `__ \/ / ___/
+#  / /_/ / /_/ /_/ / / / / / / / /__
+#  \__,_/\__/\____/_/ /_/ /_/_/\___/ series
 #
-#----------------------------------------------------------------
-#  Theme   : Atomic Powerline
-#  Version : 1.0.0
+# -----------------------------------------------------------------------------
+#  Theme   : atomic-powerline
+#  Version : 2.0.0
 #  License : MIT
 #  Author  : Gerard Bajona
 #  URL     : https://github.com/gerardbm/atomic
-#----------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
-# Top separator
-setopt promptsubst
-ATOMIC_DG=$'%{\e[90m%}'
-ATOMIC_LN=$'${(r:(($COLUMNS - 9))::—:)}'
-ATOMIC_SL="%{$fg[cyan]%}%{$fg[black]%}"
-ATOMIC_TM="%{$bg[cyan]%}%D{ %R }"
-ATOMIC_TOP="${ATOMIC_DG}${ATOMIC_LN}${ATOMIC_SL}${ATOMIC_TM}%{$reset_color%}"
+# Status machine
+function status_machine() {
+	PREFIX="%{$fg[black]%}%(?:%{$bg[cyan]%}:%{$bg[yellow]%}%s)"
+	LOCALE="%n@$(hostname)"
+	SUFFIX="%{$bg[white]%}%(?:%{$fg[cyan]%}:%{$fg[yellow]%}%s)"
+	echo "$PREFIX $LOCALE $SUFFIX"
+}
 
 # Hostname
 function hostname {
-	echo $HOST
+	echo "$HOST"
 }
 
-# Current directory
-local current_dir='${PWD/#$HOME/~}'
-
-# Git prefix
-ATOMIC_GIT1="\n%{$fg[default]%}~ on "
-ATOMIC_GIT2="%{$fg[cyan]%}git%{$reset_color%}"
-ATOMIC_GIT3=":%{$fg_bold[cyan]%}"
+# PWD
+function get_pwd() {
+	echo "${PWD/$HOME/~}"
+}
 
 # Git information
-local git_info='$(git_prompt_info)'
-ZSH_THEME_GIT_PROMPT_PREFIX="${ATOMIC_GIT1}${ATOMIC_GIT2}${ATOMIC_GIT3}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$reset_color%} %{$fg[red]%}x"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%} %{$fg[green]%}o"
-
-# Prompt format
-PROMPT="$ATOMIC_TOP
-%{$fg[green]%}%n %{$fg[default]%}at %{$fg[blue]%}$(hostname) \
-%{$fg[default]%}in %{$fg_bold[blue]%}${current_dir}%{$reset_color%} \
-${git_info}%{$fg[default]%}» %{$reset_color%}"
+function atomic_git() {
+	ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+	GIT_STATUS=$(git_prompt_status)
+	MOD_STATUS="%{$fg_bold[black]%}$GIT_STATUS"
+	PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
+	SUFFIX="%{$reset_color%}%{$fg[white]$bg[default]%}"
+	HEADS="${ref#refs/heads/}"
+	DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
+	CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
+	if [[ -n $GIT_STATUS ]] && GIT_STATUS="$GIT_STATUS"; then
+		echo "$PREFIX$HEADS $DIRTY $MOD_STATUS $SUFFIX"
+	else
+		echo "$PREFIX$HEADS $CLEAN"
+	fi
+}
+
+# Git prompt: info
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[black]$bg[white]%}  "
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+
+# Git prompt: dirty/clean
+ZSH_THEME_GIT_PROMPT_DIRTY="x "
+ZSH_THEME_GIT_PROMPT_CLEAN="o %{$fg[white]$bg[default]%}"
+
+# Git prompt: status
+ZSH_THEME_GIT_PROMPT_ADDED="+"
+ZSH_THEME_GIT_PROMPT_RENAMED=">"
+ZSH_THEME_GIT_PROMPT_MODIFIED="!"
+ZSH_THEME_GIT_PROMPT_DELETED="-"
+ZSH_THEME_GIT_PROMPT_UNMERGED="#"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="?"
+
+# Git prompt: remote status
+ZSH_THEME_GIT_PROMPT_AHEAD="↑"
+ZSH_THEME_GIT_PROMPT_BEHIND="↓"
+ZSH_THEME_GIT_PROMPT_DIVERGED="/"
+ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE="="
+
+# Git right prompt
+function atomic_rprompt() {
+	SHORT_SHA=$(git_prompt_short_sha)
+	if [[ -n $SHORT_SHA ]] && SHORT_SHA="$SHORT_SHA"; then
+		PREFIX="%{$fg[white]%}%{$reset_color%}"
+		RPROMPT="%{$fg[black]$bg[white]%} $SHORT_SHA "
+		echo "$PREFIX$RPROMPT"
+	fi
+}
+
+# Prompt
+PROMPT='
+$(status_machine)\
+%{$fg[black]$bg[white]%} $(get_pwd) \
+%{$fg[white]$bg[default]%}$(atomic_git) %{$reset_color%}'
+
+RPROMPT='$(atomic_rprompt)%{$reset_color%}'
diff --git a/zsh/atomic.zsh-theme b/zsh/atomic.zsh-theme
@@ -1,40 +1,88 @@
-#----------------------------------------------------------------
-#   _____    _
-#  |__  /___| |__
-#    / // __| '_ \
-#   / /_\__ \ | | |
-#  /____|___/_| |_|
+# vim:ft=zsh
+# -----------------------------------------------------------------------------
+#           __                  _
+#    ____ _/ /_____  ____ ___  (_)____
+#   / __ `/ __/ __ \/ __ `__ \/ / ___/
+#  / /_/ / /_/ /_/ / / / / / / / /__
+#  \__,_/\__/\____/_/ /_/ /_/_/\___/ series
 #
-#----------------------------------------------------------------
-#  Theme   : Atomic
-#  Version : 1.1.0
+# -----------------------------------------------------------------------------
+#  Theme   : atomic
+#  Version : 2.0.0
 #  License : MIT
 #  Author  : Gerard Bajona
 #  URL     : https://github.com/gerardbm/atomic
-#----------------------------------------------------------------
+# -----------------------------------------------------------------------------
+
+# Status username
+function status_username() {
+	echo "%(?:%{$fg[green]%}%n:%{$fg[yellow]%}%n%s)"
+}
 
 # Hostname
 function hostname {
-	echo $HOST
+	echo "$HOST"
 }
 
-# Current directory
-local current_dir='${PWD/#$HOME/~}'
-
-# Git prefix
-ATOMIC_GIT1="\n%{$fg[default]%}~ on "
-ATOMIC_GIT2="%{$fg[cyan]%}git%{$reset_color%}"
-ATOMIC_GIT3=":%{$fg_bold[cyan]%}"
+# PWD
+function get_pwd() {
+	echo "${PWD/$HOME/~}"
+}
 
 # Git information
-local git_info='$(git_prompt_info)'
-ZSH_THEME_GIT_PROMPT_PREFIX="${ATOMIC_GIT1}${ATOMIC_GIT2}${ATOMIC_GIT3}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$reset_color%} %{$fg[red]%}x"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%} %{$fg[green]%}o"
-
-# Prompt format
-PROMPT="
-%{$fg[green]%}%n %{$fg[default]%}at %{$fg[blue]%}$(hostname) \
-%{$fg[default]%}in %{$fg_bold[blue]%}${current_dir}%{$reset_color%} \
-${git_info}%{$fg[default]%}» %{$reset_color%}"
+function atomic_git() {
+	ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+	GIT_STATUS=$(git_prompt_status)
+	PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
+	SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
+	HEADS="${ref#refs/heads/}%{$reset_color%}"
+	DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
+	CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
+	if [[ -n $GIT_STATUS ]] && GIT_STATUS="$GIT_STATUS"; then
+		echo "$PREFIX$HEADS $DIRTY : $GIT_STATUS$SUFFIX "
+	else
+		echo "$PREFIX$HEADS $CLEAN$SUFFIX "
+	fi
+}
+
+# Git prompt: info
+GIT_PREFIX="\n- on %{$fg[cyan]%}git%{$reset_color%}:%{$fg_bold[cyan]%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="${GIT_PREFIX}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+
+# Git prompt: dirty/clean
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}x%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}o%{$reset_color%}"
+
+# Git prompt: status
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}+%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[green]%}>%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[red]%}!%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}-%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%}#%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[magenta]%}?%{$reset_color%}"
+
+# Git prompt: remote status
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[blue]%}↑%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[blue]%}↓%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIVERGED="%{$fg[blue]%}/%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE="%{$fg[blue]%}=%{$reset_color%}"
+
+# Git right prompt
+function atomic_rprompt() {
+	SHORT_SHA=$(git_prompt_short_sha)
+	if [[ -n $SHORT_SHA ]] && SHORT_SHA="$SHORT_SHA"; then
+		echo "%{$fg[cyan]%}[$SHORT_SHA]"
+	fi
+}
+
+# Prompt
+PROMPT='
+$(status_username) \
+%{$fg[default]%}at \
+%{$fg[blue]%}$(hostname) \
+%{$fg[default]%}in \
+%{$fg_bold[yellow]%}$(get_pwd)%{$reset_color%} \
+$(atomic_git)» %{$reset_color%}'
+
+RPROMPT='$(atomic_rprompt)%{$reset_color%}'