X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.bashrc;h=f516a374c36abd98560693fb7bfb4ed4247152fb;hb=30db78e1dbb83ed3025f5378d4a83e5e5441da4e;hp=b69df3fd59b0e25ba0660dac46b175f9ee1fc78c;hpb=58bac4e53ad1aab305de77f24a5e4a3d130e2ad4;p=dotfiles.git diff --git a/.bashrc b/.bashrc index b69df3f..f516a37 100644 --- a/.bashrc +++ b/.bashrc @@ -10,6 +10,9 @@ umask 077 PATH="$HOME"/bin:"$HOME"/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +if [ -n "$DISPLAY" ]; then + PATH=$PATH:/usr/games +fi # Make `ssh host date` to display in 24-hour format LANG=C @@ -26,6 +29,7 @@ esac . "$HOME"/.shellrc if [ "$HISTFILE" = "$HOME/.bash_history" ]; then + history -r # This is the default value set by interactive bash # when the global value was unset. Unset it here too. unset HISTFILE @@ -49,6 +53,14 @@ back() { cd - "$@"; } functions() { typeset -f "$@"; } j() { jobs; } +if [ -r "$HOME"/admin/prog/bash_prompt ]; then + . "$HOME"/admin/prog/bash_prompt + set_prompt + unset set_prompt +else + PS1="${debian_chroot:+($debian_chroot)}\u@\h:\W \$SHLVL\\$ " +fi + if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then if [ -d /usr/share/bash-completion -a -r /usr/share/bash-completion/bash_completion ]; then _BASH_COMPLETIONS_DIR=/usr/share/bash-completion/completions