From f7f123531ece1773bfca79c23c6839337efc3545 Mon Sep 17 00:00:00 2001
From: mj <mj@str8.biz>
Date: Fri, 20 Mar 2015 15:25:49 +0100
Subject: [PATCH] zshrc

---
 templates/zshrc.sh | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/templates/zshrc.sh b/templates/zshrc.sh
index 0f5b918..955b0b5 100644
--- a/templates/zshrc.sh
+++ b/templates/zshrc.sh
@@ -6,10 +6,12 @@ export ZCFG=~/.config/zsh-config
 # Path to your oh-my-zsh installation.
 export ZSH=$ZCFG/tools/oh-my-zsh
 
-# Set name of the theme to load.
-# Look in ~/.oh-my-zsh/themes/
-# Optionally, if you set this to "random", it'll load a random theme each
-# time that oh-my-zsh is loaded.
+export LANG=en_US.UTF-8
+
+# Compilation flags
+export ARCHFLAGS="-arch x86_64"
+
+# Themes are in (...)/oh-my-zsh/themes/ or "random"
 ZSH_THEME="muse"
 
 CASE_SENSITIVE="true"
@@ -26,12 +28,15 @@ plugins=(command-not-found common-aliases debian dirhistory git history history-
 		meteor node npm
 )
 
+if [ -f ~/.config/zsh-config/templates/bash_aliases ]; then
+    . ~/.config/zsh-config/templates/bash_aliases
+fi
+
 # User configuration
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 # export MANPATH="/usr/local/man:$MANPATH"
 
 source $ZSH/oh-my-zsh.sh
-export LANG=en_US.UTF-8
 
 # ANTIGEN:
 #
@@ -76,11 +81,4 @@ export LANG=en_US.UTF-8
 #   export EDITOR='vim'
 # else
 #   export EDITOR='mvim'
-# fi
-
-# Compilation flags
-export ARCHFLAGS="-arch x86_64"
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
+# fi
\ No newline at end of file
-- 
2.0.0