Commit 23002c4a authored by Dom Sekotill's avatar Dom Sekotill
Browse files

added zsh theme which unifies prompt with bash one

parent e254d45b

.bash_profile

+0 −3
Original line number Diff line number Diff line
@@ -12,11 +12,8 @@ source_first ~/.profile /etc/profile 


# Prompt

if [ -n "$PS1" ]; then

	CKSUM=$(hostname | cksum | cut -f1 -d\ )

	PROMPTCOLOUR=$(((CKSUM % 6)+31))

	PS1="\[\e[1;${PROMPTCOLOUR:-0}m\]\u@\h: \$\[\e[0m\] "

	export PS1

	unset CKSUM PROMPTCOLOUR

fi



source_each ~/.shell/$(get_platform)/profile ~/.bash_local

.profile

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ export HISTIGNORE="&:ls:[bf]g:d[fu]:exit" 
export EDITOR=vim

export WORKON_HOME=~/.virtualenvs



# Local prompt colour for shells which support it

export PROMPTCOLOUR=$((($(hostname|cksum|cut -f1 -d\ ) % 6) + 31))





## LOCAL SOFTWARE ##



# Prefix is the standard prefixes under which software is installed, eg. "/",

.shell/zsh_custom/themes/kodo.zsh-theme

0 → 100644
+48 −0
Original line number Diff line number Diff line 
# Needs Git plugin for current_branch method



# Color shortcuts

RED=$fg[red]

YELLOW=$fg[yellow]

GREEN=$fg[green]

WHITE=$fg[white]

BLUE=$fg[blue]

RED_BOLD=$fg_bold[red]

YELLOW_BOLD=$fg_bold[yellow]

GREEN_BOLD=$fg_bold[green]

WHITE_BOLD=$fg_bold[white]

BLUE_BOLD=$fg_bold[blue]

RESET_COLOR=$reset_color



HOST_COLOUR=$'\e[1;'${PROMPTCOLOUR}m



# Format for git_prompt_info()

ZSH_THEME_GIT_PROMPT_PREFIX=""

ZSH_THEME_GIT_PROMPT_SUFFIX=""



# Format for parse_git_dirty()

ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}(*)"

ZSH_THEME_GIT_PROMPT_CLEAN=""



# Format for git_prompt_status()

ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}unmerged"

ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}deleted"

ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}renamed"

ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}modified"

ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}added"

ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}untracked"



# Format for git_prompt_ahead()

ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}(!)"



# Format for git_prompt_long_sha() and git_prompt_short_sha()

ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}"

ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]"



local tick=$'\xe2\x9c\x93'

local cross=$'\xe2\x9c\x97'



# Prompt format

PROMPT='%{$HOST_COLOUR%}%n@%m: $%{$RESET_COLOR%} '

RPROMPT='%(?:%{$GREEN_BOLD%}$tick:%{$RED_BOLD%}$? $cross)  \

%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)\

%{$RESET_COLOR%}'

.zshrc

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ source_each ~/.shell/aliases ~/.shell/$(get_platform)/aliases ~/.aliases 


plugins=(git django pipi python virtualenv virtualenvwrapper)



ZSH_THEME="juanghurtado"

ZSH_CUSTOM=~/.shell/zsh_custom

ZSH_THEME="kodo"

DISABLE_AUTO_TITLE=true



# activate oh-my-zsh