diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix
index 831eb4e..f66023c 100644
--- a/hosts/common/packages.nix
+++ b/hosts/common/packages.nix
@@ -4,7 +4,6 @@
   nixpkgs.config.allowUnfree = true;
 
   environment.systemPackages = with pkgs; [
-    any-nix-shell
     bind
     btop
     comma
@@ -12,6 +11,7 @@
     lazydocker
     micro
     neofetch
+    nix-your-shell
     sysz
     tmux
     tree
diff --git a/users/common/programs.nix b/users/common/programs.nix
index a2bf4d4..4c4acb5 100644
--- a/users/common/programs.nix
+++ b/users/common/programs.nix
@@ -40,7 +40,7 @@
     fish = {
       enable = true;
       interactiveShellInit = "any-nix-shell fish --info-right | source";
-      loginShellInit = "any-nix-shell fish --info-right | source";
+      loginShellInit = "nix-your-shell fish --info-right | source";
       shellAliases = {
         nano = "micro";
         wget = "wget --hsts-file=\"$XDG_DATA_HOME/wget-hsts\"";