--- a/.bashenv	Tue Dec 17 10:21:15 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-# set -x
-# set -u
-
-export DEBFULLNAME='Oleksandr Gavenko'
-export DEBEMAIL='gavenkoa@gmail.com'
-
-# XXX for mc, cvs, svn, ...
-export EDITOR=vim
-
-# XXX vim and gnome-terminal have support for 256 colours in fedora 8 at least
-# Note debian/ubuntu users should install the ncurses-term package to support this
-# export TERM=xterm-256color
-
-# Special case for CYGWIN to properly display russian letters in rxvt.
-# Don't forget set in Windows SHELL=/bin/bash. If default SHELL is sh then .bashrc will not be read.
-if [[ $OSTYPE = cygwin ]]; then
-  export LANG=ru_RU.CP1251
-  # Avoid permission problem in Cygwin.
-  umask 0000
-fi
-
-export TIME_STYLE=long-iso
-
-# Easy cd to often used dirs.
-export CDPATH=.:~:~/devel:~/devel/my-devel
-
-if [[ ! $PATH =~ $HOME/usr/bin ]]; then
-  export PATH=$PATH:~/usr/bin
-fi
-if [[ ! :$PATH =~ :/usr/sbin ]]; then
-  export PATH=/usr/sbin:$PATH
-fi
-if [[ ! :$PATH =~ :/sbin ]]; then
-  export PATH=/sbin:$PATH
-fi
-
-if [[ ! $LD_LIBRARY_PATH =~ $HOME/usr/lib ]]; then
-  export LD_LIBRARY_PATH=$HOME/usr/lib
-else
-  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":$HOME/usr/lib
-fi
-
-if [[ -z "$MANPATH" ]]; then
-  export MANPATH=~/usr/share/man:
-elif [[ ! $MANPATH =~ $HOME/usr/share/man: ]]; then
-  export MANPATH=$MANPATH:$HOME/usr/share/man:
-fi
-
-if [[ -z "$INFOPATH" ]]; then
-  export INFOPATH=~/usr/share/info:
-elif [[ ! $INFOPATH =~ $HOME/usr/share/info: ]]; then
-  export INFOPATH=$INFOPATH:$HOME/usr/share/info:
-fi
-
-export PYTHONSTARTUP=~/.pystartup
-
-export GRADLE_OPTS='-Dorg.gradle.daemon=true'
-

--- a/.bashrc	Tue Dec 17 10:21:15 2013 +0200
+++ b/.bashrc	Mon Dec 23 23:51:52 2013 +0200
@@ -5,8 +5,8 @@
 # XXX
 # [[ -f /etc/bashrc ]] && . /etc/bashrc
 
-if [[ -f ~/.bashenv ]]; then
-  . ~/.bashenv
+if [[ -f ~/.env ]]; then
+  . ~/.env
 fi
 
 PS1='\nbash# '
@@ -173,7 +173,7 @@
 # Load custom settings (user editable).
 # Placed to the end to allow override skel settings.
 
-if [[ -f ~/.bash_custom ]]; then
-  . ~/.bash_custom
+if [[ -f ~/.env.local ]]; then
+  . ~/.env.local
 fi
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.env	Mon Dec 23 23:51:52 2013 +0200
@@ -0,0 +1,60 @@
+# Bash and Zsh common env var settings.
+
+# set -x
+# set -u
+
+export DEBFULLNAME='Oleksandr Gavenko'
+export DEBEMAIL='gavenkoa@gmail.com'
+
+# XXX for mc, cvs, svn, ...
+export EDITOR=vim
+
+# XXX vim and gnome-terminal have support for 256 colours in fedora 8 at least
+# Note debian/ubuntu users should install the ncurses-term package to support this
+# export TERM=xterm-256color
+
+# Special case for CYGWIN to properly display russian letters in rxvt.
+# Don't forget set in Windows SHELL=/bin/bash. If default SHELL is sh then .bashrc will not be read.
+if [[ $OSTYPE = cygwin ]]; then
+  export LANG=ru_RU.CP1251
+  # Avoid permission problem in Cygwin.
+  umask 0000
+fi
+
+export TIME_STYLE=long-iso
+
+# Easy cd to often used dirs.
+export CDPATH=.:~:~/devel:~/devel/my-devel
+
+if [[ ! $PATH =~ $HOME/usr/bin ]]; then
+  export PATH=$PATH:~/usr/bin
+fi
+if [[ ! :$PATH =~ :/usr/sbin ]]; then
+  export PATH=/usr/sbin:$PATH
+fi
+if [[ ! :$PATH =~ :/sbin ]]; then
+  export PATH=/sbin:$PATH
+fi
+
+if [[ ! $LD_LIBRARY_PATH =~ $HOME/usr/lib ]]; then
+  export LD_LIBRARY_PATH=$HOME/usr/lib
+else
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":$HOME/usr/lib
+fi
+
+if [[ -z "$MANPATH" ]]; then
+  export MANPATH=~/usr/share/man:
+elif [[ ! $MANPATH =~ $HOME/usr/share/man: ]]; then
+  export MANPATH=$MANPATH:$HOME/usr/share/man:
+fi
+
+if [[ -z "$INFOPATH" ]]; then
+  export INFOPATH=~/usr/share/info:
+elif [[ ! $INFOPATH =~ $HOME/usr/share/info: ]]; then
+  export INFOPATH=$INFOPATH:$HOME/usr/share/info:
+fi
+
+export PYTHONSTARTUP=~/.pystartup
+
+export GRADLE_OPTS='-Dorg.gradle.daemon=true'
+

--- a/.xinitrc	Tue Dec 17 10:21:15 2013 +0200
+++ b/.xinitrc	Mon Dec 23 23:51:52 2013 +0200
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-if [[ -f ~/.bashenv ]]; then
-  . ~/.bashenv
+if [[ -f ~/.env ]]; then
+  . ~/.env
 fi
 # Load custom settings (user editable).
-if [[ -f ~/.bash_custom ]]; then
-  . ~/.bash_custom
+if [[ -f ~/.env.local ]]; then
+  . ~/.env.local
 fi
 
 if [[ -f ~/.Xdefaults ]]; then

--- a/.zshrc	Tue Dec 17 10:21:15 2013 +0200
+++ b/.zshrc	Mon Dec 23 23:51:52 2013 +0200
@@ -3,13 +3,12 @@
 . /etc/zshrc
 fi
 
-EDITOR=vim
+if [[ -f ~/.env ]]; then
+  . ~/.env
+fi
 
 PS1='zsh# '
 
-# Easy cd to often used dirs.
-CDPATH=.:~:~/devel:~/devel/my-devel
-
 HISTFILE=~/.zsh_history
 HISTSIZE=10000
 SAVEHIST=10000

--- a/Makefile	Tue Dec 17 10:21:15 2013 +0200
+++ b/Makefile	Mon Dec 23 23:51:52 2013 +0200
@@ -42,7 +42,7 @@
 OVERRIDDEN_ITEMS := \
     .fvwm .xxkbrc .xmodmaprc \
     .inputrc .minttyrc .Xdefaults .xinitrc .xserverrc .screenrc .dircolors \
-    .bashrc .bashenv .bash_completion .bash_completion.d .zshrc .vimrc .ssh \
+    .env .bashrc .bash_completion .bash_completion.d .zshrc .vimrc .ssh \
     .pylintrc .pystartup .tclshrc \
     .guile \
     .sqshrc \