diff --git a/.bashrc b/.bashrc index dd88550..834e1d7 100644 --- a/.bashrc +++ b/.bashrc @@ -18,7 +18,6 @@ alias grep='grep --color=auto' alias webcam='mpv --demuxer-lavf-o=video_size=1920x1080,input_format=mjpeg av://v4l2:/dev/video0 --profile=low-latency --untimed' alias xp="xprop | awk '/^WM_CLASS/{sub(/.* =/, \"instance:\"); sub(/,/, \"\nclass:\"); print}/^WM_NAME/{sub(/.* =/, \"title:\"); print}'" - alias gs='git status' alias ga='git add' alias gc='git commit' @@ -26,40 +25,13 @@ alias gp='git push' alias nvcfg='nvim ~/.config/nvim/init.vim' -alias rpg-battle="rpg-cli cd -f . && rpg-cli battle" -alias rm="rpg-battle && rm" -alias rmdir="rpg-battle && rmdir" -alias mkdir="rpg-battle && mkdir" -alias touch="rpg-battle && touch" -alias mv="rpg-battle && mv" -alias cp="rpg-battle && cp" -alias chown="rpg-battle && chown" -alias chmod="rpg-battle && chmod" alias la='ls -a' alias ll='ls -la' alias vifm='vifmrun' -cd () { - builtin cd "$@" - command ls --color=auto - if [[ $PWD == ~ ]] ; then - rpg-cli cd -f ~ - else - rpg-cli cd -f . - rpg-cli battle - fi -} - -ls () { - command ls --color=auto "$@" - if [ $# -eq 0 ] ; then - rpg-cli cd -f . - rpg-cli ls - fi -} vicd () { dst="$(command vifm --choose-dir - . "$@")" @@ -69,7 +41,41 @@ vicd () { cd "$dst" } -PS1='[\u@\h \W]\$ ' +if command -v rpg-cli &> /dev/null +then + PS1="[\u@\h ](\W)\n$(CLICOLOR_FORCE=1 rpg-cli stat -q | sed 's/@.*//' | sed 's/\(\x1B[@A-Z\\\]^_]\|\x1B\[[0-9:;<=>?]*[-!"#$%&'"'"'()*+,.\/]*[][\\@A-Z^_`a-z{|}~]\)/\\[\1\\]/g')\$ " + alias rpg-battle="rpg-cli cd -f . && rpg-cli battle" + + alias rm="rpg-battle && rm" + alias rmdir="rpg-battle && rmdir" + alias mkdir="rpg-battle && mkdir" + alias touch="rpg-battle && touch" + alias mv="rpg-battle && mv" + alias cp="rpg-battle && cp" + alias chown="rpg-battle && chown" + alias chmod="rpg-battle && chmod" + cd () { + builtin cd "$@" + command ls --color=auto + if [[ $PWD == ~ ]] ; then + rpg-cli cd -f ~ + else + rpg-cli cd -f . + rpg-cli battle + fi + } + + ls () { + command ls --color=auto "$@" + if [ $# -eq 0 ] ; then + rpg-cli cd -f . + rpg-cli ls + fi + } +else + PS1='[\u@\h \W]\$ ' +fi + bind '"\e[A": history-search-backward' bind '"\e[B": history-search-forward'