diff options
Diffstat (limited to 'users')
| -rw-r--r-- | users/seth/shell/fish.nix | 18 | ||||
| -rw-r--r-- | users/seth/shell/zsh.nix | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/users/seth/shell/fish.nix b/users/seth/shell/fish.nix index 2afdf96..0f101cd 100644 --- a/users/seth/shell/fish.nix +++ b/users/seth/shell/fish.nix @@ -20,13 +20,17 @@ in { enable = true; - # TODO: do i still need this weird sourcing? - interactiveShellInit = lib.optionalString config.seth.standalone.enable '' - set -l nixfile ${config.home.homeDirectory}/.nix-profile/etc/profile.d/nix.fish - if test -e $nixfile - source $nixfile - end - ''; + interactiveShellInit = + '' + ${lib.getExe pkgs.nix-your-shell} fish | source + '' + # TODO: do i still need this weird sourcing? + + lib.optionalString config.seth.standalone.enable '' + set -l nixfile ${config.home.homeDirectory}/.nix-profile/etc/profile.d/nix.fish + if test -e $nixfile + source $nixfile + end + ''; functions = { last_history_item.body = "echo $history[1]"; diff --git a/users/seth/shell/zsh.nix b/users/seth/shell/zsh.nix index 0d98b7e..5c0bc69 100644 --- a/users/seth/shell/zsh.nix +++ b/users/seth/shell/zsh.nix @@ -72,6 +72,8 @@ in zle -N clear-screen-and-scrollback bindkey '^L' clear-screen-and-scrollback + ${lib.getExe pkgs.nix-your-shell} zsh | source /dev/stdin + [[ ! -f ~/.config/zsh/.p10k.zsh ]] || source ~/.config/zsh/.p10k.zsh ''; |