Simplify configuration setup.

[config/dotfiles.git] / bash / rc

diff --git a/bash/rc b/bash/rc
index 455ce0dd0eeb32b610cce470a374246cd0e99d61..3cc4827fbc9a1481d136319a2c586c2fded2fa1f 100644 (file)
--- a/bash/rc
+++ b/bash/rc
@@ -1,10 +1,34 @@
 # Main bash configuration file.
+#
+# Is sourced by all interactive shells and other shells like scp or rcp.
 
 
-# Use UTF-8 encoding in the terminal.
-export LC_ALL=en_US.UTF-8
+. ~/.shell/functions
+
+source_debug ". ~/.bash/rc"
+
+source_config ~/.shell/env
+
+
+# Check if this is an interactive shell. Abort if not to prevent problems with
+# scp and rcp. Taken from default Debian bashrc. Thanks.
+if [[ $- != *i* ]]; then
+    return
+fi
+
+
+# Set the prompt; hostname and current working directory are displayed.
+# Hostname is displayed in green, current directory in blue.
+PS1='\[\033[01;32m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\] \$ '
 
-# Use Vim as editor.
-export EDITOR='vim'
 # Use Vi(m) style in bash.
 set -o vi
+
+
+source_config ~/.shell/aliases
+
+source_config ~/.bash/rc.local
+
+source_debug ". ~/.bash/rc (done)"
+
+# vim: ft=sh