diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix
index 646b8cc..62fb821 100644
--- a/hosts/desktops/common/packages.nix
+++ b/hosts/desktops/common/packages.nix
@@ -33,6 +33,7 @@
     mpv
     nil
     nix-init
+    nix-your-shell
     obs-studio
     obs-studio-plugins.obs-vkcapture
     p7zip
diff --git a/users/common/programs.nix b/users/common/programs.nix
index 8e0ca1c..2a79ad6 100644
--- a/users/common/programs.nix
+++ b/users/common/programs.nix
@@ -39,8 +39,8 @@
     };
     fish = {
       enable = true;
-      interactiveShellInit = "nix-your-shell fish | source";
-      loginShellInit = "nix-your-shell fish | source";
+      # interactiveShellInit = "nix-your-shell fish | source"; # nix-your-shell only in unstable
+      # loginShellInit = "nix-your-shell fish | source";
       shellAliases = {
         nano = "micro";
         wget = "wget --hsts-file=\"$XDG_DATA_HOME/wget-hsts\"";
diff --git a/users/desktops/common/programs.nix b/users/desktops/common/programs.nix
index 523f13c..a1cda7d 100644
--- a/users/desktops/common/programs.nix
+++ b/users/desktops/common/programs.nix
@@ -27,6 +27,8 @@
       userEmail = "baduhai@proton.me";
     };
     fish = {
+      interactiveShellInit = "nix-your-shell fish | source";
+      loginShellInit = "nix-your-shell fish | source";
       functions = {
         rebuild = "rm ~/.gtkrc-2.0; sudo nixos-rebuild switch --flake '/home/user/Projects/personal/nix-config#'";
         rebuild-boot = "rm ~/.gtkrc-2.0; sudo nixos-rebuild boot --flake '/home/user/Projects/personal/nix-config#'";