authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2024-12-05 15:40:24-08:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2024-12-05 15:40:24-08:00
logf52b256bd2d1982a6b25f7455fd459c7da12aadf
tree3cfd2b0f59fa7e3405ffa582aab4ff8527ed8daa
parentef05ca09090496b528255c53bb08ed7ab9601ea0
parent39fcd34213e20d9ae8b0153a20139e6c7343e202

Merge branch 'main' of github.com:nmarks413/nix-config

2 files changed, 3 insertions(+), 3 deletions(-)

hosts/laptop/configuration.nix+2-2
...@@ -42,9 +42,9 @@...@@ -42,9 +42,9 @@
4242
43 programs.zsh = {43 programs.zsh = {
44 interactiveShellInit = ''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 then46 then
47 shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""47 [[ -o login ]] && LOGIN_OPTION='--login' || LOGIN_OPTION=""
48 exec ${pkgs.fish}/bin/fish $LOGIN_OPTION48 exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
49 fi49 fi
50 '';50 '';
hosts/laptop/home.nix+1-1
...@@ -135,7 +135,7 @@...@@ -135,7 +135,7 @@
135 }135 }
136 ];136 ];
137 shellAliases = {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 };
141141