diff --git a/pkgs/by-name/fi/fishPlugins/.packageset b/pkgs/by-name/fi/fishPlugins/.packageset
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/pkgs/shells/fish/plugins/z.nix b/pkgs/by-name/fi/fishPlugins/_z/z/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/z.nix
rename to pkgs/by-name/fi/fishPlugins/_z/z/package.nix
diff --git a/pkgs/by-name/fi/fishPlugins/aliases.nix b/pkgs/by-name/fi/fishPlugins/aliases.nix
new file mode 100644
index 0000000000000..2ccedb2d51335
--- /dev/null
+++ b/pkgs/by-name/fi/fishPlugins/aliases.nix
@@ -0,0 +1,5 @@
+self: super:
+with self;
+lib.mkIf config.allowAliases {
+  autopair-fish = self.autopair; # Added 2023-03-10
+}
diff --git a/pkgs/shells/fish/plugins/async-prompt.nix b/pkgs/by-name/fi/fishPlugins/as/async-prompt/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/async-prompt.nix
rename to pkgs/by-name/fi/fishPlugins/as/async-prompt/package.nix
diff --git a/pkgs/shells/fish/plugins/autopair.nix b/pkgs/by-name/fi/fishPlugins/au/autopair/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/autopair.nix
rename to pkgs/by-name/fi/fishPlugins/au/autopair/package.nix
diff --git a/pkgs/shells/fish/plugins/aws.nix b/pkgs/by-name/fi/fishPlugins/aw/aws/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/aws.nix
rename to pkgs/by-name/fi/fishPlugins/aw/aws/package.nix
diff --git a/pkgs/shells/fish/plugins/bang-bang.nix b/pkgs/by-name/fi/fishPlugins/ba/bang-bang/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/bang-bang.nix
rename to pkgs/by-name/fi/fishPlugins/ba/bang-bang/package.nix
diff --git a/pkgs/shells/fish/plugins/bass.nix b/pkgs/by-name/fi/fishPlugins/ba/bass/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/bass.nix
rename to pkgs/by-name/fi/fishPlugins/ba/bass/package.nix
diff --git a/pkgs/shells/fish/plugins/bobthefish.nix b/pkgs/by-name/fi/fishPlugins/bo/bobthefish/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/bobthefish.nix
rename to pkgs/by-name/fi/fishPlugins/bo/bobthefish/package.nix
diff --git a/pkgs/shells/fish/plugins/bobthefisher.nix b/pkgs/by-name/fi/fishPlugins/bo/bobthefisher/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/bobthefisher.nix
rename to pkgs/by-name/fi/fishPlugins/bo/bobthefisher/package.nix
diff --git a/pkgs/shells/fish/plugins/build-fish-plugin.nix b/pkgs/by-name/fi/fishPlugins/bu/buildFishPlugin/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/build-fish-plugin.nix
rename to pkgs/by-name/fi/fishPlugins/bu/buildFishPlugin/package.nix
diff --git a/pkgs/shells/fish/plugins/clownfish.nix b/pkgs/by-name/fi/fishPlugins/cl/clownfish/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/clownfish.nix
rename to pkgs/by-name/fi/fishPlugins/cl/clownfish/package.nix
diff --git a/pkgs/shells/fish/plugins/colored-man-pages.nix b/pkgs/by-name/fi/fishPlugins/co/colored-man-pages/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/colored-man-pages.nix
rename to pkgs/by-name/fi/fishPlugins/co/colored-man-pages/package.nix
diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/by-name/fi/fishPlugins/do/done/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/done.nix
rename to pkgs/by-name/fi/fishPlugins/do/done/package.nix
diff --git a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix b/pkgs/by-name/fi/fishPlugins/ex/exercism-cli-fish-wrapper/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix
rename to pkgs/by-name/fi/fishPlugins/ex/exercism-cli-fish-wrapper/package.nix
diff --git a/pkgs/shells/fish/plugins/fifc.nix b/pkgs/by-name/fi/fishPlugins/fi/fifc/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/fifc.nix
rename to pkgs/by-name/fi/fishPlugins/fi/fifc/package.nix
diff --git a/pkgs/shells/fish/plugins/fish-bd.nix b/pkgs/by-name/fi/fishPlugins/fi/fish-bd/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/fish-bd.nix
rename to pkgs/by-name/fi/fishPlugins/fi/fish-bd/package.nix
diff --git a/pkgs/shells/fish/plugins/fish-you-should-use.nix b/pkgs/by-name/fi/fishPlugins/fi/fish-you-should-use/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/fish-you-should-use.nix
rename to pkgs/by-name/fi/fishPlugins/fi/fish-you-should-use/package.nix
diff --git a/pkgs/shells/fish/plugins/fishbang.nix b/pkgs/by-name/fi/fishPlugins/fi/fishbang/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/fishbang.nix
rename to pkgs/by-name/fi/fishPlugins/fi/fishbang/package.nix
diff --git a/pkgs/shells/fish/plugins/fishtape.nix b/pkgs/by-name/fi/fishPlugins/fi/fishtape/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/fishtape.nix
rename to pkgs/by-name/fi/fishPlugins/fi/fishtape/package.nix
diff --git a/pkgs/shells/fish/plugins/fishtape_3.nix b/pkgs/by-name/fi/fishPlugins/fi/fishtape_3/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/fishtape_3.nix
rename to pkgs/by-name/fi/fishPlugins/fi/fishtape_3/package.nix
diff --git a/pkgs/shells/fish/plugins/foreign-env/default.nix b/pkgs/by-name/fi/fishPlugins/fo/foreign-env/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/foreign-env/default.nix
rename to pkgs/by-name/fi/fishPlugins/fo/foreign-env/package.nix
diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/by-name/fi/fishPlugins/fo/forgit/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/forgit.nix
rename to pkgs/by-name/fi/fishPlugins/fo/forgit/package.nix
diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/by-name/fi/fishPlugins/fz/fzf-fish/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/fzf-fish.nix
rename to pkgs/by-name/fi/fishPlugins/fz/fzf-fish/package.nix
diff --git a/pkgs/shells/fish/plugins/fzf.nix b/pkgs/by-name/fi/fishPlugins/fz/fzf/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/fzf.nix
rename to pkgs/by-name/fi/fishPlugins/fz/fzf/package.nix
diff --git a/pkgs/shells/fish/plugins/git-abbr.nix b/pkgs/by-name/fi/fishPlugins/gi/git-abbr/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/git-abbr.nix
rename to pkgs/by-name/fi/fishPlugins/gi/git-abbr/package.nix
diff --git a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix b/pkgs/by-name/fi/fishPlugins/gi/github-copilot-cli-fish/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/github-copilot-cli-fish.nix
rename to pkgs/by-name/fi/fishPlugins/gi/github-copilot-cli-fish/package.nix
diff --git a/pkgs/shells/fish/plugins/grc.nix b/pkgs/by-name/fi/fishPlugins/gr/grc/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/grc.nix
rename to pkgs/by-name/fi/fishPlugins/gr/grc/package.nix
diff --git a/pkgs/shells/fish/plugins/gruvbox.nix b/pkgs/by-name/fi/fishPlugins/gr/gruvbox/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/gruvbox.nix
rename to pkgs/by-name/fi/fishPlugins/gr/gruvbox/package.nix
diff --git a/pkgs/shells/fish/plugins/humantime-fish.nix b/pkgs/by-name/fi/fishPlugins/hu/humantime-fish/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/humantime-fish.nix
rename to pkgs/by-name/fi/fishPlugins/hu/humantime-fish/package.nix
diff --git a/pkgs/shells/fish/plugins/hydro.nix b/pkgs/by-name/fi/fishPlugins/hy/hydro/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/hydro.nix
rename to pkgs/by-name/fi/fishPlugins/hy/hydro/package.nix
diff --git a/pkgs/shells/fish/plugins/macos.nix b/pkgs/by-name/fi/fishPlugins/ma/macos/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/macos.nix
rename to pkgs/by-name/fi/fishPlugins/ma/macos/package.nix
diff --git a/pkgs/shells/fish/plugins/nvm.nix b/pkgs/by-name/fi/fishPlugins/nv/nvm/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/nvm.nix
rename to pkgs/by-name/fi/fishPlugins/nv/nvm/package.nix
diff --git a/pkgs/shells/fish/plugins/pisces.nix b/pkgs/by-name/fi/fishPlugins/pi/pisces/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/pisces.nix
rename to pkgs/by-name/fi/fishPlugins/pi/pisces/package.nix
diff --git a/pkgs/shells/fish/plugins/plugin-git.nix b/pkgs/by-name/fi/fishPlugins/pl/plugin-git/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/plugin-git.nix
rename to pkgs/by-name/fi/fishPlugins/pl/plugin-git/package.nix
diff --git a/pkgs/shells/fish/plugins/plugin-sudope.nix b/pkgs/by-name/fi/fishPlugins/pl/plugin-sudope/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/plugin-sudope.nix
rename to pkgs/by-name/fi/fishPlugins/pl/plugin-sudope/package.nix
diff --git a/pkgs/shells/fish/plugins/puffer.nix b/pkgs/by-name/fi/fishPlugins/pu/puffer/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/puffer.nix
rename to pkgs/by-name/fi/fishPlugins/pu/puffer/package.nix
diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/by-name/fi/fishPlugins/pu/pure/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/pure.nix
rename to pkgs/by-name/fi/fishPlugins/pu/pure/package.nix
diff --git a/pkgs/shells/fish/plugins/sdkman-for-fish.nix b/pkgs/by-name/fi/fishPlugins/sd/sdkman-for-fish/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/sdkman-for-fish.nix
rename to pkgs/by-name/fi/fishPlugins/sd/sdkman-for-fish/package.nix
diff --git a/pkgs/shells/fish/plugins/spark.nix b/pkgs/by-name/fi/fishPlugins/sp/spark/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/spark.nix
rename to pkgs/by-name/fi/fishPlugins/sp/spark/package.nix
diff --git a/pkgs/shells/fish/plugins/sponge.nix b/pkgs/by-name/fi/fishPlugins/sp/sponge/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/sponge.nix
rename to pkgs/by-name/fi/fishPlugins/sp/sponge/package.nix
diff --git a/pkgs/shells/fish/plugins/tide.nix b/pkgs/by-name/fi/fishPlugins/ti/tide/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/tide.nix
rename to pkgs/by-name/fi/fishPlugins/ti/tide/package.nix
diff --git a/pkgs/shells/fish/plugins/transient-fish.nix b/pkgs/by-name/fi/fishPlugins/tr/transient-fish/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/transient-fish.nix
rename to pkgs/by-name/fi/fishPlugins/tr/transient-fish/package.nix
diff --git a/pkgs/shells/fish/plugins/wakatime-fish.nix b/pkgs/by-name/fi/fishPlugins/wa/wakatime-fish/package.nix
similarity index 100%
rename from pkgs/shells/fish/plugins/wakatime-fish.nix
rename to pkgs/by-name/fi/fishPlugins/wa/wakatime-fish/package.nix
diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix
deleted file mode 100644
index 0620be9974160..0000000000000
--- a/pkgs/shells/fish/plugins/default.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  lib,
-  newScope,
-  config,
-}:
-
-lib.makeScope newScope (
-  self:
-  with self;
-  {
-    async-prompt = callPackage ./async-prompt.nix { };
-
-    autopair = callPackage ./autopair.nix { };
-
-    aws = callPackage ./aws.nix { };
-
-    bang-bang = callPackage ./bang-bang.nix { };
-
-    bobthefish = callPackage ./bobthefish.nix { };
-
-    bobthefisher = callPackage ./bobthefisher.nix { };
-
-    buildFishPlugin = callPackage ./build-fish-plugin.nix { };
-
-    colored-man-pages = callPackage ./colored-man-pages.nix { };
-
-    clownfish = callPackage ./clownfish.nix { };
-
-    bass = callPackage ./bass.nix { };
-
-    done = callPackage ./done.nix { };
-
-    exercism-cli-fish-wrapper = callPackage ./exercism-cli-fish-wrapper.nix { };
-
-    fifc = callPackage ./fifc.nix { };
-
-    fishbang = callPackage ./fishbang.nix { };
-
-    fish-bd = callPackage ./fish-bd.nix { };
-
-    # Fishtape 2.x and 3.x aren't compatible,
-    # but both versions are used in the tests of different other plugins.
-    fishtape = callPackage ./fishtape.nix { };
-    fishtape_3 = callPackage ./fishtape_3.nix { };
-
-    fish-you-should-use = callPackage ./fish-you-should-use.nix { };
-
-    foreign-env = callPackage ./foreign-env { };
-
-    forgit = callPackage ./forgit.nix { };
-
-    fzf = callPackage ./fzf.nix { };
-
-    fzf-fish = callPackage ./fzf-fish.nix { };
-
-    github-copilot-cli-fish = callPackage ./github-copilot-cli-fish.nix { };
-
-    git-abbr = callPackage ./git-abbr.nix { };
-
-    grc = callPackage ./grc.nix { };
-
-    gruvbox = callPackage ./gruvbox.nix { };
-
-    humantime-fish = callPackage ./humantime-fish.nix { };
-
-    hydro = callPackage ./hydro.nix { };
-
-    macos = callPackage ./macos.nix { };
-
-    nvm = callPackage ./nvm.nix { };
-
-    pisces = callPackage ./pisces.nix { };
-
-    plugin-git = callPackage ./plugin-git.nix { };
-
-    plugin-sudope = callPackage ./plugin-sudope.nix { };
-
-    puffer = callPackage ./puffer.nix { };
-
-    pure = callPackage ./pure.nix { };
-
-    sdkman-for-fish = callPackage ./sdkman-for-fish.nix { };
-
-    spark = callPackage ./spark.nix { };
-
-    sponge = callPackage ./sponge.nix { };
-
-    tide = callPackage ./tide.nix { };
-
-    transient-fish = callPackage ./transient-fish.nix { };
-
-    wakatime-fish = callPackage ./wakatime-fish.nix { };
-
-    z = callPackage ./z.nix { };
-  }
-  // lib.optionalAttrs config.allowAliases {
-    autopair-fish = self.autopair; # Added 2023-03-10
-  }
-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62ad433444971..e74c774020d69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4015,8 +4015,6 @@ with pkgs;
 
   wrapFish = callPackage ../shells/fish/wrapper.nix { };
 
-  fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { });
-
   powerline = with python3Packages; toPythonApplication powerline;
 
   ### DEVELOPMENT / COMPILERS
diff --git a/pkgs/top-level/by-name-overlay.nix b/pkgs/top-level/by-name-overlay.nix
index e6fe5b7215560..4ce5f6717c815 100644
--- a/pkgs/top-level/by-name-overlay.nix
+++ b/pkgs/top-level/by-name-overlay.nix
@@ -32,9 +32,7 @@ let
       # Additionally in either of those alternatives, we would have to duplicate the hardcoding of "README.md"
       { }
     else
-      mapAttrs (name: _: baseDirectory + "/${shard}/${name}/package.nix") (
-        readDir (baseDirectory + "/${shard}")
-      );
+      mapAttrs (name: _: baseDirectory + "/${shard}/${name}") (readDir (baseDirectory + "/${shard}"));
 
   # The attribute set mapping names to the package files defining them
   # This is defined up here in order to allow reuse of the value (it's kind of expensive to compute)
@@ -51,4 +49,12 @@ self: super:
   # Because at that point the code in ./stage.nix can be changed to not allow definitions in `all-packages.nix` to override ones from `pkgs/by-name` anymore and throw an error if that happens instead.
   _internalCallByNamePackageFile = file: self.callPackage file { };
 }
-// mapAttrs (name: self._internalCallByNamePackageFile) packageFiles
+// mapAttrs (
+  name: path:
+  if lib.pathIsRegularFile (path + "/.packageset") then
+    lib.recurseIntoAttrs (
+      lib.makeScope self.newScope (setself: import ./by-name-overlay.nix path setself { })
+    )
+  else
+    self._internalCallByNamePackageFile (path + "/package.nix")
+) packageFiles