diff options
| -rw-r--r-- | README.org | 15 | ||||
| -rw-r--r-- | zsh/.config/zsh/.zshenv | 2 | ||||
| -rw-r--r-- | zsh/.config/zsh/.zshrc | 6 |
3 files changed, 3 insertions, 20 deletions
diff --git a/README.org b/README.org index 2ed06332..3acd8b22 100644 --- a/README.org +++ b/README.org @@ -4,7 +4,7 @@ I've organised this repository with [[https://www.gnu.org/software/stow/][GNU St [[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,21 +48,12 @@ And then to uninstall *** 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 I use org-mode for my Emacs init file. To simplify setup, I created a diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv index 114e5ce9..87276bd0 100644 --- a/zsh/.config/zsh/.zshenv +++ b/zsh/.config/zsh/.zshenv @@ -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 diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index 16380e4c..6f112a96 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -1,10 +1,6 @@ # -*- 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 HISTFILE=${XDG_CACHE_HOME:=$HOME/.cache}/zsh/history @@ -118,8 +114,6 @@ fi # Plugins -zplug load - zplugin ice blockf zplugin load "zsh-users/zsh-completions" zplugin load "hlissner/zsh-autopair" |