From f0691cb06248ddd1a52c02c61a31e3d53fe83099 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Thu, 5 Feb 2015 00:29:47 +0100 Subject: [PATCH] Moved modified agnoster theme back in oh-my-zsh folder and made patch for modification --- agnoster.zsh-theme | 182 ----------------------------------------- oh-my-zsh | 2 +- patches/agnoster.patch | 41 ++++++++++ zshrc | 2 +- 4 files changed, 43 insertions(+), 184 deletions(-) delete mode 100644 agnoster.zsh-theme create mode 100644 patches/agnoster.patch diff --git a/agnoster.zsh-theme b/agnoster.zsh-theme deleted file mode 100644 index c29f09d..0000000 --- a/agnoster.zsh-theme +++ /dev/null @@ -1,182 +0,0 @@ -# vim:ft=zsh ts=2 sw=2 sts=2 -# -# agnoster's Theme - https://gist.github.com/3712874 -# A Powerline-inspired theme for ZSH -# -# # README -# -# In order for this theme to render correctly, you will need a -# [Powerline-patched font](https://github.com/Lokaltog/powerline-fonts). -# -# In addition, I recommend the -# [Solarized theme](https://github.com/altercation/solarized/) and, if you're -# using it on Mac OS X, [iTerm 2](http://www.iterm2.com/) over Terminal.app - -# it has significantly better color fidelity. -# -# # Goals -# -# The aim of this theme is to only show you *relevant* information. Like most -# prompts, it will only show git information when in a git working directory. -# However, it goes a step further: everything from the current user and -# hostname to whether the last call exited with an error to whether background -# jobs are running in this shell will all be displayed automatically when -# appropriate. - -### Segment drawing -# A few utility functions to make it easy and re-usable to draw segmented prompts - -CURRENT_BG='NONE' -SEGMENT_SEPARATOR='' - -# Begin a segment -# Takes two arguments, background and foreground. Both can be omitted, -# rendering default background/foreground. -prompt_segment() { - local bg fg - [[ -n $1 ]] && bg="%K{$1}" || bg="%k" - [[ -n $2 ]] && fg="%F{$2}" || fg="%f" - if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then - echo -n " %{$bg%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{$fg%} " - else - echo -n "%{$bg%}%{$fg%} " - fi - CURRENT_BG=$1 - [[ -n $3 ]] && echo -n $3 -} - -# End the prompt, closing any open segments -prompt_end() { - if [[ -n $CURRENT_BG ]]; then - echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR" - else - echo -n "%{%k%}" - fi - echo -n "%{%f%}" - CURRENT_BG='' -} - -### Prompt components -# Each component will draw itself, and hide itself if no information needs to be shown - -# Context: user@hostname (who am I and where am I) -prompt_context() { - local user=`whoami` - - if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then - prompt_segment black default "%(!.%{%F{yellow}%}.)$user" - fi -} - -# Git: branch/detached head, dirty status -prompt_git() { - local ref dirty mode repo_path - repo_path=$(git rev-parse --git-dir 2>/dev/null) - - if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then - dirty=$(parse_git_dirty) - ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)" - if [[ -n $dirty ]]; then - prompt_segment yellow black - else - prompt_segment green black - fi - - if [[ -e "${repo_path}/BISECT_LOG" ]]; then - mode=" " - elif [[ -e "${repo_path}/MERGE_HEAD" ]]; then - mode=" >M<" - elif [[ -e "${repo_path}/rebase" || -e "${repo_path}/rebase-apply" || -e "${repo_path}/rebase-merge" || -e "${repo_path}/../.dotest" ]]; then - mode=" >R>" - fi - - setopt promptsubst - autoload -Uz vcs_info - - zstyle ':vcs_info:*' enable git - zstyle ':vcs_info:*' get-revision true - zstyle ':vcs_info:*' check-for-changes true - zstyle ':vcs_info:*' stagedstr '✚' - zstyle ':vcs_info:git:*' unstagedstr '●' - zstyle ':vcs_info:*' formats ' %u%c' - zstyle ':vcs_info:*' actionformats ' %u%c' - vcs_info - echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_%% }${mode}" - fi -} - -prompt_hg() { - local rev status - if $(hg id >/dev/null 2>&1); then - if $(hg prompt >/dev/null 2>&1); then - if [[ $(hg prompt "{status|unknown}") = "?" ]]; then - # if files are not added - prompt_segment red white - st='±' - elif [[ -n $(hg prompt "{status|modified}") ]]; then - # if any modification - prompt_segment yellow black - st='±' - else - # if working copy is clean - prompt_segment green black - fi - echo -n $(hg prompt "☿ {rev}@{branch}") $st - else - st="" - rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g') - branch=$(hg id -b 2>/dev/null) - if `hg st | grep -Eq "^\?"`; then - prompt_segment red black - st='±' - elif `hg st | grep -Eq "^(M|A)"`; then - prompt_segment yellow black - st='±' - else - prompt_segment green black - fi - echo -n "☿ $rev@$branch" $st - fi - fi -} - -# Dir: current working directory -prompt_dir() { - prompt_segment blue black '%3~' -} - -# Virtualenv: current working virtualenv -prompt_virtualenv() { - local virtualenv_path="$VIRTUAL_ENV" - if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then - prompt_segment blue black "(`basename $virtualenv_path`)" - fi -} - -# Status: -# - was there an error -# - am I root -# - are there background jobs? -prompt_status() { - local symbols - symbols=() - [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘" - [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡" - [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙" - - [[ -n "$symbols" ]] && prompt_segment black default "$symbols" -} - -## Main prompt -build_prompt() { - RETVAL=$? - prompt_status - prompt_virtualenv - prompt_context - prompt_dir - prompt_git - prompt_hg - prompt_end -} - -PROMPT='%{%f%b%k%}$(build_prompt) - ' diff --git a/oh-my-zsh b/oh-my-zsh index 550ccca..bcd8475 160000 --- a/oh-my-zsh +++ b/oh-my-zsh @@ -1 +1 @@ -Subproject commit 550ccca91cb45fcf26a8f2c3c60da675b995e3f3 +Subproject commit bcd84755235a583c7017ccdbcb5238c51ea193a0 diff --git a/patches/agnoster.patch b/patches/agnoster.patch new file mode 100644 index 0000000..e711fd3 --- /dev/null +++ b/patches/agnoster.patch @@ -0,0 +1,41 @@ +From bcd84755235a583c7017ccdbcb5238c51ea193a0 Mon Sep 17 00:00:00 2001 +From: Dreaded_X +Date: Thu, 5 Feb 2015 00:27:11 +0100 +Subject: [PATCH] Modified Agnoster theme + +--- + themes/agnoster.zsh-theme | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme +index 8c7be6e..feff328 100644 +--- a/themes/agnoster.zsh-theme ++++ b/themes/agnoster.zsh-theme +@@ -61,7 +61,7 @@ prompt_end() { + # Context: user@hostname (who am I and where am I) + prompt_context() { + if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then +- prompt_segment black default "%(!.%{%F{yellow}%}.)$USER@%m" ++ prompt_segment black default "%(!.%{%F{yellow}%}.)$USER" + fi + } + +@@ -139,7 +139,7 @@ prompt_hg() { + + # Dir: current working directory + prompt_dir() { +- prompt_segment blue black '%~' ++ prompt_segment blue black '%3~' + } + + # Virtualenv: current working virtualenv +@@ -176,4 +176,5 @@ build_prompt() { + prompt_end + } + +-PROMPT='%{%f%b%k%}$(build_prompt) ' ++PROMPT='%{%f%b%k%}$(build_prompt) ++ ' +-- +2.2.2 + diff --git a/zshrc b/zshrc index 00c5a6b..cd0988c 100644 --- a/zshrc +++ b/zshrc @@ -1,6 +1,6 @@ #oh-my-zsh ZSH=~/.dotfiles/oh-my-zsh -ZSH_THEME="../../agnoster" +ZSH_THEME="agnoster" plugins=(sudo colored-man) setopt correct source $ZSH/oh-my-zsh.sh