From 5e1ed5d812e90c05467d5daab60517ded8eb63d0 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Thu, 13 Apr 2017 01:11:27 +0100
Subject: [PATCH] Update shell completion related setup

---
 shell/bashrc.sh | 5 +++++
 shell/zshrc.zsh | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/shell/bashrc.sh b/shell/bashrc.sh
index d350f92..721aad2 100644
--- a/shell/bashrc.sh
+++ b/shell/bashrc.sh
@@ -5,5 +5,10 @@
 # Deterimine current directory
 DOTBASH="$DOTSHELL/bash"
 
+# bash-completion
+if [ -f /usr/local/etc/bash_completion ]; then
+  source /usr/local/etc/bash_completion
+fi
+
 source "$DOTBASH/prompt.sh"
 # source "$DOTBASH/bash-ido.sh" # Disabled for making life complicated
diff --git a/shell/zshrc.zsh b/shell/zshrc.zsh
index e5de0fa..279a3a2 100644
--- a/shell/zshrc.zsh
+++ b/shell/zshrc.zsh
@@ -29,7 +29,7 @@ zplug "$DOTZSH/themes/plain", from:local
 # zplug "junegunn/fzf", of:"shell/*.zsh"
 zplug "jimeh/zsh-peco-history"
 
-zplug "b4b4r07/enhancd", of:"zsh/*.zsh"
+zplug "b4b4r07/enhancd", of:"init.sh"
 zplug "zsh-users/zsh-completions"
 zplug "zsh-users/zsh-autosuggestions"
 zplug "zsh-users/zsh-syntax-highlighting", nice:19
@@ -60,8 +60,8 @@ zplug load
 #
 
 # Enable bash-style completion.
-autoload -U bashcompinit
-bashcompinit
+autoload -U +X compinit && compinit
+autoload -U +X bashcompinit && bashcompinit
 
 # Disable shared history.
 unsetopt share_history