@@ -4,7 +4,7 @@ I've organised this repository with [[https://www.gnu.org/software/stow/][GNU Stow]].  It focuses on [[http://zsh.sourceforge.net][Z Shell]] and
 [[http://emacs.sexy][Emacs]].
 
 It doesn't use any configuration frameworks, just packages installed
-via package managers.  For Z shell I use [[https://zplug.sh/][zplug]] and for Emacs I use the
+via package managers.  For Z shell I use [[https://github.com/zdharma/zplugin][zplugin]] and for Emacs I use the
 built-in package.el via [[https://github.com/jwiegley/use-package][use-package]].
 
 I've included a wrapper script for =stow= which sets the target
@@ -48,20 +48,11 @@ #+END_SRC
 
 *** Z Shell
 
-My zsh configuration uses [[https://zplug.sh/][zplug]], so that will need to be installed:
+My zsh configuration uses [[https://github.com/zdharma/zplugin][zplugin]]. I've included a setup script:
 
 #+BEGIN_SRC sh :exports code
-git clone git://github.com/zplug/zplug ~/projects/zplug/
+./zsh/config/zsh/setup.sh
 #+END_SRC
-
-To install the packages:
-
-#+BEGIN_SRC sh :exports code
-zsh -ic "zplug install"
-#+END_SRC
-
-Note that this will log some errors about a pipe, but that's okay.
-zplug is meant to be used in a real interactive shell.
 
 *** Emacs
 

@@ -10,8 +10,6 @@ then
     . $ZDOTDIR/zshenv.private
   fi
 
-  ZPLUG_HOME=${ZPLUG_HOME:-~/projects/github.com/zplug/zplug/}
-
   if [[ -z $SSH_AUTH_SOCK ]]
   then
     export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR:-/run/user/$UID}/ssh-agent

@@ -1,9 +1,5 @@
 # -*- mode: sh; -*-
-source $ZPLUG_HOME/init.zsh
 source $HOME/.zplugin/bin/zplugin.zsh
-
-# zplug "junegunn/fzf", as:plugin, use:"shell/*.zsh"
-# zplug "junegunn/fzf", as:command, use:"bin/*"
 
 HISTSIZE=3000
 SAVEHIST=10000
@@ -117,8 +113,6 @@ eval $(ssh-agent)
 fi
 
 # Plugins
-
-zplug load
 
 zplugin ice blockf
 zplugin load "zsh-users/zsh-completions"