diff options
Diffstat (limited to 'home/.shrc')
| -rw-r--r-- | home/.shrc | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/home/.shrc b/home/.shrc index 65dda9da..afa87fe5 100644 --- a/home/.shrc +++ b/home/.shrc @@ -1,38 +1,54 @@ set -o noclobber -o nounset -o vi -HISTFILE=~/.history CDPATH=:~ -alias vim=$EDITOR +alias vi=$EDITOR alias ls='LC_COLLATE=C ls -p' alias ll='ls -hl' +alias ff='find . -type f -name' alias bc='bc -l' +alias ag='ag --pager=$PAGER' alias gs='git status --short --branch || ls' gd='git diff' 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' gr='git reset' gmv='git mv' grm='git rm' +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' +alias gr='git rebase' grc='git rebase --continue' alias rand='openssl rand -base64 33' alias private='eval "$(gpg -d ~/.private)"' -type doas 2>/dev/null && alias sudo=doas +command -v doas >/dev/null || alias doas=sudo + +man() { + test $# -ne 1 && { command man "$@"; return $?; } + (IFS=: + for sect in $MANSECT; do + command man -w $sect "$1" >/dev/null 2>&1 && exec man $sect "$1" + done + exec command man "$1") +} cd() { + local path if [ $# -eq 0 ]; then - builtin cd + command cd + elif [ "${1%%:*}" != "$1" ]; then + path=${1#*:} + [ -n "${path}" ] || path=${PWD#${HOME}/} + SSH_CD=$path ssh -o SendEnv=SSH_CD "${1%%:*}" elif [ -e "$1" -a ! -d "$1" ]; then - builtin cd "${1%/*}" && $EDITOR "${1##*/}" + command cd "${1%/*}" && $EDITOR "${1##*/}" else - builtin cd "$@" + command cd "$@" fi } +if [ -n "${SSH_CD:-}" ]; then + cd "${SSH_CD}" + unset SSH_CD +fi -PS0=$'\n' -PS1='\$ ' -RPS1="\? ${SSH_CLIENT:+\h:}\w" +export LESS_TERMCAP_us=$(tput sitm) +export LESS_TERMCAP_ue=$(tput ritm) -if [ "${TERM%-*}" = 'xterm' ]; then - tsl=$'\e]0;' - fsl=$'\e\\' - PS0="${tsl}${SSH_CLIENT:+\h:}\W${fsl}${PS0}" -fi +PS1='\[\033]0;${SSH_CLIENT:+\\h:}\W\a\] +${?#0}$ ' |