diff --git a/.zshenv b/.zshenv index dd0e51c..6433afd 100644 --- a/.zshenv +++ b/.zshenv @@ -53,6 +53,11 @@ if [[ -n ${DISPLAY+set} ]]; then fi # }}} +if command -v bat >/dev/null; then + export PAGER=bat + export MANPAGER="sh -c 'col -bx | bat -l man -p'" +fi + # Uncrustify export UNCRUSTIFY_CONFIG="${XDG_CONFIG_HOME}/uncrustify/uncrustify.cfg" [ ! -r "${UNCRUSTIFY_CONFIG}" ] && unset UNCRUSTIFY_CONFIG diff --git a/15-options.zsh b/15-options.zsh deleted file mode 100644 index 5afa31b..0000000 --- a/15-options.zsh +++ /dev/null @@ -1,30 +0,0 @@ -# shellcheck shell=bash -# vim: ft=sh - -setopt AUTO_PUSHD # Push the current directory visited on the stack. -setopt PUSHD_IGNORE_DUPS # Do not store duplicates in the stack. -setopt PUSHD_SILENT # Do not print the directory stack after pushd or popd. - -autoload -Uz allopt zed zmv zcalc colors is-at-least -colors - -zmodload zsh/terminfo - -autoload -Uz edit-command-line -zle -N edit-command-line - -autoload -Uz select-word-style -select-word-style shell - -if [ -z ${DISABLE_MAGIC_FUNCTIONS+set} ]; then - if is-at-least 5.1; then - autoload -Uz bracketed-paste-magic - zle -N bracketed-paste bracketed-paste-magic - fi - autoload -Uz url-quote-magic - zle -N self-insert url-quote-magic -fi - -# Подсветка вывода основных команд -if [[ -r /etc/grc.zsh ]]; then source /etc/grc.zsh; fi - diff --git a/42-zinit.zsh b/42-zinit.zsh index 0b5175b..e81892d 100644 --- a/42-zinit.zsh +++ b/42-zinit.zsh @@ -10,7 +10,7 @@ ZINIT[ZCOMPDUMP_PATH]="$ZSH_CACHE_DIR/zcompdump" ZPFX="$ZSH_CACHE_DIR/polaris" if [ ! -d "${ZINIT[HOME_DIR]}" ]; then - wget -q -O - "https://github.com/zdharma-continuum/zinit/archive/refs/tags/v${ZINIT[VERSION]}.tar.gz" | tar zxf - -C "$ZSH_CACHE_DIR" + curl -sL "https://github.com/zdharma-continuum/zinit/archive/refs/tags/v${ZINIT[VERSION]}.tar.gz" | tar zxf - -C "$ZSH_CACHE_DIR" sed -i 's/.*zinit-self-update -q//' "${ZINIT[HOME_DIR]}/zinit-autoload.zsh" zcompile "${ZINIT[HOME_DIR]}/zinit.zsh" fi diff --git a/62-scripts.zsh b/62-scripts.zsh index 7fa12c8..25e743c 100644 --- a/62-scripts.zsh +++ b/62-scripts.zsh @@ -3,7 +3,8 @@ # Обновление конфигурации zsh, менеджера zinit и плагинов zu() { - git -C "${ZDOTDIR}" pull && zinit update --parallel --all + git -C $ZDOTDIR rev-parse 2>/dev/null && git -C $ZDOTDIR pull + zinit update --parallel --all exec zsh } diff --git a/68-aliases.zsh b/68-aliases.zsh index 153e75a..73d2441 100644 --- a/68-aliases.zsh +++ b/68-aliases.zsh @@ -67,6 +67,11 @@ alias gur="git pull --recurse-submodules" alias gsui="git submodule update --recursive --init" alias gsur="git submodule update --recursive --init --remote" +alias ycal="ncal $(date +%Y)" + +# gdu вместо ncdu +command -v gdu > /dev/null 2>&1 && alias ncdu=gdu + # Фильтры (H,T,G,L определены в common-aliases) alias -g N1='1>/dev/null' alias -g N2='2>/dev/null' diff --git a/fixes.zsh b/fixes.zsh index e2162f8..35054dd 100644 --- a/fixes.zsh +++ b/fixes.zsh @@ -4,7 +4,7 @@ # где отсутствует пакет kitty-terminfo fix-kitty-terminal-support() { mkdir -p $HOME/.terminfo/x - wget -qO - https://github.com/kovidgoyal/kitty/raw/master/terminfo/x/xterm-kitty > $HOME/.terminfo/x/xterm-kitty + curl -fsSL https://github.com/kovidgoyal/kitty/raw/master/terminfo/x/xterm-kitty > $HOME/.terminfo/x/xterm-kitty } # Настройка mc для работы в терминале kitty diff --git a/install.sh b/install.sh index 65292d8..5feaf24 100644 --- a/install.sh +++ b/install.sh @@ -2,17 +2,19 @@ set -e -sudo apt-get install git zsh +sudo apt-get install git zsh curl wget git clone https://git.246060.ru/config/zsh $HOME/.config/zsh cat < $HOME/.zshenv -# Загрузка конфигурации из каталога $ZDOTDIR -export ZDOTDIR=$HOME/.config/zsh -source $ZDOTDIR/.zshenv +# Загрузка конфигурации из каталога \$ZDOTDIR +export ZDOTDIR=\$HOME/.config/zsh +source \$ZDOTDIR/.zshenv EOF sudo usermod -s $(which zsh) $(whoami) -mkdir -p ~/.local/share/fonts -curl -fSL -o "$HOME/.local/share/fonts/Anonymice Nerd Font Complete.ttf" https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/AnonymousPro/complete/Anonymice%20Nerd%20Font%20Complete.ttf -curl -fSL -o "$HOME/.local/share/fonts/Anonymice Nerd Font Complete Mono.ttf" https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/AnonymousPro/complete/Anonymice%20Nerd%20Font%20Complete%20Mono.ttf +TEMP="${XDG_RUNTIME_DIR:-/tmp}" +wget -P "$TEMP" -c -r -nd --no-parent -A "fonts-iosevka-prog-nerd_*_all.deb" https://deb.246060.ru/bin/fonts/pool/main/f/fonts-iosevka-prog-nerd/ +sudo dpkg -i "$TEMP"/fonts-iosevka-prog-nerd_*_all.deb +rm -f "$TEMP"/fonts-iosevka-prog-nerd_*_all.deb +