Форматирование кода

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+charset                  = utf-8
+end_of_line              = lf
+insert_final_newline     = true
+trim_trailing_whitespace = true
+
+[[shell]]
+indent_style       = tab
+indent_size        = 4
+shell_variant      = bash
+switch_case_indent = true
+space_redirects    = true
+keep_padding       = true
+function_next_line = true

.zshrc

@@ -15,7 +15,6 @@ stages=(
 	45-plugins
 	55-agents
 	62-scripts
-	65-vpy
 	68-aliases
 	72-widgets
 	78-keybindings
@@ -35,7 +34,7 @@ for S in "${stages[@]}"; do
 	done
 done
 
-unset stages S N F
+unset stages S
 
 mkdir -p "$ZDOTDIR/apps.d"
 find "$ZDOTDIR/apps.d" -name "*.zsh" -print0 | sort -z | while IFS= read -r -d $'\0' app; do source "$app"; done

15-options.zsh

@@ -27,4 +27,3 @@ fi
 
 # Подсветка вывода основных команд
 if [[ -r /etc/grc.zsh ]]; then source /etc/grc.zsh; fi
-

25-history.zsh

@@ -21,4 +21,3 @@ setopt HIST_SAVE_NO_DUPS         # Don't write duplicate entries in the history
 setopt HIST_REDUCE_BLANKS        # Remove superfluous blanks before recording entry.
 setopt HIST_VERIFY               # Don't execute immediately upon history expansion.
 setopt HIST_BEEP                 # Beep when accessing nonexistent history.
-

45-plugins.zsh

@@ -51,12 +51,12 @@ fi
 
 if command -v fzf > /dev/null 2>&1; then
 	FZF_DEFAULT_OPTS='--height 60% --layout=reverse --border'
-	if command -v fdfind >/dev/null 2>&1; then
+	if command -v fdfind > /dev/null 2>&1; then
 		FZF_DEFAULT_COMMAND="fdfind --type f"
 		FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 		FZF_ALT_C_COMMAND="fdfind --type d"
 	fi
-	FZF_VERSION="$(fzf --version | sed -r 's/([0-9]+\.[0-9]+).*/\1/' )"
+	FZF_VERSION="$(fzf --version | sed -r 's/([0-9]+\.[0-9]+).*/\1/')"
 	zinit ice lucid wait'0' mv"completion.zsh -> _fzf" pick"_fzf" as"completion"
 	if is-at-least "0.54" "$FZF_VERSION"; then
 		zinit snippet "https://raw.githubusercontent.com/junegunn/fzf/refs/tags/v${FZF_VERSION}.0/shell/completion.zsh"
@@ -100,4 +100,3 @@ fi
 if command -v kitty > /dev/null 2>&1; then
 	zinit light redxtech/zsh-kitty
 fi
-

78-keybindings.zsh

@@ -3,4 +3,3 @@
 
 # [Esc] [Esc]
 bindkey '\e\e' send-break
-

95-finish.zsh

@@ -1,3 +1,2 @@
 # shellcheck shell=bash
 # vim: ft=sh
-

apps.d/bat.zsh

@@ -1,8 +1,7 @@
 # shellcheck shell=bash
 # vim: ft=sh
 
-if command -v bat >/dev/null; then
+! command -v bat > /dev/null && return
-	export PAGER=bat
-	export MANPAGER="sh -c 'col -bx | bat -l man -p'"
-fi
 
+export PAGER=bat
+export MANPAGER="sh -c 'col -bx | bat -l man -p'"

apps.d/eget.zsh

@@ -1,11 +1,12 @@
 # shellcheck shell=bash
 # vim: ft=sh
 
-if command -v eget >/dev/null; then
+! command -v dotdrop > /dev/null && return
+if command -v eget > /dev/null; then
 	EGET_CONFIG="$XDG_CONFIG_HOME/eget/eget.toml"
 	[ -r "$XDG_CONFIG_HOME/eget/eget.toml" ] && export EGET_CONFIG
 	[[ -z ${EGET_TARGET_DIR+set} ]] && EGET_TARGET_DIR="${XDG_CACHE_HOME}/eget"
 	export EGET_TARGET_DIR
-	mkdir -p "${EGET_TARGET_DIR}" >/dev/null
+	mkdir -p "${EGET_TARGET_DIR}" > /dev/null
 	export PATH="${EGET_TARGET_DIR}:${PATH}"
 fi

apps.d/oneapi.zsh

@@ -4,12 +4,11 @@
 if [[ -n ${ENABLE_INTEL_STUDIO+set} ]]; then
 	#export COMPILERVARS_ARCHITECTURE=intel64
 	#export COMPILERVARS_PLATFORM=linux
-	INTEL_VARS=( /opt/intel/oneapi/advisor/latest/advixe-vars.sh
+	INTEL_VARS=(/opt/intel/oneapi/advisor/latest/advixe-vars.sh
-	             /opt/intel/oneapi/compiler/latest/env/vars.sh
+		/opt/intel/oneapi/compiler/latest/env/vars.sh
-	             /opt/intel/oneapi/vtune/latest/vtune-vars.sh )
+		/opt/intel/oneapi/vtune/latest/vtune-vars.sh)
 
 	for f in "${INTEL_VARS[@]}"; do
-		if [ -r "$f" ]; then source "$f" >/dev/null; fi
+		if [ -r "$f" ]; then source "$f" > /dev/null; fi
 	done
 fi
-

apps.d/uncrustify.zsh

@@ -1,8 +1,7 @@
 # shellcheck shell=bash
 # vim: ft=sh
 
-if command -v uncrustify >/dev/null; then
+! command -v uncrustify > /dev/null && return
-	UNCRUSTIFY_CONFIG="${XDG_CONFIG_HOME}/uncrustify/uncrustify.cfg"
-	[ -r "${UNCRUSTIFY_CONFIG}" ] && export UNCRUSTIFY_CONFIG
-fi
 
+UNCRUSTIFY_CONFIG="${XDG_CONFIG_HOME}/uncrustify/uncrustify.cfg"
+[ -r "${UNCRUSTIFY_CONFIG}" ] && export UNCRUSTIFY_CONFIG

fixes.zsh

@@ -2,7 +2,8 @@
 
 # Установка файла описания терминала kitty на системы,
 # где отсутствует пакет kitty-terminfo
-fix-kitty-terminal-support() {
+fix-kitty-terminal-support()
+{
 	mkdir -p $HOME/.terminfo/x
 	curl -fsSL https://github.com/kovidgoyal/kitty/raw/master/terminfo/x/xterm-kitty > $HOME/.terminfo/x/xterm-kitty
 }
@@ -11,12 +12,13 @@ fix-kitty-terminal-support() {
 # Необходимо закрыть все экземпляры mc для текущего пользователя
 # При вызове функции с параметром -f текущие настройки клавиш
 # для работы mc в терминале kitty будут перезаписаны
-fix-mc-kitty-support() {
+fix-mc-kitty-support()
+{
 	local cfg="${HOME}/.config/mc/ini"
 
 	[[ "$1" == "-f" ]] && sed -i '/\[terminal:xterm-kitty\]/,/^$/{d}' "${cfg}"
 	if [ -w "${cfg}" ]; then
-		if ! grep -qF "[terminal:xterm-kitty]" "${cfg}" ; then
+		if ! grep -qF "[terminal:xterm-kitty]" "${cfg}"; then
 			echo >> "${cfg}"
 			echo "[terminal:xterm-kitty]" >> "${cfg}"
 			echo "copy=xterm" >> "${cfg}"
@@ -25,8 +27,8 @@ fix-mc-kitty-support() {
 }
 
 # Новые версии плагинов для поиска используют функционал fzf версии 0.54.1.
-fix-update-fzf() {
+fix-update-fzf()
+{
 	mkdir -p $HOME/bin
 	wget -O- https://github.com/junegunn/fzf/releases/download/v0.54.1/fzf-0.54.1-linux_amd64.tar.gz | tar -zxf - -C $HOME/bin
 }
-