From: Ruben Beltran del Rio <redacted>
Date: Fri, 16 Sep 2022 13:28:50 +0000 (+0200)
Subject: Merge branch 'main' of git.sr.ht:~rbdr/dotfiles
X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/0cef00d4461a4e352d65d53821dfe38c7379643f?hp=382841ad0f96ab55d5940312739ca2ca80c4908b

Merge branch 'main' of git.sr.ht:~rbdr/dotfiles
---

diff --git a/zsh/modules/prompt.zsh b/zsh/modules/prompt.zsh
index 0ab1e0d..beeb85d 100644
--- a/zsh/modules/prompt.zsh
+++ b/zsh/modules/prompt.zsh
@@ -1,5 +1,13 @@
 autoload -Uz promptinit && promptinit
 
+function tool_versions() {
+  if [[ -s ".tool-versions" ]]; then
+	echo '.tool-versions'
+	return
+  fi
+  echo "${HOME}/.tool-versions"
+}
+
 if [[ "$TERM" == (dumb|linux|*bsd*) ]] || (( $#prompt_argv < 1 )); then
   prompt 'off'
 fi
@@ -22,20 +30,20 @@ function env_info {
 }
 
 function python_info {
-  pythoninfo=`cat ~/.tool-versions | rg python | cut -d ' ' -f 2`
+  pythoninfo=`cat "$(tool_versions)" | rg python | cut -d ' ' -f 2`
   pythoninfo=${ASDF_PYTHON_VERSION:-$pythoninfo}
   venv="${VIRTUAL_ENV##*/}"
   echo "%{%F{green}%}py%{%F{black}%} ${pythoninfo:-no}@${venv:-default}"
 }
 
 function ruby_info {
-  rubyinfo=`cat ~/.tool-versions | rg ruby | cut -d ' ' -f 2`
+  rubyinfo=`cat "$(tool_versions)" | rg ruby | cut -d ' ' -f 2`
   rubyinfo=${ASDF_RUBY_VERSION:-$rubyinfo}
   echo "%{%F{red}%}rb%{%F{black}%} ${rubyinfo:-no}"
 }
 
 function node_info {
-  nodeinfo=`cat ~/.tool-versions | rg nodejs | cut -d ' ' -f 2`
+  nodeinfo=`cat "$(tool_versions)" | rg nodejs | cut -d ' ' -f 2`
   nodeinfo=${ASDF_NODEJS_VERSION:-$nodeinfo}
   echo "%{%F{yellow}%}js%{%F{black}%} ${nodeinfo:-no}"
 }