diff options
| author | seth <[email protected]> | 2024-07-21 04:56:37 -0400 |
|---|---|---|
| committer | seth <[email protected]> | 2024-07-21 04:57:00 -0400 |
| commit | 0da7e231c4c607bee63cddcc200961d9a6f465e4 (patch) | |
| tree | c4434e83a52cc1e12bec926da004c1c69ff4c707 /users/seth | |
| parent | 4bbf26f109bf215db3dd1d67880892cf5f211b1a (diff) | |
revert: seth: drop nix-your-shell
Reverts 399012d647d5e08b01b33345b7711851090ee6d4
I missed it
Diffstat (limited to 'users/seth')
| -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 ''; |