.mc: Move to MC 4 `mc.ext.ini`

[dotfiles.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index b69df3fd59b0e25ba0660dac46b175f9ee1fc78c..f516a374c36abd98560693fb7bfb4ed4247152fb 100644 (file)
--- 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