From b2e82b80d34c857eda431187a44025945923b30a Mon Sep 17 00:00:00 2001
From: Alexander Rosenberg <zanderpkg@pm.me>
Date: Tue, 18 Feb 2025 13:13:15 -0800
Subject: [PATCH] Improve distrobox detection

---
 init.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/init.zsh b/init.zsh
index b41c2d4..28527fa 100644
--- a/init.zsh
+++ b/init.zsh
@@ -32,9 +32,9 @@ function source_user_file {
 source_user_file "early-init"
 
 # Load distrobox early init file
-local is_in_container=false
-if [[ -e /run/.containerenv ]]; then
-    is_in_container=true
+local is_in_distrobox=false
+if [[ -e /run/.containerenv ]] && cmd_exists distrobox-host-exec; then
+    is_in_distrobox=true
     local ctenv=("${(@f)"$(</run/.containerenv)"}")
     for line in ${ctenv}; do
         if [[ "${line}" == 'name='* ]]; then
@@ -96,7 +96,7 @@ if [[ -v NVIM ]]; then
     alias nvim=nvr
     alias e=nvr
     alias emacs=nvr
-elif [[ "${is_in_container}" == true ]]; then
+elif [[ "${is_in_distrobox}" == true ]]; then
     if [[ -v INSIDE_EMACS ]]; then
         [[ -z "${XDG_RUNTIME_DIR}" ]] && \
             export XDG_RUNTIME_DIR="/run/user/${UID}"
@@ -363,7 +363,7 @@ fi
 unfunction load_plugin
 unfunction cmd_exists
 unfunction source_user_file
-unset is_in_container
+unset is_in_distrobox
 
 let ZSH_INIT_TIME="$(( EPOCHREALTIME - __init_zsh_start ))"
 function zsh-init-time {