From b825210c29a9a03d50107e7383852f92ba791bff Mon Sep 17 00:00:00 2001
From: Danielle McLean <gopsychonauts@gmail.com>
Date: Sun, 2 Oct 2016 19:13:42 +1100
Subject: [PATCH] Better resilience to missing components, have zplug handle
 loading of ~/.zsh/interactive scripts

---
 home/.zprofile                          | 2 +-
 home/.zsh/{interactive/_zplug => zplug} | 3 ++-
 home/.zshenv                            | 2 +-
 home/.zshrc                             | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename home/.zsh/{interactive/_zplug => zplug} (90%)

diff --git a/home/.zprofile b/home/.zprofile
index 1fc9148..1215e1d 100644
--- a/home/.zprofile
+++ b/home/.zprofile
@@ -1 +1 @@
-for f in ~/.zsh/login/*; source $f
+for f in ~/.zsh/login/*(-.N); source $f
diff --git a/home/.zsh/interactive/_zplug b/home/.zsh/zplug
similarity index 90%
rename from home/.zsh/interactive/_zplug
rename to home/.zsh/zplug
index baf3b2a..89837bd 100644
--- a/home/.zsh/interactive/_zplug
+++ b/home/.zsh/zplug
@@ -2,7 +2,7 @@
 if [[ ! -f ~/.zplug/repos/zplug/zplug/init.zsh ]]; then
 	git clone https://github.com/zplug/zplug ~/.zplug/repos/zplug/zplug
 fi
-source ~/.zplug/repos/zplug/zplug/init.zsh 
+source ~/.zplug/repos/zplug/zplug/init.zsh
 zplug zplug/zplug
 zplug willghatch/zsh-saneopt
 
@@ -22,5 +22,6 @@ apply-trapd00r-colors() {
 	zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
 }
 
+zplug ~/.zsh/interactive/\*, from:local
 zplug check || zplug install
 zplug load
diff --git a/home/.zshenv b/home/.zshenv
index 5cd9d0f..375d910 100644
--- a/home/.zshenv
+++ b/home/.zshenv
@@ -1 +1 @@
-for f in ~/.zsh/all/*; source $f
+for f in ~/.zsh/all/*(-.N); source $f
diff --git a/home/.zshrc b/home/.zshrc
index cf22121..c6a4845 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -1,2 +1,2 @@
-for f in ~/.zsh/interactive/*; source $f
-[[ -o login ]] && for f in ~/.zsh/interactive+login/*; source $f
+source ~/.zsh/zplug
+[[ -o login ]] && for f in ~/.zsh/interactive+login/*(-.N); source $f