From f0255f5ed4fa25621ad6bbe69b47ac0c9f3acbb9 Mon Sep 17 00:00:00 2001
From: Evan Pratten <evan@ewpratten.com>
Date: Thu, 16 May 2024 10:16:27 -0400
Subject: [PATCH] auto-load modules

---
 configs/shells/bash/.bashrc   | 8 ++++++++
 configs/shells/bash/macros.sh | 6 ------
 configs/shells/zsh/.zshrc     | 9 +++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/configs/shells/bash/.bashrc b/configs/shells/bash/.bashrc
index b7782d2..c641f83 100644
--- a/configs/shells/bash/.bashrc
+++ b/configs/shells/bash/.bashrc
@@ -18,3 +18,11 @@ export PYTHONSTARTUP="$EWCONFIG_ROOT/configs/python/python_startup.py"
 
 # A basic prompt to display user@host dir sign
 export PS1="(${PS1_CTX:-bash}) \[\e[0;32m\]\u@\h \[\e[0;36m\]\w \[\e[0;36m\]\$ \[\e[0m\]"
+
+# Search for ewconfig modules that need to be loaded
+for module in $(find $EWCONFIG_ROOT/modules -maxdepth 1 -mindepth 1 -type d); do
+    # If this module contains a `bin` directory, add it to the PATH
+    if [ -d "$module/bin" ]; then
+        export PATH="$module/bin:$PATH"
+    fi
+done
\ No newline at end of file
diff --git a/configs/shells/bash/macros.sh b/configs/shells/bash/macros.sh
index 06803b2..ff7aebc 100644
--- a/configs/shells/bash/macros.sh
+++ b/configs/shells/bash/macros.sh
@@ -13,19 +13,13 @@ alias bashreload="source ~/.bashrc"
 alias wg-easykeys="wg genkey | tee >(wg pubkey)"
 alias nvim-tmp="nvim $(mktemp)"
 alias flush-dns="sudo systemd-resolve --flush-caches"
-alias showsizes="du -h --max-depth=1"
 alias lsgrep="ls | grep"
-alias sheridan-rdp='firefox --new-window "ext+container:name=College&url=https://client.wvd.microsoft.com/arm/webclient/index.html"'
 alias git-diff-nvim="git diff | nvim -R -d -c 'set filetype=diff' -"
 alias yk-totp="ykman oath accounts code"
 alias flush-dns-cache="sudo systemd-resolve --flush-caches"
-alias which-ls="ls -la $(which ls)"
-alias rdns="dig +short -x"
 alias ufw-status="sudo ufw status numbered"
 alias genuuid="python -c 'import uuid; print(uuid.uuid4())'"
 alias clipboard="xclip -selection clipboard"
-alias filesize="du -hs"
-alias arp-watch="sudo tcpdump -nn -tt -q \"arp and arp[6:2] == 2\""
 alias snvim="sudoedit"
 
 # WHOIS macros
diff --git a/configs/shells/zsh/.zshrc b/configs/shells/zsh/.zshrc
index 1e2c2f8..5966072 100644
--- a/configs/shells/zsh/.zshrc
+++ b/configs/shells/zsh/.zshrc
@@ -51,6 +51,14 @@ if type -p nvim > /dev/null; then
     export MANWIDTH=80
 fi
 
+# Search for ewconfig modules that need to be loaded
+for module in $(find $EWCONFIG_ROOT/modules -maxdepth 1 -mindepth 1 -type d); do
+    # If this module contains a `bin` directory, add it to the PATH
+    if [ -d "$module/bin" ]; then
+        export PATH="$module/bin:$PATH"
+    fi
+done
+
 # SDKMAN!
 export SDKMAN_DIR="$HOME/.sdkman"
 [[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
@@ -60,3 +68,4 @@ export SDKMAN_DIR="$HOME/.sdkman"
 
 # Rye
 [[ -s "$HOME/.rye/env" ]] && source "$HOME/.rye/env"
+