From 0da7e231c4c607bee63cddcc200961d9a6f465e4 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 21 Jul 2024 04:56:37 -0400 Subject: revert: seth: drop nix-your-shell Reverts 399012d647d5e08b01b33345b7711851090ee6d4 I missed it --- users/seth/shell/fish.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'users/seth/shell/fish.nix') 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]"; -- cgit v1.2.3