From c0c19205749a42e2d59480fdde1a6a424e788445 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 17 Apr 2023 13:17:02 +0300 Subject: [PATCH 1/6] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20wget?= =?UTF-8?q?=20=D0=BD=D0=B0=20curl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 42-zinit.zsh | 2 +- fixes.zsh | 2 +- install.sh | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) 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/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..2b05370 100644 --- a/install.sh +++ b/install.sh @@ -2,13 +2,13 @@ set -e -sudo apt-get install git zsh +sudo apt-get install git zsh curl 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) From 9e58e8e04f2c69c91d32790f694b9cf4a7cd681f Mon Sep 17 00:00:00 2001 From: Andrei Astafev Date: Fri, 28 Apr 2023 14:25:46 +0300 Subject: [PATCH 2/6] =?UTF-8?q?=D0=9F=D1=80=D0=B8=20=D0=BD=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D1=87=D0=B8=D0=B8=20bat=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B5=D0=B3=D0=BE?= =?UTF-8?q?=20=D0=B2=20=D0=BA=D0=B0=D1=87=D0=B5=D1=81=D1=82=D0=B2=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=B5=D0=B9=D0=B4=D0=B6=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .zshenv | 5 +++++ 1 file changed, 5 insertions(+) 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 From 88efc823764410246c15e40ccee93ad91d367e63 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sat, 6 May 2023 19:15:33 +0300 Subject: [PATCH 3/6] ycal --- 68-aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/68-aliases.zsh b/68-aliases.zsh index 153e75a..c52bdc0 100644 --- a/68-aliases.zsh +++ b/68-aliases.zsh @@ -67,6 +67,8 @@ 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)" + # Фильтры (H,T,G,L определены в common-aliases) alias -g N1='1>/dev/null' alias -g N2='2>/dev/null' From b25739c78b926c904bfefc7b52a89706688fc198 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 8 May 2023 11:34:57 +0300 Subject: [PATCH 4/6] =?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=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=20=D1=81?= =?UTF-8?q?=D0=BE=20=D1=88=D1=80=D0=B8=D1=84=D1=82=D0=BE=D0=BC=20Iosevka?= =?UTF-8?q?=20Prog=20Nerd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 2b05370..5feaf24 100644 --- a/install.sh +++ b/install.sh @@ -2,7 +2,7 @@ set -e -sudo apt-get install git zsh curl +sudo apt-get install git zsh curl wget git clone https://git.246060.ru/config/zsh $HOME/.config/zsh cat < $HOME/.zshenv @@ -13,6 +13,8 @@ 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 + From 442480e15172a4653acc354ac24ff495105b654b Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 12 May 2023 23:43:28 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=D0=9F=D1=80=D0=B8=20=D0=BD=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D1=87=D0=B8=D0=B8=20gdu=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81?= =?UTF-8?q?=D0=BA=D0=B0=D1=82=D1=8C=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE?= =?UTF-8?q?=20ncdu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 68-aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/68-aliases.zsh b/68-aliases.zsh index c52bdc0..73d2441 100644 --- a/68-aliases.zsh +++ b/68-aliases.zsh @@ -69,6 +69,9 @@ 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' From a7e2a485810bc9576f0b48ed15f45eb7438776a6 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 12 May 2023 23:58:28 +0300 Subject: [PATCH 6/6] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20$ZDOTDIR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 62-scripts.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/62-scripts.zsh b/62-scripts.zsh index 49c1cd6..25e743c 100644 --- a/62-scripts.zsh +++ b/62-scripts.zsh @@ -3,6 +3,7 @@ # Обновление конфигурации zsh, менеджера zinit и плагинов zu() { + git -C $ZDOTDIR rev-parse 2>/dev/null && git -C $ZDOTDIR pull zinit update --parallel --all exec zsh }