From e6160107b4602572e5a916160156a7dec150a9fa Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Mon, 3 Jul 2023 22:34:19 -0400 Subject: [PATCH] gave up on conditionally loading direnv in fish --- modules/direnv.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/modules/direnv.nix b/modules/direnv.nix index 45cff97..7dc7f3d 100644 --- a/modules/direnv.nix +++ b/modules/direnv.nix @@ -12,7 +12,7 @@ _: {pkgs, ...}: { }; programs = { zsh.interactiveShellInit = '' - if [[ -o interactive ]] && ! printenv PATH | grep -qc '/nix/store' && [ -z "$IN_NIX_SHELL" ] ; then + if ! printenv PATH | grep -qc '/nix/store' && [ -z "$IN_NIX_SHELL" ] ; then eval "$(direnv hook zsh)" fi ''; @@ -21,14 +21,5 @@ _: {pkgs, ...}: { eval "$(direnv hook bash)" fi ''; - # doesn't work for some reason - # fish.enable = true; - # fish.interactiveShellInit = '' - # set -g direnv_fish_mode disable_arrow - # if status --is-interactive; and not printenv PATH | grep -qc '/nix/store'; and [ -z "$IN_NIX_SHELL" ]; - # direnv hook fish | source; - # echo "loaded direnv"; - # end - # ''; }; }