From d400aaba206c9f2c1924351ed451fe8870809f1b Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Thu, 5 Jan 2023 10:37:25 +0100 Subject: [PATCH] bash_aliases: fix completion and stuff for zsh --- .bash_aliases | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.bash_aliases b/.bash_aliases index b7cea47..2b928c8 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -1,13 +1,5 @@ test -n "$PS1" || return 0 -export LESS="--RAW-CONTROL-CHARS --ignore-case --LONG-PROMPT --jump-target=5 $(test $(less --version | head -1 | cut -f2 -d' ') -ge 590 && echo --incsearch)" -bind '"\ek":history-search-backward' -bind '"\ej":history-search-forward' - -if test -f /etc/bash_completion && ! shopt -oq posix -then . /etc/bash_completion -fi - alias sc="sudo systemctl" alias scs="sudo systemctl status" alias sce="sudo systemctl enable --now" @@ -18,6 +10,8 @@ difr() { diff --color=always --unified=1 --recursive "$@" | less --RAW-CONTROL-C # Copy recursively with rsync alias rc='rsync --recursive --info=progress2,remove,symsafe,flist,del --human-readable --links --hard-links --times' +export LESS="--RAW-CONTROL-CHARS --ignore-case --LONG-PROMPT --jump-target=5 $(test $(less --version | head -1 | cut -f2 -d' ') -ge 590 && echo --incsearch)" + # ls aliases export LS_OPTIONS='--human-readable --si --group-directories-first --file-type --dereference-command-line' @@ -47,13 +41,25 @@ alias rm='rm -I' alias cp='cp -i' alias mv='mv -i' +# Bash completion + +src() { test -f "$1" && source "$1"; } + +case $(readlink /proc/$$/exe) in (*bash) +bind '"\ek":history-search-backward' +bind '"\ej":history-search-forward' + +shopt -oq posix || src /etc/bash_completion + # Fancy prompt PS1="\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\W\[\033[00m\]" PS1="$PS1 \`if [ \$? = 0 ]; then echo -e '\[\033[01;32m\]:)';" PS1="$PS1 else echo -e '\[\033[01;31m\]' \$?; fi\`\[\033[00m\]" +;; +(*zsh) setopt sh_word_split;; +esac -src() { test -f "$1" && source "$1"; } src /usr/share/git/completion/git-prompt.sh && PS1="$PS1\$(__git_ps1 \" (%s)\")" src $HOME/.config/shell/functions