From f8f7e822a908feeaa2b8e907869292e273a550d3 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Wed, 8 Aug 2018 13:39:47 +0100
Subject: [PATCH] Remove and swap out some bash specific logic

---
 zsh/git.zsh        | 10 ++--------
 zsh/kubernetes.zsh |  2 +-
 zsh/less.zsh       |  2 +-
 zsh/nodejs.zsh     |  5 -----
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/zsh/git.zsh b/zsh/git.zsh
index ccadc6c..0edbf51 100755
--- a/zsh/git.zsh
+++ b/zsh/git.zsh
@@ -20,12 +20,6 @@ alias gix="gitx"
 alias gx="gitx"
 
 # Git Completion
-if [ -n "$BASH_VERSION" ]; then
-  if [ -f "/usr/local/etc/bash_completion.d/git-completion.bash" ]; then
-    source "/usr/local/etc/bash_completion.d/git-completion.bash"
-  fi
-
-  # Only needed for Bash. Zsh is much smarter with it's auto-completion ^_^
-  complete -o default -o nospace -F _git g
-  complete -o default -o nospace -F _git gi
+if [ -d "/usr/local/share/zsh/site-functions" ]; then
+  fpath=("/usr/local/share/zsh/site-functions" "${fpath[@]}")
 fi
diff --git a/zsh/kubernetes.zsh b/zsh/kubernetes.zsh
index a7b1374..22b30c0 100644
--- a/zsh/kubernetes.zsh
+++ b/zsh/kubernetes.zsh
@@ -8,6 +8,6 @@ alias mk="minikube"
 
 export KUBECONFIG="$HOME/.kube/config:.kube/config"
 
-if command -v kubectl > /dev/null; then
+if [ $commands[kubectl] ]; then
   eval "$(kubectl completion zsh)"
 fi
diff --git a/zsh/less.zsh b/zsh/less.zsh
index 60c67db..4dbc28d 100644
--- a/zsh/less.zsh
+++ b/zsh/less.zsh
@@ -5,7 +5,7 @@
 alias le="less"
 
 # Enable syntax highlighting via source-highlight
-if command -v src-hilite-lesspipe.sh > /dev/null; then
+if [ $commands[src-hilite-lesspipe.sh] ]; then
   export LESSOPEN="| src-hilite-lesspipe.sh %s"
   export LESS=" -R "
 fi
diff --git a/zsh/nodejs.zsh b/zsh/nodejs.zsh
index 30b3d78..3ad5a3d 100755
--- a/zsh/nodejs.zsh
+++ b/zsh/nodejs.zsh
@@ -32,9 +32,4 @@ install_node_global_packages () {
 # Load nvm if it's available
 if [ -f "$HOME/.nvm/nvm.sh" ]; then
   source "$HOME/.nvm/nvm.sh"
-
-  # And it's shell completion
-  if [ -n "$BASH_VERSION" ] && [ -f "$HOME/.nvm/bash_completion" ]; then
-    source "$HOME/.nvm/bash_completion"
-  fi
 fi