From 03bbda87c787f9988258223c14cab3896d85c8bc Mon Sep 17 00:00:00 2001
From: Aaron Goshine <greenlig@gmail.com>
Date: Fri, 30 Dec 2016 21:57:55 +0000
Subject: [PATCH 1/5] chore(OH-My-zsh): install zsh

---
 .gitignore             | 51 +++++++++++++++++++++++++++++++++++-------
 themes/ultra.zsh-theme | 19 ++++++++++++++++
 2 files changed, 62 insertions(+), 8 deletions(-)
 create mode 100644 themes/ultra.zsh-theme

diff --git a/.gitignore b/.gitignore
index b2022081a..da433f1e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,43 @@
-# custom files
-custom/
-!custom/plugins/example
-!custom/example.zsh
-
-# temp files directories
-cache/
-log/
+.DS_Store
+vim/bundle/*
+vim/sessions/*
+vim/.netrwhist
+vim/vundle_plugins/custom
+vim/.backup/*
+vim/.tmp/*
+vim/.temp/*
+vim/.backup/*
+vim/.undo/*
+bash/ssh.sh
+bin/php*
+config/configstore/update-notifier-nodemon.json
+vim/.spell/custom.en.utf-8.add.spl
+emacs/*.elc
+emacs/\#*
+emacs/bookmarks
+emacs/backup
+emacs/backup.*
+emacs/org-clock-save.el
+emacs/ac-comphist.dat
+emacs/tramp
+emacs/elpa
+emacs/var
+emacs/eshell
+emacs/ido.last
+emacs/recentf
+emacs/.cask
+emacs/emms
+emacs/url
+emacs/auto-save-list
+emacs/projectile-bookmarks.eld
+emacs/projectile.cache
+emacs/saveplace
+emacs/projectile.cache
+emacs/projectile-bookmarks.eld
+emacs/ac-comphist.dat
+emacs/auto-save-list
+emacs/games
+config/configstore/snyk.json
+config/git/gitk
+config/vifm/vifminfo
+vim/vim
diff --git a/themes/ultra.zsh-theme b/themes/ultra.zsh-theme
new file mode 100644
index 000000000..79f5c7459
--- /dev/null
+++ b/themes/ultra.zsh-theme
@@ -0,0 +1,19 @@
+function prompt_char {
+    git branch >/dev/null 2>/dev/null && echo '±' && return
+    echo '○'
+}
+
+function virtualenv_info {
+    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
+}
+
+PROMPT='✿ [%{$fg[blue]%}%m%{$reset_color%}]-[%{$fg_bold[blue]%}${PWD/#$HOME/~} %{$reset_color%}] $(prompt_char) $(git_prompt_info) %{$reset_color%}%{$fg[green]%}➜ %{$reset_color%} '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="|%{$fg[green]%}"
+
+ZSH_THEME_GIT_PROMPT_SUFFIX="|%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}[✹]%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}(⦿)"

From a9832224b007dca72a7d24347de56ccac82be580 Mon Sep 17 00:00:00 2001
From: Aaron Goshine <greenlig@gmail.com>
Date: Sat, 31 Dec 2016 11:22:07 +0000
Subject: [PATCH 2/5] feat(OMZ): simplify prompt

---
 themes/ultra.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/ultra.zsh-theme b/themes/ultra.zsh-theme
index 79f5c7459..1753755c4 100644
--- a/themes/ultra.zsh-theme
+++ b/themes/ultra.zsh-theme
@@ -7,7 +7,7 @@ function virtualenv_info {
     [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
 }
 
-PROMPT='✿ [%{$fg[blue]%}%m%{$reset_color%}]-[%{$fg_bold[blue]%}${PWD/#$HOME/~} %{$reset_color%}] $(prompt_char) $(git_prompt_info) %{$reset_color%}%{$fg[green]%}➜ %{$reset_color%} '
+PROMPT='%{$fg[blue]%} ✿ %{$reset_color%}[%m]-[${PWD/#$HOME/~}] $(prompt_char) $(git_prompt_info) %{$reset_color%}%{$fg[green]%}➜ %{$reset_color%} '
 
 ZSH_THEME_GIT_PROMPT_PREFIX="|%{$fg[green]%}"
 

From ff6c7324fecd38eaffe931efea5390481ab8d60d Mon Sep 17 00:00:00 2001
From: Aaron Goshine <greenlig@gmail.com>
Date: Sat, 31 Dec 2016 20:49:38 +0000
Subject: [PATCH 3/5] fix(Omz) : Remove alias collision

---
 plugins/git/git.plugin.zsh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 34942d387..c84e53a7c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -227,10 +227,7 @@ alias gstl='git stash list'
 alias gstp='git stash pop'
 alias gsts='git stash show --text'
 alias gsu='git submodule update'
-
-alias gts='git tag -s'
 alias gtv='git tag | sort -V'
-
 alias gunignore='git update-index --no-assume-unchanged'
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 alias gup='git pull --rebase'

From e2a397573a19b9985bf0c84f83608fba48e95dcd Mon Sep 17 00:00:00 2001
From: Aaron Goshine <greenlig@gmail.com>
Date: Sat, 31 Dec 2016 20:51:00 +0000
Subject: [PATCH 4/5] feat(Omz): Implemented ultra theme

---
 themes/ultra.zsh-theme | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/themes/ultra.zsh-theme b/themes/ultra.zsh-theme
index 1753755c4..2677b5316 100644
--- a/themes/ultra.zsh-theme
+++ b/themes/ultra.zsh-theme
@@ -7,13 +7,14 @@ function virtualenv_info {
     [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
 }
 
-PROMPT='%{$fg[blue]%} ✿ %{$reset_color%}[%m]-[${PWD/#$HOME/~}] $(prompt_char) $(git_prompt_info) %{$reset_color%}%{$fg[green]%}➜ %{$reset_color%} '
+PROMPT='%{$fg[blue]%} ✿ %{$reset_color%}[%m]-[${PWD/#$HOME/~}] $(prompt_char) %{$reset_color%}%{$fg[green]%}➜ %{$reset_color%} '
 
 ZSH_THEME_GIT_PROMPT_PREFIX="|%{$fg[green]%}"
 
-ZSH_THEME_GIT_PROMPT_SUFFIX="|%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}|"
 
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}[✹]%{$reset_color%}"
 
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}(⦿)"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}(⦿)%{$reset_color%}"

From bf5d22f541162a2cc7d52b728da2f388a5930139 Mon Sep 17 00:00:00 2001
From: Aaron Goshine <greenlig@gmail.com>
Date: Sun, 1 Jan 2017 08:20:43 +0000
Subject: [PATCH 5/5] fix(Theme) :white space in prompt

---
 themes/ultra.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/ultra.zsh-theme b/themes/ultra.zsh-theme
index 2677b5316..725c2d9d0 100644
--- a/themes/ultra.zsh-theme
+++ b/themes/ultra.zsh-theme
@@ -7,7 +7,7 @@ function virtualenv_info {
     [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
 }
 
-PROMPT='%{$fg[blue]%} ✿ %{$reset_color%}[%m]-[${PWD/#$HOME/~}] $(prompt_char) %{$reset_color%}%{$fg[green]%}➜ %{$reset_color%} '
+PROMPT='%{$fg[blue]%}✿ %{$reset_color%}[%m]-[${PWD/#$HOME/~}] $(prompt_char) %{$reset_color%}$(git_prompt_info) %{$fg[green]%}➜ %{$reset_color%} '
 
 ZSH_THEME_GIT_PROMPT_PREFIX="|%{$fg[green]%}"