From b1ab03e1657cd7246ab91815e37f83d434405a93 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Fri, 23 Dec 2022 15:10:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=D1=8B,=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=B2=D0=BE=D0=B4=D1=8F=D1=89=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=BA=20=D0=BD=D0=B5=D1=81=D1=82=D0=B0=D0=B1=D0=B8=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B9=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 45-plugins.zsh    |  6 +-----
 72-widgets.zsh    | 27 ++++++---------------------
 82-completion.zsh | 26 ++++++++++++++++++++------
 README.md         |  2 +-
 4 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/45-plugins.zsh b/45-plugins.zsh
index 16f3e26..f893c17 100644
--- a/45-plugins.zsh
+++ b/45-plugins.zsh
@@ -11,7 +11,7 @@ zinit light agkozak/zsh-z
 
 zinit snippet OMZP::pj
 
-if [ "$(id -u)" != "0" ] && [[ -n ${DISPLAY+set} ]]; then
+if [[ "$(id -u)" != "0" ]] && [[ -n "${DISPLAY+set}" ]]; then
 	zstyle ':notify:*' expire-time 5000
 	zstyle ':notify:*' command-complete-timeout 20
 	zstyle ':notify:*' enable-on-ssh yes
@@ -22,9 +22,6 @@ zinit snippet OMZL::clipboard.zsh
 zinit snippet OMZL::key-bindings.zsh
 zinit snippet OMZL::termsupport.zsh
 
-if command -v autojump > /dev/null 2>&1; then
-	zinit snippet OMZP::autojump
-fi
 if [ -x /usr/lib/command-not-found ]; then
 	zinit snippet OMZP::command-not-found
 fi
@@ -54,7 +51,6 @@ if command -v fzf > /dev/null 2>&1; then
 		zinit ice lucid 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
-
 	fi
 fi
 
diff --git a/72-widgets.zsh b/72-widgets.zsh
index 3879c38..c6dd04a 100644
--- a/72-widgets.zsh
+++ b/72-widgets.zsh
@@ -18,28 +18,13 @@ if command -v fzf > /dev/null 2>&1; then
 	}
 	zle -N magic-ctrl-f
 	bindkey '^F' magic-ctrl-f
-
-	zinit ice wait'1' lucid light-mode depth'1' \
-	  atload"bindkey '^H' fzf-history; \
-	         bindkey '^Z' fzf-kill-proc-by-list"
-	zinit light amaya382/zsh-fzf-widgets
-	ZSH_FZF_PASTE_KEY=enter
-	ZSH_FZF_EXEC_KEY=ctrl-r
 fi
 #}}}
 
-zinit wait'1' lucid light-mode depth'1' for \
-	atload"bindkey '^[[A' history-substring-search-up; \
-	       bindkey '^[[B' history-substring-search-down" \
-	  zsh-users/zsh-history-substring-search
+#ZSH_FZF_PASTE_KEY=enter
+#ZSH_FZF_EXEC_KEY=ctrl-r
+#zinit wait'0' lucid light-mode depth'1' for \
+#  atload"bindkey '^H' fzf-history; \
+#         bindkey '^Z' fzf-kill-proc-by-list" \
+#    amaya382/zsh-fzf-widgets
 
-[ "$(lsb_release -c -s)" = "orel" ] && ZSH_HISTORY_SEARCH_MULTI_WORD_MODE=1
-[ -n "${SSH_CONNECTION}" ] && ZSH_HISTORY_SEARCH_MULTI_WORD_MODE=2
-
-zstyle ':history-search-multi-word' page-size "$((LINES/2))"
-zstyle ':plugin:history-search-multi-word' clear-on-cancel 'yes'
-zinit ice \
-  if'[[ -z ${ZSH_HISTORY_SEARCH_MULTI_WORD_MODE+set} ]]' \
-  wait'1' lucid light-mode depth'1' \
-  atload"bindkey '^K' history-search-multi-word"
-zinit light zdharma-continuum/history-search-multi-word
diff --git a/82-completion.zsh b/82-completion.zsh
index 5d95747..0099d9b 100644
--- a/82-completion.zsh
+++ b/82-completion.zsh
@@ -30,10 +30,24 @@ zstyle ':completion:*:(ssh|scp|rsync):*:hosts-ipaddr' ignored-patterns '^<->.<->
 # marlonrichert/zsh-autocomplete
 
 zinit wait'0' lucid light-mode depth'1' for \
-	atinit"ZINIT[COMPINIT_OPTS]=-C; zicompinit; zicdreplay" \
-	  zdharma-continuum/fast-syntax-highlighting \
-	blockf \
-	  zsh-users/zsh-completions \
-	atload"!_zsh_autosuggest_start" \
-	  zsh-users/zsh-autosuggestions
+  atinit"ZINIT[COMPINIT_OPTS]=-C; zicompinit; zicdreplay" \
+    zdharma-continuum/fast-syntax-highlighting \
+  blockf \
+    zsh-users/zsh-completions \
+  atload"!_zsh_autosuggest_start" \
+    zsh-users/zsh-autosuggestions
+
+zinit wait'0' lucid light-mode depth'1' for \
+  atload"bindkey '^[[A' history-substring-search-up; \
+         bindkey '^[[B' history-substring-search-down" \
+    zsh-users/zsh-history-substring-search
+
+#[ "$(lsb_release -c -s)" = "orel" ] && ZSH_HISTORY_SEARCH_MULTI_WORD_MODE=1
+#[ -n "${SSH_CONNECTION}" ] && ZSH_HISTORY_SEARCH_MULTI_WORD_MODE=2
+#zstyle ':history-search-multi-word' page-size "$((LINES/2))"
+#zstyle ':plugin:history-search-multi-word' clear-on-cancel 'yes'
+#zinit ice if'[[ -z ${ZSH_HISTORY_SEARCH_MULTI_WORD_MODE+set} ]]' \
+#  wait'0' lucid light-mode depth'1' for \
+#  atload"bindkey '^K' history-search-multi-word"
+#zinit light zdharma-continuum/history-search-multi-word
 
diff --git a/README.md b/README.md
index 1398092..402fd07 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ sh -c "$(curl -fsSL https://raw.githubusercontent.com/romkatv/zsh-bin/master/ins
 Установить рекомендуемые пакеты:
 
 ```sh
-sudo apt-get install autojump command-not-found grc grepcidr kitty-terminfo wmctrl xdotool
+sudo apt-get install command-not-found grc grepcidr kitty-terminfo wmctrl xdotool
 ```
 
 Установить дополнительные программы по [инструкции](https://git.246060.ru/config/eget/).