From bd2878fe919ad8b5984c885460749bf40614e762 Mon Sep 17 00:00:00 2001
From: psox <psox(a)st8l.com>
Date: Thu, 29 Oct 2020 11:46:05 +0000
Subject: [PATCH] latest changes

---
 oh-my-zsh                                  | 2 +-
 zsh-custom/plugins/zsh-completions         | 2 +-
 zsh-custom/plugins/zsh-syntax-highlighting | 2 +-
 zshrc                                      | 6 +++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/oh-my-zsh b/oh-my-zsh
index 93c837f..39c7949 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 93c837fec8e9fe61509b9dff9e909e84f7ebe32d
+Subproject commit 39c79493feb71da4ba3b69eb82229804b27209cc
diff --git a/zsh-custom/plugins/zsh-completions b/zsh-custom/plugins/zsh-completions
index 454d236..2e009c7 160000
--- a/zsh-custom/plugins/zsh-completions
+++ b/zsh-custom/plugins/zsh-completions
@@ -1 +1 @@
-Subproject commit 454d236d3a793668b873a7b522353c68ec182cfa
+Subproject commit 2e009c7ab8e9c7496ed86473ede0917a3cefee01
diff --git a/zsh-custom/plugins/zsh-syntax-highlighting b/zsh-custom/plugins/zsh-syntax-highlighting
index 62c5575..2ebfa6a 160000
--- a/zsh-custom/plugins/zsh-syntax-highlighting
+++ b/zsh-custom/plugins/zsh-syntax-highlighting
@@ -1 +1 @@
-Subproject commit 62c5575848f1f0a96161243d18497c247c9f52df
+Subproject commit 2ebfa6a59879b66b02712693731c84831255601d
diff --git a/zshrc b/zshrc
index 2a99fc8..2eee8bf 100755
--- a/zshrc
+++ b/zshrc
@@ -114,7 +114,7 @@ plugins=(
   common-aliases 
   colored-man-pages 
 )
-( which git &>/dev/null ) && plugins+=( git git-extras git-flow-avh ) && [[ "$ZSH_THEME" == "stemmet" ]] && plugins+=( git-prompt )
+( which git &>/dev/null ) && plugins+=( git git-extras git-flow-avh ) && [[ "$ZSH_THEME" == "stemmet" ]] && [ -z "$STARSHIP_SHELL" ] && plugins+=( git-prompt )
 ( which perl &>/dev/null ) && plugins+=( perl )
 ( which go &>/dev/null ) && plugins+=( golang )
 ( which oc &>/dev/null ) && plugins+=( oc )
@@ -281,6 +281,10 @@ precmd() {
   fi
 }
 
+# Remove unwanted aliases
+
+( where fd | grep -q -E '\/s?bin\/fd' ) && alias fd &>/dev/null && unalias fd
+
 # Clean up global aliases
 source <(alias -g | awk -F= '/^[A-Za-z]+/{print $1}' | xargs -I{} -n1 echo unalias "'{}'")