diff --git a/modules/packages.nix b/modules/packages.nix
index 2f57fa5..6b9929d 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -6,6 +6,7 @@
     alejandra
     nixpkgs-fmt
 
+    nix-your-shell
     nix-melt
     attic-client
     cachix
diff --git a/programs/fish/conf.d/99_interactive.fish b/programs/fish/conf.d/99_interactive.fish
index b81416c..01e6fe6 100644
--- a/programs/fish/conf.d/99_interactive.fish
+++ b/programs/fish/conf.d/99_interactive.fish
@@ -5,6 +5,8 @@ if status is-interactive
     zoxide init fish | source
     # direnv
     direnv hook fish | source
+    # nix-your-shell
+    nix-your-shell fish | source
 
     set -x FZF_DEFAULT_OPTS " \
 --color=bg+:#414559,bg:#303446,spinner:#f2d5cf,hl:#e78284 \
diff --git a/programs/zsh/initExtra.zsh b/programs/zsh/initExtra.zsh
index 64ae113..f9c2c89 100644
--- a/programs/zsh/initExtra.zsh
+++ b/programs/zsh/initExtra.zsh
@@ -46,5 +46,8 @@ eval "$(zoxide init zsh)"
 # direnv
 command -v direnv &> /dev/null && eval "$(direnv hook zsh)"
 
+# nix-your-shell
+eval "$(nix-your-shell zsh)"
+
 # iTerm
 [ -e "$HOME/.iterm2_shell_integration.zsh" ] && source "$HOME/.iterm2_shell_integration.zsh"