From 19280ec6fcbfaffcb26fdf16cd240d4df25b9363 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sat, 17 Dec 2022 19:30:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .p10k.zsh | 1 + 15-env.zsh | 56 ------------------------------------------ 35-options.zsh | 26 -------------------- 42-zcomet.zsh | 13 ---------- 45-prompt.zsh | 12 --------- 48-plugins.zsh | 66 -------------------------------------------------- 6 files changed, 1 insertion(+), 173 deletions(-) delete mode 100644 15-env.zsh delete mode 100644 35-options.zsh delete mode 100644 42-zcomet.zsh delete mode 100644 45-prompt.zsh delete mode 100644 48-plugins.zsh diff --git a/.p10k.zsh b/.p10k.zsh index 6258d0f..bdbffb2 100644 --- a/.p10k.zsh +++ b/.p10k.zsh @@ -33,6 +33,7 @@ typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( # =========================[ Line #1 ]========================= os_icon # os identifier + context # user@hostname dir # current directory vcs # git status # =========================[ Line #2 ]========================= diff --git a/15-env.zsh b/15-env.zsh deleted file mode 100644 index e114263..0000000 --- a/15-env.zsh +++ /dev/null @@ -1,56 +0,0 @@ -# PATH -if [[ -d "$HOME/.gem/ruby" ]]; then - PATH="$(find $HOME/.gem/ruby -maxdepth 2 -name bin -type d | sort -r | tr '\n' ':')$PATH" -fi - -for P in \ - "$HOME/bin" \ - "$HOME/.local/bin" \ - "$HOME/.local/share/gem/ruby/3.0.0/bin" -do - if [[ -d "${P}" ]]; then - export PATH="${P}:${PATH}" - fi -done - -# Отключаем некоторые плагины, если запуск в качестве подоболочки mc -# Bug: https://midnight-commander.org/ticket/4253 -#if ps $PPID | grep mc; then -# export ZSH_MC_WORKAROUND=1 -#fi - -# Удалить дубликаты в PATH -typeset -U PATH - -export GNUPGHOME="$XDG_CONFIG_HOME/gnupg" -export SVDIR="$HOME/sv" - -# ASKPASS -if [ ! -z ${DISPLAY+x} ]; then - if command -v /usr/lib/openssh/gnome-ssh-askpass 2>&1 >/dev/null; then - export SSH_ASKPASS=/usr/lib/openssh/gnome-ssh-askpass - elif command -v /usr/bin/lxqt-openssh-askpass 2>&1 >/dev/null; then - export SSH_ASKPASS=/usr/bin/lxqt-openssh-askpass - elif command -v /usr/bin/ssh-askpass 2>&1 >/dev/null; then - export SSH_ASKPASS=/usr/bin/ssh-askpass - fi -fi - -# Настройка uncrustify -UNCRUSTIFY_CONFIG="${XDG_CONFIG_HOME}/uncrustify/default.cfg" -[ -e "${UNCRUSTIFY_CONFIG}" ] && export UNCRUSTIFY_CONFIG - -# Настройка Intel Studio -if [ ! -z ${ENABLE_INTEL_STUDIO+x} ]; then - #export COMPILERVARS_ARCHITECTURE=intel64 - #export COMPILERVARS_PLATFORM=linux - #/opt/intel/bin/iccvars.sh - INTEL_VARS=( /opt/intel/advisor/advixe-vars.sh - /opt/intel/inspector/inspxe-vars.sh - /opt/intel/vtune_profiler/vtune-vars.sh ) - - for f in ${INTEL_VARS[*]}; do - [ -e "$f" ] && source "$f" > /dev/null - done -fi - diff --git a/35-options.zsh b/35-options.zsh deleted file mode 100644 index 796d0f0..0000000 --- a/35-options.zsh +++ /dev/null @@ -1,26 +0,0 @@ -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 -#bindkey -M vicmd v edit-command-line - -autoload -Uz select-word-style -select-word-style shell - -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 - -# Подсветка вывода основных команд -[[ -r /etc/grc.zsh ]] && source /etc/grc.zsh - diff --git a/42-zcomet.zsh b/42-zcomet.zsh deleted file mode 100644 index e5cfcd0..0000000 --- a/42-zcomet.zsh +++ /dev/null @@ -1,13 +0,0 @@ -export ZCOMET_DIR="${ZSH_CACHE_DIR}/zcomet" - -zstyle ':zcomet:*' home-dir "${ZCOMET_DIR}" -zstyle ':zcomet:*' repos-dir "${ZCOMET_DIR}/repos" -zstyle ':zcomet:*' snippets-dir "${ZCOMET_DIR}/snippets" -zstyle ':zcomet:compinit' dump-file "${ZSH_COMPDUMP}" - -# -if [[ ! -f "${ZCOMET_DIR}/bin/zcomet.zsh" ]]; then - command git clone --depth=1 https://github.com/agkozak/zcomet.git "${ZCOMET_DIR}/bin" -fi -source "${ZCOMET_DIR}/bin/zcomet.zsh" - diff --git a/45-prompt.zsh b/45-prompt.zsh deleted file mode 100644 index 968e6d7..0000000 --- a/45-prompt.zsh +++ /dev/null @@ -1,12 +0,0 @@ -if is-at-least 5.3; then - if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then - source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" - fi - - if [[ ! -f "${ZCOMET_DIR}/prompt/powerlevel10k/powerlevel10k.zsh-theme" ]]; then - command git clone --depth=1 https://github.com/romkatv/powerlevel10k.git "${ZCOMET_DIR}/prompt/powerlevel10k" - fi - source "${ZCOMET_DIR}/prompt/powerlevel10k/powerlevel10k.zsh-theme" -else - zcomet load agkozak/agkozak-zsh-prompt -fi diff --git a/48-plugins.zsh b/48-plugins.zsh deleted file mode 100644 index e5e711a..0000000 --- a/48-plugins.zsh +++ /dev/null @@ -1,66 +0,0 @@ -zcomet trigger zhooks agkozak/zhooks - -zcomet load willghatch/zsh-saneopt -zcomet load mafredri/zsh-async -zcomet load romkatv/zsh-defer - -export ZSHZ_CASE=smart -export ZSHZ_DATA="${ZSH_CACHE_DIR}/z" -zcomet load agkozak/zsh-z - -if [[ "$(id -u)" != "0" ]] && [[ "$DISPLAY" != '' ]]; then - zstyle ':notify:*' expire-time 5000 - zstyle ':notify:*' command-complete-timeout 20 - zstyle ':notify:*' enable-on-ssh yes - zcomet load marzocchi/zsh-notify -fi -if command -v peco > /dev/null 2>&1; then - zcomet load jimeh/zsh-peco-history -fi - -zcomet load ohmyzsh lib key-bindings.zsh -zcomet load ohmyzsh plugins/autojump -zcomet load ohmyzsh plugins/command-not-found -zcomet load ohmyzsh plugins/common-aliases -zcomet load ohmyzsh plugins/debian -zcomet load ohmyzsh plugins/isodate -zcomet load ohmyzsh plugins/nmap -zcomet load ohmyzsh plugins/rsync -zcomet load ohmyzsh plugins/web-search -zcomet load brymck/print-alias - -zcomet load junegunn/fzf shell completion.zsh key-bindings.zsh -(( ${+commands[fzf]} )) || ~[fzf]/install --bin - -if command -v git > /dev/null 2>&1; then - GIT_AUTO_FETCH_INTERVAL=3600 - zcomet load ohmyzsh plugins/git - zcomet load ohmyzsh plugins/gitfast - [ -z "$SSH_CONNECTION" ] && zcomet load ohmyzsh plugins/git-auto-fetch - zcomet load ohmyzsh plugins/git-extras - zcomet load ohmyzsh plugins/github - zcomet load paulirish/git-open -fi -if command -v psql > /dev/null 2>&1; then - zcomet load ohmyzsh plugins/postgres -fi -if command -v sudo > /dev/null 2>&1; then - zcomet load ohmyzsh plugins/sudo -fi -if command -v systemctl > /dev/null 2>&1; then - zcomet load ohmyzsh plugins/systemd -fi -if command -v vim > /dev/null 2>&1; then - zcomet load ohmyzsh plugins/vim-interaction -fi -if command -v tmux > /dev/null 2>&1; then - zstyle ':prezto:module:tmux:auto-start' local 'no' - zstyle ':prezto:module:tmux:auto-start' remote 'no' - zstyle ':prezto:module:tmux:session' name "$(hostname)" - zsh-defer zcomet load laggardkernel/zsh-tmux - zcomet snippet https://github.com/jreese/zsh-titles/blob/master/titles.plugin.zsh -fi -if command -v kitty > /dev/null 2>&1; then - zcomet load redxtech/zsh-kitty -fi -