diff --git a/pkgs/shells/nix-your-shell/default.nix b/pkgs/by-name/ni/nix-your-shell/package.nix
similarity index 65%
rename from pkgs/shells/nix-your-shell/default.nix
rename to pkgs/by-name/ni/nix-your-shell/package.nix
index 58190591e989..ed007d20a686 100644
--- a/pkgs/shells/nix-your-shell/default.nix
+++ b/pkgs/by-name/ni/nix-your-shell/package.nix
@@ -1,7 +1,8 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, nix-update-script
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "nix-your-shell";
@@ -9,19 +10,20 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "MercuryTechnologies";
-    repo = pname;
+    repo = "nix-your-shell";
     rev = "v${version}";
     hash = "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c=";
   };
 
   cargoHash = "sha256-2NgN2/dr48ogkcjOq6UE4jDQBeewceWzdpRlXqi744s=";
 
-  meta = with lib; {
+  meta = {
     mainProgram = "nix-your-shell";
     description = "`nix` and `nix-shell` wrapper for shells other than `bash`";
     homepage = "https://github.com/MercuryTechnologies/nix-your-shell";
-    license = [ licenses.mit ];
-    maintainers = [ maintainers._9999years ];
+    changelog = "https://github.com/MercuryTechnologies/nix-your-shell/releases/tags/v${version}";
+    license = [ lib.licenses.mit ];
+    maintainers = with lib.maintainers; [ _9999years ];
   };
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46d1f2e3a76f..6c67101a1da5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14293,8 +14293,6 @@ with pkgs;
 
   agdsn-zsh-config = callPackage ../shells/zsh/agdsn-zsh-config { };
 
-  nix-your-shell = callPackage ../shells/nix-your-shell { };
-
   bash = lowPrio (callPackage ../shells/bash/5.nix { });
   # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed
   bashInteractive = callPackage ../shells/bash/5.nix {