From c12c31621beb43d044e486bc18b2249aad27b51f Mon Sep 17 00:00:00 2001
From: mj <mj@str8.biz>
Date: Tue, 31 Mar 2015 20:56:40 +0200
Subject: [PATCH] environment.sh

---
 dotfiles/environment.sh |  7 +++++++
 templates/bashrc.sh     | 10 +++++++---
 templates/zshrc.sh      | 13 ++++++++++---
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 dotfiles/environment.sh

diff --git a/dotfiles/environment.sh b/dotfiles/environment.sh
new file mode 100644
index 0000000..0aa2a85
--- /dev/null
+++ b/dotfiles/environment.sh
@@ -0,0 +1,7 @@
+#@IgnoreInspection AddShebang
+
+# git:
+export GIT_AUTHOR_NAME="mj"
+export GIT_AUTHOR_EMAIL="mj@str8.biz"
+export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME
+export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL
diff --git a/templates/bashrc.sh b/templates/bashrc.sh
index 57cb842..0b04f9e 100644
--- a/templates/bashrc.sh
+++ b/templates/bashrc.sh
@@ -100,9 +100,13 @@ if [ -x /usr/bin/dircolors ]; then
     alias egrep='egrep --color=auto'
 fi
 
+# Environment
+if [ -f $ZCFG/dotfiles/environment.sh ]; then
+    . $ZCFG/dotfiles/environment.sh
+fi
 
-# Alias definitions
 
-if [ -f ~/.config/zsh-config/templates/bash_aliases ]; then
-    . ~/.config/zsh-config/templates/bash_aliases
+# Alias definitions
+if [ -f $ZCFG/templates/bash_aliases ]; then
+    . $ZCFG/templates/bash_aliases
 fi
diff --git a/templates/zshrc.sh b/templates/zshrc.sh
index 3a0c11a..8b31f89 100644
--- a/templates/zshrc.sh
+++ b/templates/zshrc.sh
@@ -1,6 +1,6 @@
 #@IgnoreInspection AddShebang
 # ENVIRONMENT:
-export GJ_DEVENV=local_aptproxy
+export GJ_ENV=local_aptproxy
 
 export ZCFG=~/.config/zsh-config
 # Path to your oh-my-zsh installation.
@@ -32,12 +32,19 @@ plugins=(command-not-found common-aliases debian dirhistory git history history-
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 # export MANPATH="/usr/local/man:$MANPATH"
 
+# Environment
+if [ -f $ZCFG/dotfiles/environment.sh ]; then
+    . $ZCFG/dotfiles/environment.sh
+fi
+
 export HISTFILESIZE=
 export HISTSIZE=
 export HISTFILE=~/.history
 
 source $ZSH/oh-my-zsh.sh
 
-if [ -f ~/.config/zsh-config/templates/bash_aliases.sh ]; then
-    . ~/.config/zsh-config/templates/bash_aliases.sh
+
+# Aliases
+if [ -f $ZCFG/templates/bash_aliases.sh ]; then
+    . $ZCFG/templates/bash_aliases.sh
 fi
-- 
2.0.0