Move all environment vars to a 'new' .profile file

dotfiles.list

@@ -5,6 +5,7 @@
 .config
 .gitconfig
 .gitignore_global
+.profile
 .ps1_basic
 .ps1_ext
 .pythonrc

dotfiles/.bashrc

@@ -9,33 +9,14 @@ shopt -s checkwinsize
 
 set -o vi
 
-addtopath()
-{
-    # Add dirs to $PATH; checks if dir exists and is not already in $PATH
-    (test ! "$1" || test ! -d "$1") && return 1
-    found=0
-    for i in $(echo "${PATH}" | sed 's/:/\n/g'); do
-        if [ "$1" == "$i" ]; then
-            found=1
-        fi
-    done
-    if [ ${found} -eq 0 ]; then
-        export PATH="${PATH}:$1"
-    fi
-}
-
 if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
     . /etc/bash_completion
 fi
 
 if [ -d "/usr/local/go" ]; then
     export GOROOT=/usr/local/go
-    addtopath "$GOROOT/bin"
 fi
 
-addtopath "$HOME/bin"
-addtopath "/var/lib/gems/1.8/bin"
-
 if [ -x /usr/bin/scrot ]; then
     if [ ! -d "$HOME/Pictures/scrot" ]; then
         mkdir -p "$HOME/Pictures/scrot"
@@ -49,17 +30,8 @@ fi
 # Source aliases
 . $HOME/.aliases
 
-# Environment vars
-export DISPASS_LABELFILE=~/.dispass
-export EDITOR="/usr/bin/vim"
-export EXEC_FOR_PYTHON="python2"
-export GPG_TTY="$(tty)"
-export LESS="iFXRS"
-export PYTHONSTARTUP=~/.pythonrc
-
-if [ ! -z "${SSH_CONNECTION}" ]; then
-    export TERM=screen
-fi
+# Source environment variables
+. $HOME/.profile
 
 # Wrapper for starting the Django development server on varying
 # addresses and port numbers. Allowing to also run if manage.py is in
@@ -124,6 +96,3 @@ complete -ac loop
 if [ -f "$HOME/.bashrc.local" ]; then
     . ${HOME}/.bashrc.local
 fi
-
-# Check date, one of my boxes has a broken clock battery
-test $(date +%s) -lt 1366700000 && echo Date is incorrect, fix it!

dotfiles/.profile

@@ -0,0 +1,15 @@
+# Environment vars
+export BROWSER="/usr/bin/firefox"
+export DISPASS_LABELFILE=~/.dispass
+export EDITOR="/usr/bin/vim"
+export EXEC_FOR_PYTHON="python2"
+export GPG_TTY="$(tty)"
+export LANG=en_US.UTF-8
+export LESS="iFXRS"
+export PATH="$HOME/bin:$PATH:$HOME/usr/bin:$HOME/.gem/ruby/2.2.0/bin"
+export PYTHONSTARTUP=~/.pythonrc
+export VIRTUAL_ENV_DISABLE_PROMPT=disabled
+
+if [ ! -z "${SSH_CONNECTION}" ]; then
+    export TERM=screen
+fi

dotfiles/.zshrc

@@ -13,8 +13,8 @@ autoload -U colors && colors
 fpath=(~/.zsh/functions $fpath)
 autoload -U ~/.zsh/functions/*(:t)
 
-### Aliases ##################################################################
-source ${HOME}/.aliases
+source ${HOME}/.aliases # aliases and (wrapper) functions
+source ${HOME}/.profile # environment variables
 
 if [ -x /usr/bin/scrot ]; then
     if [ ! -d "$HOME/Pictures/scrot" ]; then
@@ -23,15 +23,6 @@ if [ -x /usr/bin/scrot ]; then
     alias wscrot="scrot '$HOME/Pictures/scrot/%s_%Y-%m-%d_\$wx\$h.png'"
 fi
 
-### Environment variables ####################################################
-export BROWSER="/usr/bin/firefox"
-export EDITOR="/usr/bin/vim"
-export EXEC_FOR_PYTHON="python2"
-export LANG=en_US.UTF-8
-export LESS="iFXRS"
-export PATH="$HOME/bin:$PATH:$HOME/usr/bin:$HOME/.gem/ruby/2.2.0/bin"
-export VIRTUAL_ENV_DISABLE_PROMPT=disabled
-
 ### Custom functions #########################################################
 
 # Wrapper for starting the Django development server on varying