Restructure dotfiles directories.

[config] / dotfiles / bashrc

diff --git a/dotfiles/bashrc b/dotfiles/bashrc
index 2f1dc8d2765da2248413ddc3cebcf4b774d31b6f..4dc08f7a1222c7524ac91373c2f7ec1f23acbde4 100644 (file)
--- a/dotfiles/bashrc
+++ b/dotfiles/bashrc
@@ -1,24 +1,5 @@
-# plomlompom's bashrc for non-login shells
+# Bash as a non-login shell in non-POSIX-mode does not read in the startup
+# script at the path in $ENV. This forces it to still read in the ~/.shinit
+# startup script for non-login shells.
 
-# Environment variables.
-export PATH=~/.bin:$PATH
-export EDITOR=vi
-
-# Fancy colors for ls.
-alias ls="ls --color=auto"
-
-# Force these programs to use re-located config files or wrappers.
-# Notice that msmtp does not understand ~ as the home dir, only $HOME.
-alias irssi="irssi --home ~/.config/irssi"
-alias getmail="getmail --getmaildir=~/.config/getmail"
-alias msmtp="msmtp --file=$HOME/.config/msmtp/msmtprc"
-alias mutt="mutt_msmtp_loop"
-
-# Blue prompt with time.
-PS1="\[\e[1;34m\][\\t \\u@\\h \\w]$\[\e[m\] "
-PS2="\[\e[1;34m\]>\[\e[m\] "
-PS3="\[\e[1;34m\]>\[\e[m\] "
-PS4="\[\e[1;34m\]+\[\e[m\] "
-
-# Keep gnome-keyring-manager away from making trouble.
-unset GNOME_KEYRING_CONTROL
+. ~/.shinit