From 345d23e0dccd442ed7d56fa8628709bb4f4d561b Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Mon, 19 Dec 2022 11:22:18 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC?=
 =?UTF-8?q?=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D1=8F=D0=B5=D1=82=D1=81?=
 =?UTF-8?q?=D1=8F=20=D1=81=20=D0=BF=D0=BE=D0=BC=D0=BE=D1=89=D1=8C=D1=8E=20?=
 =?UTF-8?q?zyedidia/eget?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 45-plugins.zsh     | 38 ++++++++++++--------------------------
 82-completion.zsh  |  3 ++-
 85-keybindings.zsh |  5 ++++-
 88-prompt.zsh      |  2 +-
 4 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/45-plugins.zsh b/45-plugins.zsh
index fb4c849..698a183 100644
--- a/45-plugins.zsh
+++ b/45-plugins.zsh
@@ -1,8 +1,8 @@
 # shellcheck shell=bash
 # vim: ft=sh
 
-zinit load willghatch/zsh-saneopt
-zinit load mafredri/zsh-async
+zinit light willghatch/zsh-saneopt
+zinit light mafredri/zsh-async
 
 export ZSHZ_CASE=smart
 export ZSHZ_DATA="${ZSH_CACHE_DIR}/z"
@@ -16,10 +16,6 @@ if [ "$(id -u)" != "0" ] && [[ -n ${DISPLAY+set} ]]; then
 	zinit light marzocchi/zsh-notify
 fi
 
-zinit ice wait'!0' from"gh-r" as"program"
-zinit light denisidoro/navi
-zinit snippet https://github.com/denisidoro/navi/blob/master/shell/navi.plugin.zsh
-
 zinit snippet OMZL::clipboard.zsh
 zinit snippet OMZL::key-bindings.zsh
 zinit snippet OMZL::termsupport.zsh
@@ -34,33 +30,23 @@ zinit snippet OMZP::pre-commit
 zinit snippet OMZP::rsync
 zinit snippet OMZP::vscode
 zinit snippet OMZP::web-search
-zinit load brymck/print-alias
+zinit light brymck/print-alias
 
-zinit ice wait'!0' from"gh-r" as"program"
-zinit light junegunn/fzf
+if command -v fzf > /dev/null 2>&1; then
+	zinit ice wait'!0' mv"completion.zsh -> _fzf" pick"_fzf" as"completion"
+	zinit snippet https://github.com/junegunn/fzf/blob/master/shell/completion.zsh
+	zinit snippet https://github.com/junegunn/fzf/blob/master/shell/key-bindings.zsh
 
-zinit ice wait'!0' mv"completion.zsh -> _fzf" pick"_fzf" as"completion"
-zinit snippet https://github.com/junegunn/fzf/blob/master/shell/completion.zsh
-zinit snippet https://github.com/junegunn/fzf/blob/master/shell/key-bindings.zsh
-
-zinit ice wait'!0' lucid
-zinit light joshskidmore/zsh-fzf-history-search
+	zinit ice wait'!0' lucid
+	zinit light joshskidmore/zsh-fzf-history-search
+fi
 
 if command -v git > /dev/null 2>&1; then
 	GIT_AUTO_FETCH_INTERVAL=3600
 	zinit snippet OMZP::git
+	zinit snippet OMZP::git-extras
 	zinit snippet OMZP::github
-	zinit load paulirish/git-open
 	[ -z ${SSH_CONNECTION+set} ] && zinit snippet OMZP::git-auto-fetch
-	if [ -x /usr/bin/git-extras ]; then
-		zinit snippet OMZP::git-extras
-	else
-		zinit lucid wait'0a' depth"1" for \
-			as"program" \
-			pick"$ZPFX/bin/git-*" \
-			src"etc/git-extras-completion.zsh" \
-			make"PREFIX=$ZPFX" tj/git-extras
-	fi
 fi
 
 if command -v psql > /dev/null 2>&1; then
@@ -84,6 +70,6 @@ if command -v tmux > /dev/null 2>&1; then
 	zinit light amyreese/zsh-titles
 fi
 if command -v kitty > /dev/null 2>&1; then
-	zinit load redxtech/zsh-kitty
+	zinit light redxtech/zsh-kitty
 fi
 
diff --git a/82-completion.zsh b/82-completion.zsh
index 2fecc2e..1fe6a58 100644
--- a/82-completion.zsh
+++ b/82-completion.zsh
@@ -5,6 +5,7 @@
 zstyle ':completion:*'   accept-exact '*(N)'
 zstyle ':completion:*'   use-cache on
 zstyle ':completion:*'   cache-path "$ZSH_CACHE_DIR"
+zstyle ':completion:*'   menu select
 
 zstyle ':completion:*:processes'          command 'ps -ax'
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;32'
@@ -37,7 +38,7 @@ zinit wait'!0' lucid light-mode depth'1' for \
 	  zsh-users/zsh-autosuggestions
 
 if [[ -n ${ZSH_MC_SUBSHELL+set} ]] && [[ -n ${SSH_CONNECTION+set} ]]; then
-	zinit load zsh-users/zsh-history-substring-search
+	zinit light zsh-users/zsh-history-substring-search
 else
 	zstyle ":history-search-multi-word" page-size "$((LINES/2))"
 	zstyle ":plugin:history-search-multi-word" clear-on-cancel "yes"
diff --git a/85-keybindings.zsh b/85-keybindings.zsh
index 0cb25ca..f7a6adb 100644
--- a/85-keybindings.zsh
+++ b/85-keybindings.zsh
@@ -5,7 +5,10 @@
 bindkey '\e\e' send-break
 
 # Navi
-bindkey '^G' _navi_widget
+if command -v navi > /dev/null 2>&1; then
+	zinit snippet https://github.com/denisidoro/navi/blob/master/shell/navi.plugin.zsh
+	bindkey '^G' _navi_widget
+fi
 
 # FZF #{{{
 bindkey "^F" fzf-file-widget  # Ctrl+F file search
diff --git a/88-prompt.zsh b/88-prompt.zsh
index 05cab4e..09b322d 100644
--- a/88-prompt.zsh
+++ b/88-prompt.zsh
@@ -8,5 +8,5 @@ if is-at-least 5.3; then
 	# To customize prompt, run `p10k configure` or edit ~/.config/zsh/.p10k.zsh.
 	[[ -r "$ZDOTDIR/.p10k.zsh" ]] && source "$ZDOTDIR/.p10k.zsh"
 else
-	zinit load agkozak/agkozak-zsh-prompt
+	zinit light agkozak/agkozak-zsh-prompt
 fi