From 47f024d703aa9d02ea79404ef107b31a81ecb9d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20M=C3=A4der?= <maeder@phys.ethz.ch>
Date: Thu, 16 Jan 2025 13:38:51 +0100
Subject: [PATCH] Load bash-completions from ~/.local/share/bash-completion

---
 profile/default/envrcd.d/50-complete | 11 +++++++++++
 profile/rda/envrcd.d/50-complete     |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/profile/default/envrcd.d/50-complete b/profile/default/envrcd.d/50-complete
index d344143..685afd4 100644
--- a/profile/default/envrcd.d/50-complete
+++ b/profile/default/envrcd.d/50-complete
@@ -2,3 +2,14 @@
 
 # load system bash-completion
 source_if_exists /etc/profile.d/bash_completion.sh
+
+# bash completions for local commands in ~/.local/bin
+LOCAL_COMMANDS="fzf tldr zellij uv xh sd delta dust pdu dog hyperfine btm broot lsd eza yazi"
+for LOCAL_COMMAND in ${LOCAL_COMMANDS}; do
+    #if [ -x "$(command -v ${LOCAL_COMMAND})" ]; then  # POSIX compatible
+    if hash ${LOCAL_COMMAND} 2>/dev/null; then  # bash builtin
+        if [ -x ${HOME}/.local/bin/${LOCAL_COMMAND} ]; then
+            source_if_exists "${HOME}/.local/share/bash-completion/${LOCAL_COMMAND}"
+        fi
+    fi
+done
diff --git a/profile/rda/envrcd.d/50-complete b/profile/rda/envrcd.d/50-complete
index 14277b5..0d71607 100644
--- a/profile/rda/envrcd.d/50-complete
+++ b/profile/rda/envrcd.d/50-complete
@@ -25,12 +25,12 @@ if [ -f ~/git/gitlab/py-ethz/bin/ethz-completion.bash ] && ! shopt -oq posix; th
 fi
 
 # bash completions for local commands in ~/.local/bin
-LOCAL_COMMANDS="fzf tldr zellij uv xh sd delta dust pdu dog hyperfine btm broot lsd eza"
+LOCAL_COMMANDS="fzf tldr zellij uv xh sd delta dust pdu dog hyperfine btm broot lsd eza yazi"
 for LOCAL_COMMAND in ${LOCAL_COMMANDS}; do
     #if [ -x "$(command -v ${LOCAL_COMMAND})" ]; then  # POSIX compatible
     if hash ${LOCAL_COMMAND} 2>/dev/null; then  # bash builtin
-        if [ -x ~/.local/bin/${LOCAL_COMMAND} ]; then
-            source_if_exists "${ENVRCD_PATH}/profile/_assets/completions/${LOCAL_COMMAND}_bash"
+        if [ -x ${HOME}/.local/bin/${LOCAL_COMMAND} ]; then
+            source_if_exists "${HOME}/.local/share/bash-completion/${LOCAL_COMMAND}"
         fi
     fi
 done
-- 
GitLab