From 4ae82b99b7221613629526d4878dc471a18e2c61 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 16 Nov 2020 11:01:17 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20CTRL?= =?UTF-8?q?-T,=20CTRL-R,=20ALT-C=20=D1=81=20=D0=BF=D0=BE=D0=BC=D0=BE=D1=89?= =?UTF-8?q?=D1=8C=D1=8E=20fzf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins.zsh b/plugins.zsh index 3af5f53..05d7478 100644 --- a/plugins.zsh +++ b/plugins.zsh @@ -22,6 +22,10 @@ antibody bundle ohmyzsh/ohmyzsh path:plugins/debian if command -v fzf > /dev/null 2>&1; then export DISABLE_FZF_KEY_BINDINGS=true antibody bundle ohmyzsh/ohmyzsh path:plugins/fzf + # fzf + if [ -e /usr/share/doc/fzf/examples/key-bindings.zsh ]; then + . /usr/share/doc/fzf/examples/key-bindings.zsh + fi fi if command -v git > /dev/null 2>&1; then antibody bundle ohmyzsh/ohmyzsh path:plugins/git From 058459dc8f3801cef0e353c6bc4b68e238f194f9 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 16 Nov 2020 11:06:26 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=B3=D0=BB=D0=B0=D1=88?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=20=D0=B7=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20=D0=BE=D1=82=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20zsh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prompt.zsh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/prompt.zsh b/prompt.zsh index f5b3a63..914e41b 100644 --- a/prompt.zsh +++ b/prompt.zsh @@ -27,14 +27,8 @@ if [[ "$TERM_PROGRAM" == "Hyper" ]]; then SPACESHIP_GIT_BRANCH_SHOW=false fi -case "x$(lsb_release -d -s)" in - "xAstra Linux SE 1.5 (Smolensk)" ) - antibody bundle nojhan/liquidprompt - ;; - "xDebian GNU/Linux 8.11 (jessie)" ) - antibody bundle nojhan/liquidprompt - ;; - * ) - antibody bundle denysdovhan/spaceship-prompt - ;; -esac +if $(is-at-least 5.2); then + antibody bundle denysdovhan/spaceship-prompt +else + antibody bundle nojhan/liquidprompt +fi From 7e4221b74fccead5b69e066d2973a02baa8a1dbf Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 16 Nov 2020 11:11:57 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D0=BE=D0=BA=D1=80=D1=83=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20VTune?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env.zsh b/env.zsh index 61b57db..6db05bf 100644 --- a/env.zsh +++ b/env.zsh @@ -16,7 +16,7 @@ UNCRUSTIFY_CONFIG="${XDG_CONFIG_HOME}/uncrustify/default.cfg" # Настройка компилятора Intel (если установлен) [ -e /opt/intel/bin/compilervars.sh ] && source /opt/intel/bin/compilervars.sh intel64 > /dev/null -[ -e /opt/intel/vtune_amplifier/amplxe-vars.sh ] && source /opt/intel/vtune_amplifier/amplxe-vars.sh > /dev/null +[ -e /opt/intel/vtune_profiler/vtune-vars.sh ] && source /opt/intel/vtune_profiler/vtune-vars.sh > /dev/null [ -e /opt/intel/inspector/inspxe-vars.sh ] && source /opt/intel/inspector/inspxe-vars.sh > /dev/null [ -e /opt/intel/advisor/advixe-vars.sh ] && source /opt/intel/advisor/advixe-vars.sh > /dev/null