From 2598a7df9785d9e116fedd536ea5e2d8996d0995 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Tue, 17 Jan 2017 22:39:07 +0100 Subject: [PATCH] switch to zplug --- .gitmodules | 3 +++ zplug | 1 + zshrc | 45 +++++++++++++++++++++++---------------------- 3 files changed, 27 insertions(+), 22 deletions(-) create mode 160000 zplug diff --git a/.gitmodules b/.gitmodules index 937ce79..c432241 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "base16-shell"] path = base16-shell url = git@github.com:chriskempson/base16-shell.git +[submodule "zplug"] + path = zplug + url = https://github.com/zplug/zplug diff --git a/zplug b/zplug new file mode 160000 index 0000000..063d26f --- /dev/null +++ b/zplug @@ -0,0 +1 @@ +Subproject commit 063d26f8009e6a651c124fe8c049346fb49c2769 diff --git a/zshrc b/zshrc index 2acd7b6..506f6e2 100644 --- a/zshrc +++ b/zshrc @@ -1,31 +1,25 @@ -# load zgen -source "${HOME}/.dotfiles/zgen/zgen.zsh" +source ~/.dotfiles/zplug/init.zsh -if ! zgen saved; then - echo "Creating a zgen save" - zgen oh-my-zsh lib/spectrum.zsh - zgen oh-my-zsh lib/directories.zsh - zgen oh-my-zsh lib/grep.zsh - zgen oh-my-zsh lib/history.zsh - zgen oh-my-zsh lib/misc.zsh - zgen oh-my-zsh plugins/common-aliases - zgen oh-my-zsh plugins/frontend-search +zplug "lib/spectrum.zsh", from:oh-my-zsh +zplug "lib/directories.zsh", from:oh-my-zsh +zplug "lib/grep.zsh", from:oh-my-zsh +zplug "lib/history.zsh", from:oh-my-zsh +zplug "lib/misc.zsh", from:oh-my-zsh +zplug "plugins/common-aliases", from:oh-my-zsh +zplug "plugins/frontend-search", from:oh-my-zsh - zgen load zsh-users/zsh-completions src - zgen load zsh-users/zsh-syntax-highlighting +zplug "zsh-users/zsh-completions", use:"src/*.zsh" +zplug "zsh-users/zsh-syntax-highlighting", defer:2 - zgen load peterhurford/git-it-on.zsh - zgen load gerges/oh-my-zsh-jira-plus +zplug "peterhurford/git-it-on.zsh" +zplug "gerges/oh-my-zsh-jira-plus" - zgen load mafredri/zsh-async - zgen load sindresorhus/pure - - zgen save -fi +zplug "mafredri/zsh-async" +zplug "sindresorhus/pure" ######################## -# Other settings +# Other settings ######################## setopt auto_cd setopt multios @@ -78,7 +72,14 @@ bindkey ' ' magic-space # Base16 Shell BASE16_SHELL=$HOME/.base16-shell/ -[ -n "$PS1" ] && dark +[ -n "$PS1" ] && dark [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh + +# zplug +if ! zplug check; then + zplug install +fi + +zplug load