Замена antibody на zplug

.zshrc

@@ -21,4 +21,6 @@ source $ZDOTDIR/prompt.zsh
 source $ZDOTDIR/aliases.zsh
 [ -e $ZDOTDIR/aliases.user.zsh ] && source $ZDOTDIR/aliases.user.zsh
 
+zplug load
+
 true

README.md

@@ -3,7 +3,7 @@
 Установка необходимых пакетов:
 
 ```sh
-sudo apt-get install zsh antibody
+sudo apt-get install zsh
 ```
 
 Установка желательных пакетов:
@@ -53,7 +53,7 @@ cp ~/.config/zsh/agents.zsh ~/.config/zsh/agents.user.zsh
 Раскомментировать в файле ` ~/.config/zsh/agents.user.zsh` строку:
 
 ```text
-# antibody bundle ohmyzsh/ohmyzsh path:plugins/gpg-agent
+# zplug "plugins/gpg-agent", from:oh-my-zsh
 ```
 
 Пример файла настройки GPG агента `~/.config/gnupg/gpg-agent.conf`:
@@ -80,7 +80,7 @@ pinentry-program /usr/bin/pinentry-qt
 # zstyle :omz:plugins:ssh-agent agent-forwarding on
 # zstyle :omz:plugins:ssh-agent identities id_rsa
 # zstyle :omz:plugins:ssh-agent lifetime 10h
-# antibody bundle ohmyzsh/ohmyzsh path:plugins/ssh-agent
+# zplug "plugins/ssh-agent", from:oh-my-zsh
 ```
 
 Добавить в конец файла `~/.ssh/config` правило для разрешения агенту сохранять ключи:
@@ -104,8 +104,17 @@ Host *
 # zstyle :omz:plugins:keychain identities id_rsa 01234567
 # zstyle :omz:plugins:keychain options --quiet --inherit local-once --noask --nocolor --quick
 # zstyle :omz:plugins:keychain agents gpg,ssh
-# antibody bundle ohmyzsh/ohmyzsh path:plugins/keychain
+# zplug "plugins/keychain", from:oh-my-zsh
 ```
 
 Отредактировать файлы настроек для агента GPG и SSH, как это описано в разделах выше.
 
+
+## Инициализация плагинов
+
+После редактирования файлов настройки запустить `zsh`, в результате чего будет
+загружен менеджер пакетов `zplug`. Для загрузки пакетов выполнить команду:
+
+```sh
+zplug install
+```

agents.zsh

@@ -6,12 +6,12 @@
 # zstyle :omz:plugins:ssh-agent agent-forwarding on
 # zstyle :omz:plugins:ssh-agent identities id_rsa
 # zstyle :omz:plugins:ssh-agent lifetime 10h
-# antibody bundle ohmyzsh/ohmyzsh path:plugins/ssh-agent
+# zplug "plugins/ssh-agent", from:oh-my-zsh
 
 ##
 # GPG agent
 ##
-# antibody bundle ohmyzsh/ohmyzsh path:plugins/gpg-agent
+# zplug "plugins/gpg-agent", from:oh-my-zsh
 
 ##
 # Keychain
@@ -19,5 +19,5 @@
 # zstyle :omz:plugins:keychain identities id_rsa 01234567
 # zstyle :omz:plugins:keychain options --quiet --inherit local-once --noask --nocolor --quick
 # zstyle :omz:plugins:keychain agents gpg,ssh
-# antibody bundle ohmyzsh/ohmyzsh path:plugins/keychain
+# zplug "plugins/keychain", from:oh-my-zsh
 

env.zsh

@@ -2,6 +2,7 @@ export XDG_CONFIG_HOME=$HOME/.config
 export XDG_CACHE_HOME=$HOME/.cache
 export XDG_DATA_HOME=$HOME/.local/share
 
+export ZPLUG_HOME=$XDG_CACHE_HOME/zplug
 export PATH=$HOME/bin:$HOME/.local/bin:$PATH
 
 # Удалить дубликаты в PATH

plugins.zsh

@@ -1,27 +1,35 @@
-# Менеджер плагинов antibody
+# Менеджер плагинов zplug
-source <(antibody init)
+if [ ! -d $ZPLUG_HOME ]; then
+	git clone https://github.com/zplug/zplug $ZPLUG_HOME
+fi
+
+source $ZPLUG_HOME/init.zsh
 
 # Плагины
-antibody bundle zdharma/fast-syntax-highlighting
+zplug "zdharma/fast-syntax-highlighting", defer:2
-antibody bundle zsh-users/zsh-autosuggestions
+
-antibody bundle zsh-users/zsh-history-substring-search
+# Make sure to use double quotes
-antibody bundle zsh-users/zsh-completions
+zplug "zsh-users/zsh-history-substring-search"
-antibody bundle rupa/z
+
+zplug "zsh-users/zsh-autosuggestions"
+zplug "zsh-users/zsh-history-substring-search"
+zplug "zsh-users/zsh-completions"
+zplug "rupa/z"
 if [[ "$DISPLAY" != '' ]] && command -v xdotool > /dev/null 2>&1 &&  command -v wmctrl > /dev/null 2>&1; then
-	antibody bundle marzocchi/zsh-notify
+	zplug "marzocchi/zsh-notify"
 	zstyle ':notify:*' expire-time 6000
 	zstyle ':notify:*' command-complete-timeout 20
 fi
 if command -v peco > /dev/null 2>&1; then
-	antibody bundle jimeh/zsh-peco-history
+	zplug "jimeh/zsh-peco-history"
 fi
 
-antibody bundle ohmyzsh/ohmyzsh path:plugins/command-not-found
+zplug "plugins/command-not-found",   from:oh-my-zsh
-antibody bundle ohmyzsh/ohmyzsh path:plugins/common-aliases
+zplug "plugins/common-aliases", from:oh-my-zsh
-antibody bundle ohmyzsh/ohmyzsh path:plugins/debian
+zplug "plugins/debian", from:oh-my-zsh
 if command -v fzf > /dev/null 2>&1; then
 	export DISABLE_FZF_KEY_BINDINGS=true
-	antibody bundle ohmyzsh/ohmyzsh path:plugins/fzf
+	zplug "plugins/fzf", from:oh-my-zsh
 	# fzf
 	if [ -e /usr/share/doc/fzf/examples/key-bindings.zsh ]; then
 		.  /usr/share/doc/fzf/examples/key-bindings.zsh
@@ -31,13 +39,14 @@ if command -v fzf > /dev/null 2>&1; then
 	fi
 fi
 if command -v git > /dev/null 2>&1; then
-	antibody bundle ohmyzsh/ohmyzsh path:plugins/git
+	zplug "plugins/git", from:oh-my-zsh
 fi
 if command -v psql > /dev/null 2>&1; then
-	antibody bundle ohmyzsh/ohmyzsh path:plugins/postgres
+	zplug "plugins/postgres", from:oh-my-zsh
 fi
-antibody bundle ohmyzsh/ohmyzsh path:plugins/sudo
+zplug "plugins/sudo", from:oh-my-zsh
-antibody bundle ohmyzsh/ohmyzsh path:plugins/systemd
+zplug "plugins/systemd", from:oh-my-zsh
-antibody bundle ohmyzsh/ohmyzsh path:plugins/vim-interaction
+zplug "plugins/vim-interaction", from:oh-my-zsh
-antibody bundle ohmyzsh/ohmyzsh path:plugins/web-search
+zplug "plugins/web-search", from:oh-my-zsh
-antibody bundle djui/alias-tips
+
+zplug "djui/alias-tips"

prompt.zsh

@@ -27,8 +27,8 @@ if [[ "$TERM_PROGRAM" == "Hyper" ]]; then
   SPACESHIP_GIT_BRANCH_SHOW=false
 fi
 
-if $(is-at-least 5.2); then
+if __zplug::base::base::zsh_version 5.2; then
-	antibody bundle denysdovhan/spaceship-prompt
+	zplug "denysdovhan/spaceship-prompt"
 else
-	antibody bundle nojhan/liquidprompt
+	zplug "nojhan/liquidprompt"
 fi