From 9316d74027d50cdd772bc999c0d5c2bc3c6fc5db Mon Sep 17 00:00:00 2001
From: Joe Groocock <me@frebib.net>
Date: Tue, 11 Aug 2020 15:59:45 +0100
Subject: [PATCH] aliases: fix 'dotfiles' and 'aliases' alias

After moving dotfiles around, these aliases became out of sync.
Dynamically detect the path of the 'aliases' file, and set 'dotfiles' to
use the XDG config directory.

Signed-off-by: Joe Groocock <me@frebib.net>
---
 aliases    | 10 ++++++++--
 zsh/.zshrc |  7 -------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/aliases b/aliases
index 94ed69e..c01216a 100644
--- a/aliases
+++ b/aliases
@@ -1,3 +1,9 @@
+case "$(basename "$(readlink -f /proc/$$/exe)")" in
+    zsh)  thisfile="$(readlink -f "${(%):-%N}")";;
+    bash) thisfile="$(readlink -f "${BASH_SOURCE[0]}")";;
+    *)   thisfile="$(find /proc/$$/fd/ | xargs -n1 -r readlink -f | grep aliases | head -n1)";;
+esac
+
 # Global aliases for ZSH
 if alias -g 2>/dev/null; then
     alias -g ...=../..
@@ -287,14 +293,14 @@ _zl() { _zfs "list $@"; }
 
 # General Aliases
 alias ssha='eval `ssh-agent` ; ssh-add'
-alias aliases="$EDITOR $DOTFILES/aliases ; exec zsh"
+alias aliases="$EDITOR $thisfile ; exec zsh"
 alias vimrc="$EDITOR $VIMRC"
 alias zshrc="$EDITOR ${ZDOTDIR:-$HOME}/.zshrc ; exec zsh"
 alias gitrc="$EDITOR $XDG_CONFIG_HOME/git/config"
 alias xinitrc="$EDITOR $XDG_CONFIG_HOME/X11/xinitrc"
 alias xresources="$EDITOR $XDG_CONFIG_HOME/X11/xresources ; xrdb merge $XDG_CONFIG_HOME/X11/xresources"
 alias sshc="$EDITOR ~/.ssh/config"
-alias dotfiles="cd $DOTFILES"
+alias dotfiles="cd $XDG_CONFIG_HOME"
 alias i3c="$EDITOR $XDG_CONFIG_HOME/i3/config; systemctl --user reload i3"
 alias polybarc="$EDITOR $XDG_CONFIG_HOME/polybar/config; systemctl --user reload polybar@i3bar"
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index cccd269..43418b9 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -151,13 +151,6 @@ ZSH_HIGHLIGHT_STYLES[redirection]='fg=cyan,bold'
 
 source "$XDG_CONFIG_HOME/aliases"
 
-# Source secret keys and values into environment
-if [ -f "$XDG_CONFIG_HOME/secrets" ]; then
-    set -o allexport
-    source $XDG_CONFIG_HOME/secrets
-    set +o allexport
-fi
-
 # Load some manual plugins
 source "$ZSH_DIR/plugins/sudo.zsh"
 source "$ZSH_DIR/plugins/fish-theme.zsh"