From 7ccb1a7790e3ac3d3a3df3f0185749b31d195345 Mon Sep 17 00:00:00 2001
From: Danielle McLean <gopsychonauts@gmail.com>
Date: Thu, 20 Oct 2016 02:12:35 +1100
Subject: [PATCH] =?UTF-8?q?Switch=20from=20zplug/zplug=20to=20psprint/zplu?=
 =?UTF-8?q?gin,=20startup=20time=20reduced=20by=20about=20=E2=85=94=20:o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/zsh/zplug   | 28 ----------------------------
 config/zsh/zplugin | 32 ++++++++++++++++++++++++++++++++
 config/zsh/zshrc   |  7 ++++++-
 3 files changed, 38 insertions(+), 29 deletions(-)
 delete mode 100644 config/zsh/zplug
 create mode 100644 config/zsh/zplugin

diff --git a/config/zsh/zplug b/config/zsh/zplug
deleted file mode 100644
index 379b850..0000000
--- a/config/zsh/zplug
+++ /dev/null
@@ -1,28 +0,0 @@
-#! zsh
-export ZPLUG_HOME=$XDG_CACHE_HOME/zsh/zplug
-if [[ ! -f $ZPLUG_HOME/repos/zplug/zplug/init.zsh ]]; then
-	git clone https://github.com/zplug/zplug $ZPLUG_HOME/repos/zplug/zplug
-fi
-source $ZPLUG_HOME/repos/zplug/zplug/init.zsh
-zplug zplug/zplug
-zplug willghatch/zsh-saneopt
-
-zplug bobthecow/git-flow-completion
-zplug mafredri/zsh-async
-zplug micha/resty
-zplug rupa/z, use:z.sh
-zplug sharat87/zsh-vim-mode
-zplug sindresorhus/pure
-zplug supercrabtree/k
-zplug zsh-users/zsh-syntax-highlighting, nice:10
-zplug zsh-users/zsh-completions, nice:11
-zplug zsh-users/zsh-history-substring-search, nice:9
-zplug trapd00r/LS_COLORS, hook-load:apply-trapd00r-colors
-apply-trapd00r-colors() {
-	eval $(dircolors -b $ZPLUG_REPOS/trapd00r/LS_COLORS/LS_COLORS)
-	zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
-}
-
-zplug $ZDOTDIR/interactive/\*, from:local
-zplug check || zplug install
-zplug load
diff --git a/config/zsh/zplugin b/config/zsh/zplugin
new file mode 100644
index 0000000..92ba1fa
--- /dev/null
+++ b/config/zsh/zplugin
@@ -0,0 +1,32 @@
+#! zsh
+export ZPLG_HOME=$XDG_CACHE_HOME/zsh/zplugin
+if [[ ! -f $ZPLG_HOME/bin/zplugin.zsh ]]; then
+	git clone https://github.com/psprint/zplugin $ZPLG_HOME/bin
+	zcompile $ZPLG_HOME/bin/zplugin.zsh
+fi
+source $ZPLG_HOME/bin/zplugin.zsh
+load=light
+
+zplugin $load willghatch/zsh-saneopt
+
+zplugin $load bobthecow/git-flow-completion
+zplugin $load mafredri/zsh-async
+zplugin $load sindresorhus/pure
+
+zplugin $load trapd00r/LS_COLORS
+LS_COLORS_DIR=$ZPLG_PLUGINS_DIR/trapd00r---LS_COLORS
+if [[ ! $LS_COLORS_DIR/LS_COLORS.plugin.zsh -nt $LS_COLORS_DIR/LS_COLORS ]]; then
+	dircolors -b $LS_COLORS_DIR/LS_COLORS > $LS_COLORS_DIR/LS_COLORS.plugin.zsh
+	zplugin compile trapd00r/LS_COLORS
+	source $LS_COLORS_DIR/LS_COLORS.plugin.zsh
+fi
+zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
+
+zplugin $load micha/resty
+zplugin $load rupa/z
+zplugin $load supercrabtree/k
+
+zplugin $load zsh-users/zsh-completions
+zplugin $load zsh-users/zsh-syntax-highlighting
+zplugin $load zsh-users/zsh-history-substring-search
+zplugin $load sharat87/zsh-vim-mode
diff --git a/config/zsh/zshrc b/config/zsh/zshrc
index de6c8e1..67108b1 100644
--- a/config/zsh/zshrc
+++ b/config/zsh/zshrc
@@ -1,2 +1,7 @@
-source $ZDOTDIR/zplug
+source $ZDOTDIR/zplugin
+for f in $ZDOTDIR/interactive/*; [[ -f $f ]] && source $f
+
+autoload -Uz compinit
+compinit -d $XDG_CACHE_HOME/zsh/zcompdump
+
 [[ -o login ]] && for f in $ZDOTDIR/interactive+login/*(-.N); source $f