From 93c23f99cb19fcc547019f9d314b4a8a7680b6cf Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 17 Apr 2022 20:55:53 +0530 Subject: [PATCH] conda activate now works under fish so use it --- .../fish/vendor_conf.d/kitty-shell-integration.fish | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish b/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish index 17c677900..f200b2aed 100644 --- a/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish +++ b/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish @@ -132,9 +132,7 @@ function __ksi_schedule --on-event fish_prompt -d "Setup kitty integration after and type -q conda and test "$CONDA_DEFAULT_ENV" != "$orig_conda_env" set _ksi_sourced "y" - # for some reason that I cant be bothered to figure out this doesnt take effect - # conda activate $_ksi_pre_rc_conda_default_env - eval ($CONDA_EXE shell.fish activate $CONDA_DEFAULT_ENV) + conda activate $CONDA_DEFAULT_ENV end if _ksi_s_is_ok "env_var" and test -n "$KITTY_CLONE_SOURCE_CODE"