From c94d33dab4aefacff8d86b036cca46cd4b4d5e5d Mon Sep 17 00:00:00 2001 From: Eystein Bye Date: Tue, 30 Dec 2014 12:08:07 +0100 Subject: [PATCH 1/3] Added a new theme -Eystein- and made some changes to SuperJarin (removed Ruby prompt) --- themes/eystein.zsh-theme | 24 ++++++++++++++++++++++++ themes/superjarin.zsh-theme | 1 - 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 themes/eystein.zsh-theme diff --git a/themes/eystein.zsh-theme b/themes/eystein.zsh-theme new file mode 100644 index 000000000..bb4abff5d --- /dev/null +++ b/themes/eystein.zsh-theme @@ -0,0 +1,24 @@ +# Grab the current filepath, use shortcuts: ~/Desktop +# Append the current git branch, if in a git repository +# +# %n is username +# %m is servername +# %c is path + +# Simple Prompt +EYSTEIN_CURRENT_LOCA_="%{$fg_bold[cyan]%}%~\$(git_prompt_info)%{$reset_color%}" + +# Prompt with user +#EYSTEIN_CURRENT_LOCA_='[%{$fg_bold[blue]%}%n@%m%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)%{$reset_color%}]$ ' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%} <%{$fg[magenta]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[white]%}" + +# Do nothing if the branch is clean (no changes). +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[white]%}>" + +# Add a yellow ✗ if the branch is dirty +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[white]%}> %{$fg[yellow]%}✗" + +# Put it all together! +PROMPT="$EYSTEIN_CURRENT_LOCA_ " diff --git a/themes/superjarin.zsh-theme b/themes/superjarin.zsh-theme index 86fa9c706..23a22d9af 100644 --- a/themes/superjarin.zsh-theme +++ b/themes/superjarin.zsh-theme @@ -15,4 +15,3 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[white]%}> %{$fg[yellow]%}✗" # Put it all together! PROMPT="$JARIN_CURRENT_RUBY_ $JARIN_CURRENT_LOCA_ " - From d2494553b185c795c9ed1679ca8cab243d0d93c4 Mon Sep 17 00:00:00 2001 From: Eystein Bye Date: Wed, 10 Jun 2015 10:52:34 +0200 Subject: [PATCH 2/3] Added alias gaa (git add --all) to git plugin --- plugins/git/git.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index e42e09688..b576d6ecb 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -49,7 +49,7 @@ function work_in_progress() { alias g='git' alias ga='git add' - +alias gaa='git add --all' alias gb='git branch' alias gba='git branch -a' alias gbda='git branch --merged | command grep -vE "^(\*|\s*master\s*$)" | command xargs -n 1 git branch -d' From 1e054dcaeb51d4190bbd3e4f434862ce32b56322 Mon Sep 17 00:00:00 2001 From: Eystein Bye Date: Wed, 10 Jun 2015 10:59:28 +0200 Subject: [PATCH 3/3] Removed changed to theme --- themes/eystein.zsh-theme | 24 ------------------------ themes/superjarin.zsh-theme | 1 + 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 themes/eystein.zsh-theme diff --git a/themes/eystein.zsh-theme b/themes/eystein.zsh-theme deleted file mode 100644 index bb4abff5d..000000000 --- a/themes/eystein.zsh-theme +++ /dev/null @@ -1,24 +0,0 @@ -# Grab the current filepath, use shortcuts: ~/Desktop -# Append the current git branch, if in a git repository -# -# %n is username -# %m is servername -# %c is path - -# Simple Prompt -EYSTEIN_CURRENT_LOCA_="%{$fg_bold[cyan]%}%~\$(git_prompt_info)%{$reset_color%}" - -# Prompt with user -#EYSTEIN_CURRENT_LOCA_='[%{$fg_bold[blue]%}%n@%m%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)%{$reset_color%}]$ ' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%} <%{$fg[magenta]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[white]%}" - -# Do nothing if the branch is clean (no changes). -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[white]%}>" - -# Add a yellow ✗ if the branch is dirty -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[white]%}> %{$fg[yellow]%}✗" - -# Put it all together! -PROMPT="$EYSTEIN_CURRENT_LOCA_ " diff --git a/themes/superjarin.zsh-theme b/themes/superjarin.zsh-theme index 23a22d9af..86fa9c706 100644 --- a/themes/superjarin.zsh-theme +++ b/themes/superjarin.zsh-theme @@ -15,3 +15,4 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[white]%}> %{$fg[yellow]%}✗" # Put it all together! PROMPT="$JARIN_CURRENT_RUBY_ $JARIN_CURRENT_LOCA_ " +