diff options
Diffstat (limited to 'home/.shrc')
| -rw-r--r-- | home/.shrc | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/home/.shrc b/home/.shrc index 10f87d34..afa87fe5 100644 --- a/home/.shrc +++ b/home/.shrc @@ -13,7 +13,8 @@ alias gsh='git show' gl='git log --graph --pretty=log' alias gco='git checkout' gb='git branch' gm='git merge' gst='git stash' alias ga='git add' gmv='git mv' grm='git rm' alias gc='git commit' gca='gc --amend' gt='git tag' -alias gp='git push' gu='git pull' gf='git fetch' gr='git rebase' +alias gp='git push' gu='git pull' gf='git fetch' +alias gr='git rebase' grc='git rebase --continue' alias rand='openssl rand -base64 33' alias private='eval "$(gpg -d ~/.private)"' command -v doas >/dev/null || alias doas=sudo @@ -24,7 +25,7 @@ man() { for sect in $MANSECT; do command man -w $sect "$1" >/dev/null 2>&1 && exec man $sect "$1" done - exec man "$1") + exec command man "$1") } cd() { @@ -49,15 +50,5 @@ fi export LESS_TERMCAP_us=$(tput sitm) export LESS_TERMCAP_ue=$(tput ritm) -hostname=$(hostname -s) -rprompt() { - local pwd - pwd=${PWD#${HOME}} - [ "${pwd}" != "${PWD}" ] && pwd="~${pwd}" - [ "${TERM%-*}" = 'xterm' ] \ - && printf '\33]0;%s\a' "${SSH_CLIENT:+${hostname}:}${pwd##*/}" >&2 - printf '%s' "${SSH_CLIENT:+${hostname}:}${pwd}" -} -PS1=' -$ ' -RPS1='${?#0} $(rprompt)' +PS1='\[\033]0;${SSH_CLIENT:+\\h:}\W\a\] +${?#0}$ ' |