From b83c166d18043c8dab711599b552fe8f4a87d9a1 Mon Sep 17 00:00:00 2001 From: Dirk Alders Date: Sun, 4 Jun 2023 19:53:27 +0200 Subject: [PATCH] improvement of arch adaptions --- .zshrc | 15 ++---- .zshrc.d/__available__/prompt_autosuggest.zsh | 6 +++ .zshrc.d/__available__/prompt_color.zsh | 50 +------------------ .zshrc.d/my_defaults | 1 + .zshrc.d/root_defaults | 1 + 5 files changed, 15 insertions(+), 58 deletions(-) create mode 100644 .zshrc.d/__available__/prompt_autosuggest.zsh diff --git a/.zshrc b/.zshrc index 118ca54..7e14780 100644 --- a/.zshrc +++ b/.zshrc @@ -103,16 +103,11 @@ alias ll='ls -l' alias la='ls -A' alias l='ls -CF' -# enable auto-suggestions based on the history for most systems -if [ -f /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh ]; then - . /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh - # change suggestion color - ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#999' -fi -if [ -f /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh ]; then - . /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh - # change suggestion color - ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#999' +# set zsh plugin base directory +if [ -d /usr/share/zsh/plugins ]; then + export ZSH_PLUGIN_BASE="/usr/share/zsh/plugins" +else + export ZSH_PLUGIN_BASE="/usr/share" fi # You may want to put all your additions into a folder file like diff --git a/.zshrc.d/__available__/prompt_autosuggest.zsh b/.zshrc.d/__available__/prompt_autosuggest.zsh new file mode 100644 index 0000000..8fc085a --- /dev/null +++ b/.zshrc.d/__available__/prompt_autosuggest.zsh @@ -0,0 +1,6 @@ +# enable auto-suggestions based on the history for most systems +if [ -f $ZSH_PLUGIN_BASE/zsh-autosuggestions/zsh-autosuggestions.zsh ]; then + . $ZSH_PLUGIN_BASE/zsh-autosuggestions/zsh-autosuggestions.zsh + # change suggestion color + ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#999' +fi diff --git a/.zshrc.d/__available__/prompt_color.zsh b/.zshrc.d/__available__/prompt_color.zsh index f4026e9..489cf48 100644 --- a/.zshrc.d/__available__/prompt_color.zsh +++ b/.zshrc.d/__available__/prompt_color.zsh @@ -1,6 +1,6 @@ # enable syntax-highlighting -if [ -f /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then - . /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +if [ -f $ZSH_PLUGIN_BASE/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then + . $ZSH_PLUGIN_BASE/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern) ZSH_HIGHLIGHT_STYLES[default]=none ZSH_HIGHLIGHT_STYLES[unknown-token]=fg=white,underline @@ -45,49 +45,3 @@ if [ -f /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]=standout fi -# enable syntax-highlighting -if [ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then - . /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh - ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern) - ZSH_HIGHLIGHT_STYLES[default]=none - ZSH_HIGHLIGHT_STYLES[unknown-token]=fg=white,underline - ZSH_HIGHLIGHT_STYLES[reserved-word]=fg=cyan,bold - ZSH_HIGHLIGHT_STYLES[suffix-alias]=fg=green,underline - ZSH_HIGHLIGHT_STYLES[global-alias]=fg=green,bold - ZSH_HIGHLIGHT_STYLES[precommand]=fg=green,underline - ZSH_HIGHLIGHT_STYLES[commandseparator]=fg=blue,bold - ZSH_HIGHLIGHT_STYLES[autodirectory]=fg=green,underline - ZSH_HIGHLIGHT_STYLES[path]=bold - ZSH_HIGHLIGHT_STYLES[path_pathseparator]= - ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]= - ZSH_HIGHLIGHT_STYLES[globbing]=fg=blue,bold - ZSH_HIGHLIGHT_STYLES[history-expansion]=fg=blue,bold - ZSH_HIGHLIGHT_STYLES[command-substitution]=none - ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]=fg=magenta,bold - ZSH_HIGHLIGHT_STYLES[process-substitution]=none - ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]=fg=magenta,bold - ZSH_HIGHLIGHT_STYLES[single-hyphen-option]=fg=green - ZSH_HIGHLIGHT_STYLES[double-hyphen-option]=fg=green - ZSH_HIGHLIGHT_STYLES[back-quoted-argument]=none - ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]=fg=blue,bold - ZSH_HIGHLIGHT_STYLES[single-quoted-argument]=fg=yellow - ZSH_HIGHLIGHT_STYLES[double-quoted-argument]=fg=yellow - ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]=fg=yellow - ZSH_HIGHLIGHT_STYLES[rc-quote]=fg=magenta - ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]=fg=magenta,bold - ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]=fg=magenta,bold - ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]=fg=magenta,bold - ZSH_HIGHLIGHT_STYLES[assign]=none - ZSH_HIGHLIGHT_STYLES[redirection]=fg=blue,bold - ZSH_HIGHLIGHT_STYLES[comment]=fg=black,bold - ZSH_HIGHLIGHT_STYLES[named-fd]=none - ZSH_HIGHLIGHT_STYLES[numeric-fd]=none - ZSH_HIGHLIGHT_STYLES[arg0]=fg=cyan - ZSH_HIGHLIGHT_STYLES[bracket-error]=fg=red,bold - ZSH_HIGHLIGHT_STYLES[bracket-level-1]=fg=blue,bold - ZSH_HIGHLIGHT_STYLES[bracket-level-2]=fg=green,bold - ZSH_HIGHLIGHT_STYLES[bracket-level-3]=fg=magenta,bold - ZSH_HIGHLIGHT_STYLES[bracket-level-4]=fg=yellow,bold - ZSH_HIGHLIGHT_STYLES[bracket-level-5]=fg=cyan,bold - ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]=standout -fi diff --git a/.zshrc.d/my_defaults b/.zshrc.d/my_defaults index 26beca4..1db89cb 100755 --- a/.zshrc.d/my_defaults +++ b/.zshrc.d/my_defaults @@ -3,6 +3,7 @@ ln -vs __available__/dd.zsh ln -vs __available__/less.zsh ln -vs __available__/neofetch.zsh ln -vs __available__/prompt_color.zsh +ln -vs __available__/prompt_autosuggest.zsh ln -vs __available__/prompt_powerline.zsh ln -vs __available__/todo.zsh diff --git a/.zshrc.d/root_defaults b/.zshrc.d/root_defaults index f1b37ab..7aadafc 100755 --- a/.zshrc.d/root_defaults +++ b/.zshrc.d/root_defaults @@ -1,4 +1,5 @@ ln -vs __available__/less.zsh ln -vs __available__/prompt_color.zsh +ln -vs __available__/prompt_autosuggest.zsh ln -vs __available__/prompt_powerline.zsh