From 0cf2993d37e317a405114b78df6a5440eeb88bbb Mon Sep 17 00:00:00 2001
From: Taha <62564400+mt190502@users.noreply.github.com>
Date: Sat, 15 Oct 2022 00:10:27 +0300
Subject: [PATCH] Fix distrobox prompt support (#351)

* Fix distrobox prompt support

* Fix distrobox prompt support

* Fix distrobox prompt support

* Fix distrobox prompt support

* Fix distrobox prompt support

* Fix distrobox prompt support

* Simplify and format

* Fix distrobox prompt support

* Remove extraneous command

Co-authored-by: Ilan Cosman <ilancosman@gmail.com>
---
 functions/_tide_item_distrobox.fish           | 2 +-
 functions/_tide_remove_unusable_items.fish    | 2 ++
 functions/tide/configure/configs/classic.fish | 2 +-
 functions/tide/configure/configs/lean.fish    | 2 +-
 functions/tide/configure/configs/rainbow.fish | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/functions/_tide_item_distrobox.fish b/functions/_tide_item_distrobox.fish
index 7ec873d..5e06a8b 100644
--- a/functions/_tide_item_distrobox.fish
+++ b/functions/_tide_item_distrobox.fish
@@ -1,4 +1,4 @@
 function _tide_item_distrobox
-    test -e /run/.distroboxenv &&
+    test -e /etc/profile.d/distrobox_profile.sh && test -e /run/.containerenv &&
         _tide_print_item distrobox $tide_distrobox_icon' ' (string match -rg 'name="(.*)"' </run/.containerenv)
 end
diff --git a/functions/_tide_remove_unusable_items.fish b/functions/_tide_remove_unusable_items.fish
index 8b14a00..443047a 100644
--- a/functions/_tide_remove_unusable_items.fish
+++ b/functions/_tide_remove_unusable_items.fish
@@ -4,6 +4,8 @@ function _tide_remove_unusable_items
     for item in aws chruby crystal distrobox docker git go java kubectl nix_shell node php pulumi rustc terraform toolbox virtual_env
         set -l cli_names $item
         switch $item
+            case distrobox # there is no 'distrobox' command inside the container
+                set cli_names distrobox-export # 'distrobox-export' and 'distrobox-host-exec' are available
             case virtual_env
                 set cli_names python python3
             case nix_shell
diff --git a/functions/tide/configure/configs/classic.fish b/functions/tide/configure/configs/classic.fish
index 8e8b41c..cf1b63a 100644
--- a/functions/tide/configure/configs/classic.fish
+++ b/functions/tide/configure/configs/classic.fish
@@ -95,7 +95,7 @@ tide_pwd_icon_home
 tide_pwd_icon_unwritable 
 tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json
 tide_right_prompt_frame_enabled true
-tide_right_prompt_items status cmd_duration context jobs node virtual_env rustc java php pulumi chruby go kubectl toolbox terraform aws nix_shell crystal
+tide_right_prompt_items status cmd_duration context jobs node virtual_env rustc java php pulumi chruby go kubectl distrobox toolbox terraform aws nix_shell crystal
 tide_right_prompt_prefix 
 tide_right_prompt_separator_diff_color 
 tide_right_prompt_separator_same_color 
diff --git a/functions/tide/configure/configs/lean.fish b/functions/tide/configure/configs/lean.fish
index 5e447bb..335d30e 100644
--- a/functions/tide/configure/configs/lean.fish
+++ b/functions/tide/configure/configs/lean.fish
@@ -95,7 +95,7 @@ tide_pwd_icon_home
 tide_pwd_icon_unwritable 
 tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json
 tide_right_prompt_frame_enabled false
-tide_right_prompt_items status cmd_duration context jobs node virtual_env rustc java php pulumi chruby go kubectl toolbox terraform aws nix_shell crystal
+tide_right_prompt_items status cmd_duration context jobs node virtual_env rustc java php pulumi chruby go kubectl distrobox toolbox terraform aws nix_shell crystal
 tide_right_prompt_prefix ' '
 tide_right_prompt_separator_diff_color ' '
 tide_right_prompt_separator_same_color ' '
diff --git a/functions/tide/configure/configs/rainbow.fish b/functions/tide/configure/configs/rainbow.fish
index a86d389..74046c2 100644
--- a/functions/tide/configure/configs/rainbow.fish
+++ b/functions/tide/configure/configs/rainbow.fish
@@ -95,7 +95,7 @@ tide_pwd_icon_home
 tide_pwd_icon_unwritable 
 tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json
 tide_right_prompt_frame_enabled true
-tide_right_prompt_items status cmd_duration context jobs node virtual_env rustc java php pulumi chruby go kubectl toolbox terraform aws nix_shell crystal
+tide_right_prompt_items status cmd_duration context jobs node virtual_env rustc java php pulumi chruby go kubectl distrobox toolbox terraform aws nix_shell crystal
 tide_right_prompt_prefix 
 tide_right_prompt_separator_diff_color 
 tide_right_prompt_separator_same_color 