zsh,bash: move aliases to $XDG_CONFIG_HOME

diff --git a/Makefile b/Makefile
index 858dc0d774b201a15a36e833191f4ce8e0e15d17..e5e9da507790ce311b0c59e2e808b70f92ed7e31 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 APATH := $(realpath .)
 
 FILES := bin
 APATH := $(realpath .)
 
 FILES := bin

-DOTFILES := aliases bash* conky* flexget git* goobookrc msmtp* mutt ncmpcpp offlineimap* profile weechat xbindkeysrc Xresources xprofile zprofile zshrc
-CONFIGFILES := compton.conf git mimeo.conf mpd retroarch vim xkb zsh
+DOTFILES := bash* conky* flexget git* goobookrc msmtp* mutt ncmpcpp offlineimap* profile weechat xbindkeysrc Xresources xprofile zprofile zshrc
+CONFIGFILES := aliases compton.conf git mimeo.conf mpd retroarch vim xkb zsh

 
 .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES)
 install: $(FILES) $(DOTFILES) $(CONFIGFILES)
 
 .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES)
 install: $(FILES) $(DOTFILES) $(CONFIGFILES)

diff --git a/bashrc b/bashrc
index 3d4527ab8135a7ab9e72cc8aafc7bff8f67fb6cf..2fdf9f97a57f48dd48185e645232e15bece52eee 100644 (file)
--- a/bashrc
+++ b/bashrc
@@ -50,7 +50,7 @@ PS1='[\u@\h \W]\$ '
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
 # Alias definitions.
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
 # Alias definitions.

-[[ -f ~/.aliases ]] && . ~/.aliases
+[[ -f ~/$XDG_CONFIG_HOME/aliases ]] && . ~/$XDG_CONFIG_HOME/aliases

 
 # set PATH so it includes user's private bin if it exists
 [[ -d "$HOME/bin" ]] && PATH="$HOME/bin:$PATH"
 
 # set PATH so it includes user's private bin if it exists
 [[ -d "$HOME/bin" ]] && PATH="$HOME/bin:$PATH"

diff --git a/zshrc b/zshrc
index 6babf77fcb22c26e51a952a3abed5ce960632b16..41c274749e86718011998531fa9d024cebe481c8 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -40,7 +40,7 @@ typeset -U path     # make path a unique array
 [[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
 
 # source aliases
 [[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
 
 # source aliases

-[[ -f ~/.aliases ]] && source ~/.aliases
+[[ -f ~/$XDG_CONFIG_HOME/aliases ]] && source ~/$XDG_CONFIG_HOME/aliases

 for alias_file ($ZSH/aliases/*.zsh); do
   source $alias_file
 done
 for alias_file ($ZSH/aliases/*.zsh); do
   source $alias_file
 done