Merge branch 'main' of github.com:nmarks413/nix-config
2 files changed, 3 insertions(+), 3 deletions(-)
hosts
hosts/laptop/configuration.nix+2-2
| ... | ... | @@ -42,9 +42,9 @@ |
| 42 | 42 | |
| 43 | 43 | programs.zsh = { |
| 44 | 44 | interactiveShellInit = '' |
| 45 | if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] | |
| 45 | if [[ $(${pkgs.procps}/bin/ps -p $PPID -o comm) != "fish" && -z ''${ZSH_EXUCTION_STRING} ]] | |
| 46 | 46 | then |
| 47 | shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" | |
| 47 | [[ -o login ]] && LOGIN_OPTION='--login' || LOGIN_OPTION="" | |
| 48 | 48 | exec ${pkgs.fish}/bin/fish $LOGIN_OPTION |
| 49 | 49 | fi |
| 50 | 50 | ''; |
hosts/laptop/home.nix+1-1
| ... | ... | @@ -135,7 +135,7 @@ |
| 135 | 135 | } |
| 136 | 136 | ]; |
| 137 | 137 | shellAliases = { |
| 138 | DYLD_FALLBACK_LIBRARY_PATH = "$(brew --prefix)/lib:$DYLD_FALLBACK_LIBRARY_PATH"; | |
| 138 | # DYLD_FALLBACK_LIBRARY_PATH = "$(brew --prefix)/lib:$DYLD_FALLBACK_LIBRARY_PATH"; | |
| 139 | 139 | }; |
| 140 | 140 | }; |
| 141 | 141 |