From 62b554577f0d737aa7b5afc0a68fd50141345412 Mon Sep 17 00:00:00 2001
From: Loic Nageleisen <loic.nageleisen@gmail.com>
Date: Tue, 13 Nov 2012 18:18:12 +0100
Subject: [PATCH] fix aliases on X DM login

---
 bash/rc         | 1 +
 home/dotfilesrc | 1 +
 shell/aliases   | 0
 zsh/rc          | 1 +
 4 files changed, 3 insertions(+)
 mode change 100755 => 100644 shell/aliases

diff --git a/bash/rc b/bash/rc
index de6a144..86562e4 100644
--- a/bash/rc
+++ b/bash/rc
@@ -2,6 +2,7 @@
 
 [[ -z "$DOTFILES_ROOT_DIR" ]] && source "$HOME/.dotfilesrc"
 
+source $DOTFILES_SHELL_DIR/aliases
 source $DOTFILES_BASH_DIR/prompt
 source $DOTFILES_BASH_DIR/history
 source $DOTFILES_BASH_DIR/term_title
diff --git a/home/dotfilesrc b/home/dotfilesrc
index ea93689..8ba380d 100644
--- a/home/dotfilesrc
+++ b/home/dotfilesrc
@@ -3,5 +3,6 @@ DOTFILES_HOME_DIR="$(cd -P "$(dirname "$(readlink ~/.profile)")" && pwd)"
 DOTFILES_ROOT_DIR="$( dirname "$DOTFILES_HOME_DIR" )"
 DOTFILES_ZSH_DIR="$DOTFILES_ROOT_DIR/zsh"
 DOTFILES_BASH_DIR="$DOTFILES_ROOT_DIR/bash"
+DOTFILES_SHELL_DIR="$DOTFILES_ROOT_DIR/shell"
 
 # vim: ft=sh
diff --git a/shell/aliases b/shell/aliases
old mode 100755
new mode 100644
diff --git a/zsh/rc b/zsh/rc
index 8ddb432..9a4f45e 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -2,6 +2,7 @@
 
 [[ -z "$DOTFILES_ROOT_DIR" ]] && source "$HOME/.dotfilesrc"
 
+source $DOTFILES_SHELL_DIR/aliases
 source $DOTFILES_ZSH_DIR/term_title
 set_term_title # call it right now