diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 5742c6c..6edadf6 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -42,9 +42,9 @@ programs.zsh = { interactiveShellInit = '' - if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + if [[ $(${pkgs.procps}/bin/ps -p $PPID -o comm) != "fish" && -z ''${ZSH_EXUCTION_STRING} ]] then - shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" + [[ -o login ]] && LOGIN_OPTION='--login' || LOGIN_OPTION="" exec ${pkgs.fish}/bin/fish $LOGIN_OPTION fi ''; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index ab56a09..1e17ec9 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -135,7 +135,7 @@ } ]; shellAliases = { - DYLD_FALLBACK_LIBRARY_PATH = "$(brew --prefix)/lib:$DYLD_FALLBACK_LIBRARY_PATH"; + # DYLD_FALLBACK_LIBRARY_PATH = "$(brew --prefix)/lib:$DYLD_FALLBACK_LIBRARY_PATH"; }; };