diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ff009fff60..0059297073 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,9 +30,14 @@ This is done by making most of the options of the type `types.nullOr ....`, and
 Most of nixvim is dedicated to wrapping neovim plugins such that we can configure them in Nix.
 To add a new plugin you need to do the following.
 
-1. Add a file in the correct sub-directory of [plugins](plugins). This depends on your exact plugin.
-
-The vast majority of plugins fall into one of those two categories:
+1. Add a file in the correct sub-directory of [`plugins`](plugins).
+  - Most plugins should be added to [`plugins/by-name/<name>`](plugins/by-name).
+    Plugins in `by-name` are automatically imported 🚀
+  - Occasionally, you may wish to add a plugin to a directory outside of `by-name`, such as [`plugins/colorschemes`](plugins/colorschemes).
+    If so, you will also need to add your plugin to [`plugins/default.nix`](plugins/default.nix) to ensure it gets imported.
+    Note: the imports list is sorted and grouped. In vim, you can usually use `V` (visual-line mode) with the `:sort` command to achieve the desired result.
+
+2. The vast majority of plugins fall into one of those two categories:
 - _vim plugins_: They are configured through **global variables** (`g:plugin_foo_option` in vimscript and `vim.g.plugin_foo_option` in lua).\
   For those, you should use the `lib.nixvim.vim-plugin.mkVimPlugin`.\
   -> See [this plugin](plugins/utils/direnv.nix) for an example.
@@ -40,7 +45,7 @@ The vast majority of plugins fall into one of those two categories:
   For those, you should use the `lib.nixvim.neovim-plugin.mkNeovimPlugin`.\
   -> See the [template](plugins/TEMPLATE.nix).
 
-2. Add the necessary parameters for the `mkNeovimPlugin`/`mkVimPlugin`:
+3. Add the necessary parameters for the `mkNeovimPlugin`/`mkVimPlugin`:
   - `name`: The name of the plugin. The resulting nixvim module will have `plugins.<name>` as a path.\
     For a plugin named `foo-bar.nvim`, set this to `foo-bar` (subject to exceptions).
   - `originalName`: The "real" name of the plugin (i.e. `foo-bar.nvim`). This is used mostly in documentation.
@@ -55,10 +60,6 @@ The vast majority of plugins fall into one of those two categories:
     See below for more information
   - `settingsExample`: An example of what could the `settings` attrs look like.
 
-3. Add to plugins/default.nix
-  - As a final step, please add your plugin to `plugins/default.nix` to ensure it gets imported.
-  - Note: the imports list is sorted and grouped. In vim, you can usually use `V` (visual-line mode) with the `:sort` command to achieve the desired result.
-
 [nixpkgs-maintainers]: https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix
 
 #### Declaring plugin options
diff --git a/flake-modules/dev/default.nix b/flake-modules/dev/default.nix
index e8461d2857..1bd4419bb4 100644
--- a/flake-modules/dev/default.nix
+++ b/flake-modules/dev/default.nix
@@ -77,6 +77,16 @@
             args = [ ".#checks.${system}.maintainers" ];
             pass_filenames = false;
           };
+          plugins-by-name = {
+            enable = true;
+            name = "plugins-by-name";
+            description = "Check `plugins/by-name` when it's modified.";
+            files = "^(?:tests/test-sources/)?plugins/by-name/";
+            package = pkgs.nix;
+            entry = "nix build --no-link --print-build-logs";
+            args = [ ".#checks.${system}.plugins-by-name" ];
+            pass_filenames = false;
+          };
         };
       };
     };
diff --git a/flake-modules/tests.nix b/flake-modules/tests.nix
index bf80e78c76..12b3f9900c 100644
--- a/flake-modules/tests.nix
+++ b/flake-modules/tests.nix
@@ -45,6 +45,8 @@
 
         maintainers = import ../tests/maintainers.nix { inherit pkgs; };
 
+        plugins-by-name = pkgs.callPackage ../tests/plugins-by-name.nix { inherit evaluatedNixvim; };
+
         generated = pkgs.callPackage ../tests/generated.nix { };
 
         package-options = pkgs.callPackage ../tests/package-options.nix { inherit evaluatedNixvim; };
diff --git a/modules/plugins.nix b/modules/plugins.nix
index 5c864b3a59..a0d0a67427 100644
--- a/modules/plugins.nix
+++ b/modules/plugins.nix
@@ -1,4 +1,15 @@
-{ ... }:
+{ lib, ... }:
+let
+  inherit (builtins) readDir;
+  inherit (lib.attrsets) foldlAttrs;
+  inherit (lib.lists) optional;
+  by-name = ../plugins/by-name;
+in
 {
-  imports = [ ../plugins/default.nix ];
+  imports =
+    [ ../plugins ]
+    ++ foldlAttrs (
+      prev: name: type:
+      prev ++ optional (type == "directory") (by-name + "/${name}")
+    ) [ ] (readDir by-name);
 }
diff --git a/plugins/statuslines/airline.nix b/plugins/by-name/airline/default.nix
similarity index 100%
rename from plugins/statuslines/airline.nix
rename to plugins/by-name/airline/default.nix
diff --git a/plugins/utils/alpha.nix b/plugins/by-name/alpha/default.nix
similarity index 100%
rename from plugins/utils/alpha.nix
rename to plugins/by-name/alpha/default.nix
diff --git a/plugins/utils/arrow.nix b/plugins/by-name/arrow/default.nix
similarity index 100%
rename from plugins/utils/arrow.nix
rename to plugins/by-name/arrow/default.nix
diff --git a/plugins/utils/auto-save.nix b/plugins/by-name/auto-save/default.nix
similarity index 100%
rename from plugins/utils/auto-save.nix
rename to plugins/by-name/auto-save/default.nix
diff --git a/plugins/utils/auto-session.nix b/plugins/by-name/auto-session/default.nix
similarity index 100%
rename from plugins/utils/auto-session.nix
rename to plugins/by-name/auto-session/default.nix
diff --git a/plugins/utils/autoclose.nix b/plugins/by-name/autoclose/default.nix
similarity index 100%
rename from plugins/utils/autoclose.nix
rename to plugins/by-name/autoclose/default.nix
diff --git a/plugins/utils/autosource.nix b/plugins/by-name/autosource/default.nix
similarity index 100%
rename from plugins/utils/autosource.nix
rename to plugins/by-name/autosource/default.nix
diff --git a/plugins/utils/bacon.nix b/plugins/by-name/bacon/default.nix
similarity index 100%
rename from plugins/utils/bacon.nix
rename to plugins/by-name/bacon/default.nix
diff --git a/plugins/utils/baleia.nix b/plugins/by-name/baleia/default.nix
similarity index 100%
rename from plugins/utils/baleia.nix
rename to plugins/by-name/baleia/default.nix
diff --git a/plugins/bufferlines/barbar.nix b/plugins/by-name/barbar/default.nix
similarity index 100%
rename from plugins/bufferlines/barbar.nix
rename to plugins/by-name/barbar/default.nix
diff --git a/plugins/bufferlines/barbecue.nix b/plugins/by-name/barbecue/default.nix
similarity index 100%
rename from plugins/bufferlines/barbecue.nix
rename to plugins/by-name/barbecue/default.nix
diff --git a/plugins/utils/better-escape.nix b/plugins/by-name/better-escape/default.nix
similarity index 100%
rename from plugins/utils/better-escape.nix
rename to plugins/by-name/better-escape/default.nix
diff --git a/plugins/utils/bufdelete.nix b/plugins/by-name/bufdelete/default.nix
similarity index 100%
rename from plugins/utils/bufdelete.nix
rename to plugins/by-name/bufdelete/default.nix
diff --git a/plugins/bufferlines/bufferline.nix b/plugins/by-name/bufferline/default.nix
similarity index 100%
rename from plugins/bufferlines/bufferline.nix
rename to plugins/by-name/bufferline/default.nix
diff --git a/plugins/utils/ccc.nix b/plugins/by-name/ccc/default.nix
similarity index 100%
rename from plugins/utils/ccc.nix
rename to plugins/by-name/ccc/default.nix
diff --git a/plugins/filetrees/chadtree.nix b/plugins/by-name/chadtree/default.nix
similarity index 100%
rename from plugins/filetrees/chadtree.nix
rename to plugins/by-name/chadtree/default.nix
diff --git a/plugins/ai/chatgpt.nix b/plugins/by-name/chatgpt/default.nix
similarity index 100%
rename from plugins/ai/chatgpt.nix
rename to plugins/by-name/chatgpt/default.nix
diff --git a/plugins/utils/clipboard-image.nix b/plugins/by-name/clipboard-image/default.nix
similarity index 100%
rename from plugins/utils/clipboard-image.nix
rename to plugins/by-name/clipboard-image/default.nix
diff --git a/plugins/utils/cloak.nix b/plugins/by-name/cloak/default.nix
similarity index 100%
rename from plugins/utils/cloak.nix
rename to plugins/by-name/cloak/default.nix
diff --git a/plugins/completion/codeium-nvim.nix b/plugins/by-name/codeium-nvim/default.nix
similarity index 100%
rename from plugins/completion/codeium-nvim.nix
rename to plugins/by-name/codeium-nvim/default.nix
diff --git a/plugins/completion/codeium-vim.nix b/plugins/by-name/codeium-vim/default.nix
similarity index 100%
rename from plugins/completion/codeium-vim.nix
rename to plugins/by-name/codeium-vim/default.nix
diff --git a/plugins/utils/codesnap.nix b/plugins/by-name/codesnap/default.nix
similarity index 100%
rename from plugins/utils/codesnap.nix
rename to plugins/by-name/codesnap/default.nix
diff --git a/plugins/utils/comment-box.nix b/plugins/by-name/comment-box/default.nix
similarity index 100%
rename from plugins/utils/comment-box.nix
rename to plugins/by-name/comment-box/default.nix
diff --git a/plugins/utils/comment.nix b/plugins/by-name/comment/default.nix
similarity index 100%
rename from plugins/utils/comment.nix
rename to plugins/by-name/comment/default.nix
diff --git a/plugins/utils/commentary.nix b/plugins/by-name/commentary/default.nix
similarity index 100%
rename from plugins/utils/commentary.nix
rename to plugins/by-name/commentary/default.nix
diff --git a/plugins/git/committia.nix b/plugins/by-name/committia/default.nix
similarity index 100%
rename from plugins/git/committia.nix
rename to plugins/by-name/committia/default.nix
diff --git a/plugins/utils/competitest.nix b/plugins/by-name/competitest/default.nix
similarity index 100%
rename from plugins/utils/competitest.nix
rename to plugins/by-name/competitest/default.nix
diff --git a/plugins/lsp/conform-nvim.nix b/plugins/by-name/conform-nvim/default.nix
similarity index 100%
rename from plugins/lsp/conform-nvim.nix
rename to plugins/by-name/conform-nvim/default.nix
diff --git a/plugins/utils/conjure.nix b/plugins/by-name/conjure/default.nix
similarity index 100%
rename from plugins/utils/conjure.nix
rename to plugins/by-name/conjure/default.nix
diff --git a/plugins/ai/copilot-chat.nix b/plugins/by-name/copilot-chat/default.nix
similarity index 100%
rename from plugins/ai/copilot-chat.nix
rename to plugins/by-name/copilot-chat/default.nix
diff --git a/plugins/completion/copilot-lua.nix b/plugins/by-name/copilot-lua/default.nix
similarity index 100%
rename from plugins/completion/copilot-lua.nix
rename to plugins/by-name/copilot-lua/default.nix
diff --git a/plugins/completion/copilot-vim.nix b/plugins/by-name/copilot-vim/default.nix
similarity index 100%
rename from plugins/completion/copilot-vim.nix
rename to plugins/by-name/copilot-vim/default.nix
diff --git a/plugins/completion/coq.nix b/plugins/by-name/coq-nvim/default.nix
similarity index 100%
rename from plugins/completion/coq.nix
rename to plugins/by-name/coq-nvim/default.nix
diff --git a/plugins/completion/coq-thirdparty.nix b/plugins/by-name/coq-thirdparty/default.nix
similarity index 100%
rename from plugins/completion/coq-thirdparty.nix
rename to plugins/by-name/coq-thirdparty/default.nix
diff --git a/plugins/utils/coverage.nix b/plugins/by-name/coverage/default.nix
similarity index 100%
rename from plugins/utils/coverage.nix
rename to plugins/by-name/coverage/default.nix
diff --git a/plugins/utils/cursorline.nix b/plugins/by-name/cursorline/default.nix
similarity index 100%
rename from plugins/utils/cursorline.nix
rename to plugins/by-name/cursorline/default.nix
diff --git a/plugins/dap/dap-go.nix b/plugins/by-name/dap/dap-go.nix
similarity index 100%
rename from plugins/dap/dap-go.nix
rename to plugins/by-name/dap/dap-go.nix
diff --git a/plugins/dap/dap-python.nix b/plugins/by-name/dap/dap-python.nix
similarity index 100%
rename from plugins/dap/dap-python.nix
rename to plugins/by-name/dap/dap-python.nix
diff --git a/plugins/dap/dap-ui.nix b/plugins/by-name/dap/dap-ui.nix
similarity index 100%
rename from plugins/dap/dap-ui.nix
rename to plugins/by-name/dap/dap-ui.nix
diff --git a/plugins/dap/dap-virtual-text.nix b/plugins/by-name/dap/dap-virtual-text.nix
similarity index 100%
rename from plugins/dap/dap-virtual-text.nix
rename to plugins/by-name/dap/dap-virtual-text.nix
diff --git a/plugins/dap/dapHelpers.nix b/plugins/by-name/dap/dapHelpers.nix
similarity index 100%
rename from plugins/dap/dapHelpers.nix
rename to plugins/by-name/dap/dapHelpers.nix
diff --git a/plugins/dap/default.nix b/plugins/by-name/dap/default.nix
similarity index 100%
rename from plugins/dap/default.nix
rename to plugins/by-name/dap/default.nix
diff --git a/plugins/utils/dashboard.nix b/plugins/by-name/dashboard/default.nix
similarity index 100%
rename from plugins/utils/dashboard.nix
rename to plugins/by-name/dashboard/default.nix
diff --git a/plugins/git/diffview.nix b/plugins/by-name/diffview/default.nix
similarity index 100%
rename from plugins/git/diffview.nix
rename to plugins/by-name/diffview/default.nix
diff --git a/plugins/utils/direnv.nix b/plugins/by-name/direnv/default.nix
similarity index 100%
rename from plugins/utils/direnv.nix
rename to plugins/by-name/direnv/default.nix
diff --git a/plugins/utils/dressing.nix b/plugins/by-name/dressing/default.nix
similarity index 100%
rename from plugins/utils/dressing.nix
rename to plugins/by-name/dressing/default.nix
diff --git a/plugins/utils/easyescape.nix b/plugins/by-name/easyescape/default.nix
similarity index 100%
rename from plugins/utils/easyescape.nix
rename to plugins/by-name/easyescape/default.nix
diff --git a/plugins/ui/edgy.nix b/plugins/by-name/edgy/default.nix
similarity index 100%
rename from plugins/ui/edgy.nix
rename to plugins/by-name/edgy/default.nix
diff --git a/plugins/utils/emmet.nix b/plugins/by-name/emmet/default.nix
similarity index 100%
rename from plugins/utils/emmet.nix
rename to plugins/by-name/emmet/default.nix
diff --git a/plugins/utils/endwise.nix b/plugins/by-name/endwise/default.nix
similarity index 100%
rename from plugins/utils/endwise.nix
rename to plugins/by-name/endwise/default.nix
diff --git a/plugins/lsp/fidget.nix b/plugins/by-name/fidget/default.nix
similarity index 100%
rename from plugins/lsp/fidget.nix
rename to plugins/by-name/fidget/default.nix
diff --git a/plugins/utils/firenvim.nix b/plugins/by-name/firenvim/default.nix
similarity index 100%
rename from plugins/utils/firenvim.nix
rename to plugins/by-name/firenvim/default.nix
diff --git a/plugins/utils/flash.nix b/plugins/by-name/flash/default.nix
similarity index 100%
rename from plugins/utils/flash.nix
rename to plugins/by-name/flash/default.nix
diff --git a/plugins/utils/floaterm.nix b/plugins/by-name/floaterm/default.nix
similarity index 100%
rename from plugins/utils/floaterm.nix
rename to plugins/by-name/floaterm/default.nix
diff --git a/plugins/snippets/friendly-snippets.nix b/plugins/by-name/friendly-snippets/default.nix
similarity index 100%
rename from plugins/snippets/friendly-snippets.nix
rename to plugins/by-name/friendly-snippets/default.nix
diff --git a/plugins/git/fugitive.nix b/plugins/by-name/fugitive/default.nix
similarity index 100%
rename from plugins/git/fugitive.nix
rename to plugins/by-name/fugitive/default.nix
diff --git a/plugins/utils/fzf-lua.nix b/plugins/by-name/fzf-lua/default.nix
similarity index 100%
rename from plugins/utils/fzf-lua.nix
rename to plugins/by-name/fzf-lua/default.nix
diff --git a/plugins/git/git-conflict.nix b/plugins/by-name/git-conflict/default.nix
similarity index 100%
rename from plugins/git/git-conflict.nix
rename to plugins/by-name/git-conflict/default.nix
diff --git a/plugins/git/git-worktree.nix b/plugins/by-name/git-worktree/default.nix
similarity index 100%
rename from plugins/git/git-worktree.nix
rename to plugins/by-name/git-worktree/default.nix
diff --git a/plugins/git/gitblame.nix b/plugins/by-name/gitblame/default.nix
similarity index 100%
rename from plugins/git/gitblame.nix
rename to plugins/by-name/gitblame/default.nix
diff --git a/plugins/git/gitgutter.nix b/plugins/by-name/gitgutter/default.nix
similarity index 100%
rename from plugins/git/gitgutter.nix
rename to plugins/by-name/gitgutter/default.nix
diff --git a/plugins/git/gitignore.nix b/plugins/by-name/gitignore/default.nix
similarity index 100%
rename from plugins/git/gitignore.nix
rename to plugins/by-name/gitignore/default.nix
diff --git a/plugins/git/gitlinker.nix b/plugins/by-name/gitlinker/default.nix
similarity index 100%
rename from plugins/git/gitlinker.nix
rename to plugins/by-name/gitlinker/default.nix
diff --git a/plugins/git/gitmessenger.nix b/plugins/by-name/gitmessenger/default.nix
similarity index 100%
rename from plugins/git/gitmessenger.nix
rename to plugins/by-name/gitmessenger/default.nix
diff --git a/plugins/git/gitsigns/default.nix b/plugins/by-name/gitsigns/default.nix
similarity index 100%
rename from plugins/git/gitsigns/default.nix
rename to plugins/by-name/gitsigns/default.nix
diff --git a/plugins/git/gitsigns/options.nix b/plugins/by-name/gitsigns/options.nix
similarity index 100%
rename from plugins/git/gitsigns/options.nix
rename to plugins/by-name/gitsigns/options.nix
diff --git a/plugins/utils/goyo.nix b/plugins/by-name/goyo/default.nix
similarity index 100%
rename from plugins/utils/goyo.nix
rename to plugins/by-name/goyo/default.nix
diff --git a/plugins/utils/guess-indent.nix b/plugins/by-name/guess-indent/default.nix
similarity index 100%
rename from plugins/utils/guess-indent.nix
rename to plugins/by-name/guess-indent/default.nix
diff --git a/plugins/utils/hardtime.nix b/plugins/by-name/hardtime/default.nix
similarity index 100%
rename from plugins/utils/hardtime.nix
rename to plugins/by-name/hardtime/default.nix
diff --git a/plugins/utils/harpoon.nix b/plugins/by-name/harpoon/default.nix
similarity index 100%
rename from plugins/utils/harpoon.nix
rename to plugins/by-name/harpoon/default.nix
diff --git a/plugins/ui/headlines.nix b/plugins/by-name/headlines/default.nix
similarity index 100%
rename from plugins/ui/headlines.nix
rename to plugins/by-name/headlines/default.nix
diff --git a/plugins/languages/treesitter/hmts.nix b/plugins/by-name/hmts/default.nix
similarity index 100%
rename from plugins/languages/treesitter/hmts.nix
rename to plugins/by-name/hmts/default.nix
diff --git a/plugins/utils/hop.nix b/plugins/by-name/hop/default.nix
similarity index 100%
rename from plugins/utils/hop.nix
rename to plugins/by-name/hop/default.nix
diff --git a/plugins/utils/hydra/default.nix b/plugins/by-name/hydra/default.nix
similarity index 92%
rename from plugins/utils/hydra/default.nix
rename to plugins/by-name/hydra/default.nix
index 7a4a04b861..bb2f26bbf4 100644
--- a/plugins/utils/hydra/default.nix
+++ b/plugins/by-name/hydra/default.nix
@@ -16,7 +16,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
     hydras = import ./hydras-option.nix { inherit lib helpers; };
   };
 
-  settingsOptions = import ./hydra-config-opts.nix { inherit lib helpers; };
+  settingsOptions = import ./settings-options.nix { inherit lib helpers; };
 
   settingsExample = {
     exit = false;
diff --git a/plugins/utils/hydra/hydras-option.nix b/plugins/by-name/hydra/hydras-option.nix
similarity index 99%
rename from plugins/utils/hydra/hydras-option.nix
rename to plugins/by-name/hydra/hydras-option.nix
index 13e9372d03..487ed2c91a 100644
--- a/plugins/utils/hydra/hydras-option.nix
+++ b/plugins/by-name/hydra/hydras-option.nix
@@ -26,7 +26,7 @@ let
         for more information.
       '';
 
-      config = import ./hydra-config-opts.nix { inherit lib helpers; };
+      config = import ./settings-options.nix { inherit lib helpers; };
 
       heads =
         let
diff --git a/plugins/utils/hydra/hydra-config-opts.nix b/plugins/by-name/hydra/settings-options.nix
similarity index 100%
rename from plugins/utils/hydra/hydra-config-opts.nix
rename to plugins/by-name/hydra/settings-options.nix
diff --git a/plugins/utils/illuminate.nix b/plugins/by-name/illuminate/default.nix
similarity index 100%
rename from plugins/utils/illuminate.nix
rename to plugins/by-name/illuminate/default.nix
diff --git a/plugins/ui/image.nix b/plugins/by-name/image/default.nix
similarity index 100%
rename from plugins/ui/image.nix
rename to plugins/by-name/image/default.nix
diff --git a/plugins/utils/improved-search.nix b/plugins/by-name/improved-search/default.nix
similarity index 100%
rename from plugins/utils/improved-search.nix
rename to plugins/by-name/improved-search/default.nix
diff --git a/plugins/lsp/inc-rename.nix b/plugins/by-name/inc-rename/default.nix
similarity index 100%
rename from plugins/lsp/inc-rename.nix
rename to plugins/by-name/inc-rename/default.nix
diff --git a/plugins/utils/indent-blankline.nix b/plugins/by-name/indent-blankline/default.nix
similarity index 100%
rename from plugins/utils/indent-blankline.nix
rename to plugins/by-name/indent-blankline/default.nix
diff --git a/plugins/utils/indent-o-matic.nix b/plugins/by-name/indent-o-matic/default.nix
similarity index 100%
rename from plugins/utils/indent-o-matic.nix
rename to plugins/by-name/indent-o-matic/default.nix
diff --git a/plugins/utils/instant.nix b/plugins/by-name/instant/default.nix
similarity index 100%
rename from plugins/utils/instant.nix
rename to plugins/by-name/instant/default.nix
diff --git a/plugins/utils/intellitab.nix b/plugins/by-name/intellitab/default.nix
similarity index 100%
rename from plugins/utils/intellitab.nix
rename to plugins/by-name/intellitab/default.nix
diff --git a/plugins/utils/lastplace.nix b/plugins/by-name/lastplace/default.nix
similarity index 100%
rename from plugins/utils/lastplace.nix
rename to plugins/by-name/lastplace/default.nix
diff --git a/plugins/git/lazygit.nix b/plugins/by-name/lazygit/default.nix
similarity index 100%
rename from plugins/git/lazygit.nix
rename to plugins/by-name/lazygit/default.nix
diff --git a/plugins/utils/leap.nix b/plugins/by-name/leap/default.nix
similarity index 100%
rename from plugins/utils/leap.nix
rename to plugins/by-name/leap/default.nix
diff --git a/plugins/statuslines/lightline.nix b/plugins/by-name/lightline/default.nix
similarity index 100%
rename from plugins/statuslines/lightline.nix
rename to plugins/by-name/lightline/default.nix
diff --git a/plugins/lsp/lsp-format.nix b/plugins/by-name/lsp-format/default.nix
similarity index 100%
rename from plugins/lsp/lsp-format.nix
rename to plugins/by-name/lsp-format/default.nix
diff --git a/plugins/lsp/lsp-lines.nix b/plugins/by-name/lsp-lines/default.nix
similarity index 100%
rename from plugins/lsp/lsp-lines.nix
rename to plugins/by-name/lsp-lines/default.nix
diff --git a/plugins/lsp/lsp-status.nix b/plugins/by-name/lsp-status/default.nix
similarity index 100%
rename from plugins/lsp/lsp-status.nix
rename to plugins/by-name/lsp-status/default.nix
diff --git a/plugins/completion/lspkind.nix b/plugins/by-name/lspkind/default.nix
similarity index 100%
rename from plugins/completion/lspkind.nix
rename to plugins/by-name/lspkind/default.nix
diff --git a/plugins/lsp/lspsaga.nix b/plugins/by-name/lspsaga/default.nix
similarity index 100%
rename from plugins/lsp/lspsaga.nix
rename to plugins/by-name/lspsaga/default.nix
diff --git a/plugins/statuslines/lualine.nix b/plugins/by-name/lualine/default.nix
similarity index 100%
rename from plugins/statuslines/lualine.nix
rename to plugins/by-name/lualine/default.nix
diff --git a/plugins/snippets/luasnip/default.nix b/plugins/by-name/luasnip/default.nix
similarity index 100%
rename from plugins/snippets/luasnip/default.nix
rename to plugins/by-name/luasnip/default.nix
diff --git a/plugins/utils/magma-nvim.nix b/plugins/by-name/magma-nvim/default.nix
similarity index 100%
rename from plugins/utils/magma-nvim.nix
rename to plugins/by-name/magma-nvim/default.nix
diff --git a/plugins/utils/mark-radar.nix b/plugins/by-name/mark-radar/default.nix
similarity index 100%
rename from plugins/utils/mark-radar.nix
rename to plugins/by-name/mark-radar/default.nix
diff --git a/plugins/utils/marks.nix b/plugins/by-name/marks/default.nix
similarity index 100%
rename from plugins/utils/marks.nix
rename to plugins/by-name/marks/default.nix
diff --git a/plugins/utils/mini.nix b/plugins/by-name/mini/default.nix
similarity index 100%
rename from plugins/utils/mini.nix
rename to plugins/by-name/mini/default.nix
diff --git a/plugins/utils/mkdnflow.nix b/plugins/by-name/mkdnflow/default.nix
similarity index 100%
rename from plugins/utils/mkdnflow.nix
rename to plugins/by-name/mkdnflow/default.nix
diff --git a/plugins/utils/molten.nix b/plugins/by-name/molten/default.nix
similarity index 100%
rename from plugins/utils/molten.nix
rename to plugins/by-name/molten/default.nix
diff --git a/plugins/utils/multicursors.nix b/plugins/by-name/multicursors/default.nix
similarity index 100%
rename from plugins/utils/multicursors.nix
rename to plugins/by-name/multicursors/default.nix
diff --git a/plugins/utils/navbuddy.nix b/plugins/by-name/navbuddy/default.nix
similarity index 100%
rename from plugins/utils/navbuddy.nix
rename to plugins/by-name/navbuddy/default.nix
diff --git a/plugins/bufferlines/navic.nix b/plugins/by-name/navic/default.nix
similarity index 100%
rename from plugins/bufferlines/navic.nix
rename to plugins/by-name/navic/default.nix
diff --git a/plugins/filetrees/neo-tree.nix b/plugins/by-name/neo-tree/default.nix
similarity index 100%
rename from plugins/filetrees/neo-tree.nix
rename to plugins/by-name/neo-tree/default.nix
diff --git a/plugins/utils/neoclip.nix b/plugins/by-name/neoclip/default.nix
similarity index 100%
rename from plugins/utils/neoclip.nix
rename to plugins/by-name/neoclip/default.nix
diff --git a/plugins/utils/neocord.nix b/plugins/by-name/neocord/default.nix
similarity index 100%
rename from plugins/utils/neocord.nix
rename to plugins/by-name/neocord/default.nix
diff --git a/plugins/utils/neogen.nix b/plugins/by-name/neogen/default.nix
similarity index 100%
rename from plugins/utils/neogen.nix
rename to plugins/by-name/neogen/default.nix
diff --git a/plugins/git/neogit/default.nix b/plugins/by-name/neogit/default.nix
similarity index 100%
rename from plugins/git/neogit/default.nix
rename to plugins/by-name/neogit/default.nix
diff --git a/plugins/git/neogit/options.nix b/plugins/by-name/neogit/options.nix
similarity index 100%
rename from plugins/git/neogit/options.nix
rename to plugins/by-name/neogit/options.nix
diff --git a/plugins/utils/neorg.nix b/plugins/by-name/neorg/default.nix
similarity index 100%
rename from plugins/utils/neorg.nix
rename to plugins/by-name/neorg/default.nix
diff --git a/plugins/ui/neoscroll.nix b/plugins/by-name/neoscroll/default.nix
similarity index 100%
rename from plugins/ui/neoscroll.nix
rename to plugins/by-name/neoscroll/default.nix
diff --git a/plugins/utils/netman.nix b/plugins/by-name/netman/default.nix
similarity index 100%
rename from plugins/utils/netman.nix
rename to plugins/by-name/netman/default.nix
diff --git a/plugins/utils/nix-develop.nix b/plugins/by-name/nix-develop/default.nix
similarity index 100%
rename from plugins/utils/nix-develop.nix
rename to plugins/by-name/nix-develop/default.nix
diff --git a/plugins/ui/noice.nix b/plugins/by-name/noice/default.nix
similarity index 100%
rename from plugins/ui/noice.nix
rename to plugins/by-name/noice/default.nix
diff --git a/plugins/utils/notify.nix b/plugins/by-name/notify/default.nix
similarity index 100%
rename from plugins/utils/notify.nix
rename to plugins/by-name/notify/default.nix
diff --git a/plugins/ui/numbertoggle.nix b/plugins/by-name/numbertoggle/default.nix
similarity index 100%
rename from plugins/ui/numbertoggle.nix
rename to plugins/by-name/numbertoggle/default.nix
diff --git a/plugins/utils/nvim-autopairs.nix b/plugins/by-name/nvim-autopairs/default.nix
similarity index 100%
rename from plugins/utils/nvim-autopairs.nix
rename to plugins/by-name/nvim-autopairs/default.nix
diff --git a/plugins/utils/nvim-bqf.nix b/plugins/by-name/nvim-bqf/default.nix
similarity index 100%
rename from plugins/utils/nvim-bqf.nix
rename to plugins/by-name/nvim-bqf/default.nix
diff --git a/plugins/utils/nvim-colorizer.nix b/plugins/by-name/nvim-colorizer/default.nix
similarity index 100%
rename from plugins/utils/nvim-colorizer.nix
rename to plugins/by-name/nvim-colorizer/default.nix
diff --git a/plugins/lsp/nvim-lightbulb.nix b/plugins/by-name/nvim-lightbulb/default.nix
similarity index 100%
rename from plugins/lsp/nvim-lightbulb.nix
rename to plugins/by-name/nvim-lightbulb/default.nix
diff --git a/plugins/utils/nvim-osc52.nix b/plugins/by-name/nvim-osc52/default.nix
similarity index 100%
rename from plugins/utils/nvim-osc52.nix
rename to plugins/by-name/nvim-osc52/default.nix
diff --git a/plugins/snippets/nvim-snippets.nix b/plugins/by-name/nvim-snippets/default.nix
similarity index 100%
rename from plugins/snippets/nvim-snippets.nix
rename to plugins/by-name/nvim-snippets/default.nix
diff --git a/plugins/filetrees/nvim-tree.nix b/plugins/by-name/nvim-tree/default.nix
similarity index 100%
rename from plugins/filetrees/nvim-tree.nix
rename to plugins/by-name/nvim-tree/default.nix
diff --git a/plugins/utils/nvim-ufo.nix b/plugins/by-name/nvim-ufo/default.nix
similarity index 100%
rename from plugins/utils/nvim-ufo.nix
rename to plugins/by-name/nvim-ufo/default.nix
diff --git a/plugins/utils/obsidian/default.nix b/plugins/by-name/obsidian/default.nix
similarity index 100%
rename from plugins/utils/obsidian/default.nix
rename to plugins/by-name/obsidian/default.nix
diff --git a/plugins/utils/obsidian/options.nix b/plugins/by-name/obsidian/options.nix
similarity index 100%
rename from plugins/utils/obsidian/options.nix
rename to plugins/by-name/obsidian/options.nix
diff --git a/plugins/git/octo.nix b/plugins/by-name/octo/default.nix
similarity index 100%
rename from plugins/git/octo.nix
rename to plugins/by-name/octo/default.nix
diff --git a/plugins/utils/oil.nix b/plugins/by-name/oil/default.nix
similarity index 100%
rename from plugins/utils/oil.nix
rename to plugins/by-name/oil/default.nix
diff --git a/plugins/utils/ollama.nix b/plugins/by-name/ollama/default.nix
similarity index 100%
rename from plugins/utils/ollama.nix
rename to plugins/by-name/ollama/default.nix
diff --git a/plugins/utils/persistence.nix b/plugins/by-name/persistence/default.nix
similarity index 100%
rename from plugins/utils/persistence.nix
rename to plugins/by-name/persistence/default.nix
diff --git a/plugins/utils/presence-nvim.nix b/plugins/by-name/presence-nvim/default.nix
similarity index 100%
rename from plugins/utils/presence-nvim.nix
rename to plugins/by-name/presence-nvim/default.nix
diff --git a/plugins/utils/project-nvim.nix b/plugins/by-name/project-nvim/default.nix
similarity index 100%
rename from plugins/utils/project-nvim.nix
rename to plugins/by-name/project-nvim/default.nix
diff --git a/plugins/utils/quickmath.nix b/plugins/by-name/quickmath/default.nix
similarity index 100%
rename from plugins/utils/quickmath.nix
rename to plugins/by-name/quickmath/default.nix
diff --git a/plugins/languages/treesitter/rainbow-delimiters.nix b/plugins/by-name/rainbow-delimiters/default.nix
similarity index 100%
rename from plugins/languages/treesitter/rainbow-delimiters.nix
rename to plugins/by-name/rainbow-delimiters/default.nix
diff --git a/plugins/utils/refactoring.nix b/plugins/by-name/refactoring/default.nix
similarity index 100%
rename from plugins/utils/refactoring.nix
rename to plugins/by-name/refactoring/default.nix
diff --git a/plugins/utils/repeat.nix b/plugins/by-name/repeat/default.nix
similarity index 100%
rename from plugins/utils/repeat.nix
rename to plugins/by-name/repeat/default.nix
diff --git a/plugins/utils/rest.nix b/plugins/by-name/rest/default.nix
similarity index 100%
rename from plugins/utils/rest.nix
rename to plugins/by-name/rest/default.nix
diff --git a/plugins/utils/sandwich.nix b/plugins/by-name/sandwich/default.nix
similarity index 100%
rename from plugins/utils/sandwich.nix
rename to plugins/by-name/sandwich/default.nix
diff --git a/plugins/lsp/schemastore.nix b/plugins/by-name/schemastore/default.nix
similarity index 100%
rename from plugins/lsp/schemastore.nix
rename to plugins/by-name/schemastore/default.nix
diff --git a/plugins/utils/scope.nix b/plugins/by-name/scope/default.nix
similarity index 100%
rename from plugins/utils/scope.nix
rename to plugins/by-name/scope/default.nix
diff --git a/plugins/utils/sleuth.nix b/plugins/by-name/sleuth/default.nix
similarity index 100%
rename from plugins/utils/sleuth.nix
rename to plugins/by-name/sleuth/default.nix
diff --git a/plugins/utils/smart-splits.nix b/plugins/by-name/smart-splits/default.nix
similarity index 100%
rename from plugins/utils/smart-splits.nix
rename to plugins/by-name/smart-splits/default.nix
diff --git a/plugins/ui/specs.nix b/plugins/by-name/specs/default.nix
similarity index 100%
rename from plugins/ui/specs.nix
rename to plugins/by-name/specs/default.nix
diff --git a/plugins/utils/spectre.nix b/plugins/by-name/spectre/default.nix
similarity index 100%
rename from plugins/utils/spectre.nix
rename to plugins/by-name/spectre/default.nix
diff --git a/plugins/utils/spider.nix b/plugins/by-name/spider/default.nix
similarity index 100%
rename from plugins/utils/spider.nix
rename to plugins/by-name/spider/default.nix
diff --git a/plugins/utils/startify/default.nix b/plugins/by-name/startify/default.nix
similarity index 100%
rename from plugins/utils/startify/default.nix
rename to plugins/by-name/startify/default.nix
diff --git a/plugins/utils/startify/options.nix b/plugins/by-name/startify/options.nix
similarity index 100%
rename from plugins/utils/startify/options.nix
rename to plugins/by-name/startify/options.nix
diff --git a/plugins/utils/startup.nix b/plugins/by-name/startup/default.nix
similarity index 100%
rename from plugins/utils/startup.nix
rename to plugins/by-name/startup/default.nix
diff --git a/plugins/ui/statuscol.nix b/plugins/by-name/statuscol/default.nix
similarity index 100%
rename from plugins/ui/statuscol.nix
rename to plugins/by-name/statuscol/default.nix
diff --git a/plugins/utils/surround.nix b/plugins/by-name/surround/default.nix
similarity index 100%
rename from plugins/utils/surround.nix
rename to plugins/by-name/surround/default.nix
diff --git a/plugins/telescope/default.nix b/plugins/by-name/telescope/default.nix
similarity index 100%
rename from plugins/telescope/default.nix
rename to plugins/by-name/telescope/default.nix
diff --git a/plugins/telescope/extensions/_helpers.nix b/plugins/by-name/telescope/extensions/_helpers.nix
similarity index 100%
rename from plugins/telescope/extensions/_helpers.nix
rename to plugins/by-name/telescope/extensions/_helpers.nix
diff --git a/plugins/telescope/extensions/default.nix b/plugins/by-name/telescope/extensions/default.nix
similarity index 100%
rename from plugins/telescope/extensions/default.nix
rename to plugins/by-name/telescope/extensions/default.nix
diff --git a/plugins/telescope/extensions/file-browser.nix b/plugins/by-name/telescope/extensions/file-browser.nix
similarity index 100%
rename from plugins/telescope/extensions/file-browser.nix
rename to plugins/by-name/telescope/extensions/file-browser.nix
diff --git a/plugins/telescope/extensions/frecency.nix b/plugins/by-name/telescope/extensions/frecency.nix
similarity index 100%
rename from plugins/telescope/extensions/frecency.nix
rename to plugins/by-name/telescope/extensions/frecency.nix
diff --git a/plugins/telescope/extensions/fzf-native.nix b/plugins/by-name/telescope/extensions/fzf-native.nix
similarity index 100%
rename from plugins/telescope/extensions/fzf-native.nix
rename to plugins/by-name/telescope/extensions/fzf-native.nix
diff --git a/plugins/telescope/extensions/fzy-native.nix b/plugins/by-name/telescope/extensions/fzy-native.nix
similarity index 100%
rename from plugins/telescope/extensions/fzy-native.nix
rename to plugins/by-name/telescope/extensions/fzy-native.nix
diff --git a/plugins/telescope/extensions/media-files.nix b/plugins/by-name/telescope/extensions/media-files.nix
similarity index 100%
rename from plugins/telescope/extensions/media-files.nix
rename to plugins/by-name/telescope/extensions/media-files.nix
diff --git a/plugins/telescope/extensions/ui-select.nix b/plugins/by-name/telescope/extensions/ui-select.nix
similarity index 100%
rename from plugins/telescope/extensions/ui-select.nix
rename to plugins/by-name/telescope/extensions/ui-select.nix
diff --git a/plugins/telescope/extensions/undo.nix b/plugins/by-name/telescope/extensions/undo.nix
similarity index 100%
rename from plugins/telescope/extensions/undo.nix
rename to plugins/by-name/telescope/extensions/undo.nix
diff --git a/plugins/utils/tmux-navigator.nix b/plugins/by-name/tmux-navigator/default.nix
similarity index 100%
rename from plugins/utils/tmux-navigator.nix
rename to plugins/by-name/tmux-navigator/default.nix
diff --git a/plugins/utils/todo-comments.nix b/plugins/by-name/todo-comments/default.nix
similarity index 100%
rename from plugins/utils/todo-comments.nix
rename to plugins/by-name/todo-comments/default.nix
diff --git a/plugins/utils/toggleterm.nix b/plugins/by-name/toggleterm/default.nix
similarity index 100%
rename from plugins/utils/toggleterm.nix
rename to plugins/by-name/toggleterm/default.nix
diff --git a/plugins/ui/transparent.nix b/plugins/by-name/transparent/default.nix
similarity index 100%
rename from plugins/ui/transparent.nix
rename to plugins/by-name/transparent/default.nix
diff --git a/plugins/languages/treesitter/treesitter-context.nix b/plugins/by-name/treesitter-context/default.nix
similarity index 100%
rename from plugins/languages/treesitter/treesitter-context.nix
rename to plugins/by-name/treesitter-context/default.nix
diff --git a/plugins/languages/treesitter/treesitter-refactor.nix b/plugins/by-name/treesitter-refactor/default.nix
similarity index 100%
rename from plugins/languages/treesitter/treesitter-refactor.nix
rename to plugins/by-name/treesitter-refactor/default.nix
diff --git a/plugins/languages/treesitter/treesitter-textobjects.nix b/plugins/by-name/treesitter-textobjects/default.nix
similarity index 100%
rename from plugins/languages/treesitter/treesitter-textobjects.nix
rename to plugins/by-name/treesitter-textobjects/default.nix
diff --git a/plugins/languages/treesitter/treesitter.nix b/plugins/by-name/treesitter/default.nix
similarity index 100%
rename from plugins/languages/treesitter/treesitter.nix
rename to plugins/by-name/treesitter/default.nix
diff --git a/plugins/languages/treesitter/injections.scm b/plugins/by-name/treesitter/injections.scm
similarity index 100%
rename from plugins/languages/treesitter/injections.scm
rename to plugins/by-name/treesitter/injections.scm
diff --git a/plugins/utils/trim.nix b/plugins/by-name/trim/default.nix
similarity index 100%
rename from plugins/utils/trim.nix
rename to plugins/by-name/trim/default.nix
diff --git a/plugins/lsp/trouble.nix b/plugins/by-name/trouble/default.nix
similarity index 100%
rename from plugins/lsp/trouble.nix
rename to plugins/by-name/trouble/default.nix
diff --git a/plugins/languages/treesitter/ts-autotag.nix b/plugins/by-name/ts-autotag/default.nix
similarity index 100%
rename from plugins/languages/treesitter/ts-autotag.nix
rename to plugins/by-name/ts-autotag/default.nix
diff --git a/plugins/languages/treesitter/ts-context-commentstring.nix b/plugins/by-name/ts-context-commentstring/default.nix
similarity index 100%
rename from plugins/languages/treesitter/ts-context-commentstring.nix
rename to plugins/by-name/ts-context-commentstring/default.nix
diff --git a/plugins/ui/twilight.nix b/plugins/by-name/twilight/default.nix
similarity index 100%
rename from plugins/ui/twilight.nix
rename to plugins/by-name/twilight/default.nix
diff --git a/plugins/utils/undotree.nix b/plugins/by-name/undotree/default.nix
similarity index 100%
rename from plugins/utils/undotree.nix
rename to plugins/by-name/undotree/default.nix
diff --git a/plugins/utils/vim-bbye.nix b/plugins/by-name/vim-bbye/default.nix
similarity index 100%
rename from plugins/utils/vim-bbye.nix
rename to plugins/by-name/vim-bbye/default.nix
diff --git a/plugins/utils/vim-css-color.nix b/plugins/by-name/vim-css-color/default.nix
similarity index 100%
rename from plugins/utils/vim-css-color.nix
rename to plugins/by-name/vim-css-color/default.nix
diff --git a/plugins/utils/vim-matchup.nix b/plugins/by-name/vim-matchup/default.nix
similarity index 100%
rename from plugins/utils/vim-matchup.nix
rename to plugins/by-name/vim-matchup/default.nix
diff --git a/plugins/ui/virt-column.nix b/plugins/by-name/virt-column/default.nix
similarity index 100%
rename from plugins/ui/virt-column.nix
rename to plugins/by-name/virt-column/default.nix
diff --git a/plugins/utils/wakatime.nix b/plugins/by-name/wakatime/default.nix
similarity index 100%
rename from plugins/utils/wakatime.nix
rename to plugins/by-name/wakatime/default.nix
diff --git a/plugins/utils/web-devicons.nix b/plugins/by-name/web-devicons/default.nix
similarity index 100%
rename from plugins/utils/web-devicons.nix
rename to plugins/by-name/web-devicons/default.nix
diff --git a/plugins/utils/which-key.nix b/plugins/by-name/which-key/default.nix
similarity index 100%
rename from plugins/utils/which-key.nix
rename to plugins/by-name/which-key/default.nix
diff --git a/plugins/utils/wilder.nix b/plugins/by-name/wilder/default.nix
similarity index 100%
rename from plugins/utils/wilder.nix
rename to plugins/by-name/wilder/default.nix
diff --git a/plugins/lsp/wtf.nix b/plugins/by-name/wtf/default.nix
similarity index 100%
rename from plugins/lsp/wtf.nix
rename to plugins/by-name/wtf/default.nix
diff --git a/plugins/utils/yanky.nix b/plugins/by-name/yanky/default.nix
similarity index 100%
rename from plugins/utils/yanky.nix
rename to plugins/by-name/yanky/default.nix
diff --git a/plugins/filetrees/yazi.nix b/plugins/by-name/yazi/default.nix
similarity index 100%
rename from plugins/filetrees/yazi.nix
rename to plugins/by-name/yazi/default.nix
diff --git a/plugins/utils/zellij.nix b/plugins/by-name/zellij/default.nix
similarity index 100%
rename from plugins/utils/zellij.nix
rename to plugins/by-name/zellij/default.nix
diff --git a/plugins/ui/zen-mode.nix b/plugins/by-name/zen-mode/default.nix
similarity index 100%
rename from plugins/ui/zen-mode.nix
rename to plugins/by-name/zen-mode/default.nix
diff --git a/plugins/utils/zk.nix b/plugins/by-name/zk/default.nix
similarity index 100%
rename from plugins/utils/zk.nix
rename to plugins/by-name/zk/default.nix
diff --git a/plugins/completion/cmp/auto-enable.nix b/plugins/cmp/auto-enable.nix
similarity index 100%
rename from plugins/completion/cmp/auto-enable.nix
rename to plugins/cmp/auto-enable.nix
diff --git a/plugins/completion/cmp/default.nix b/plugins/cmp/default.nix
similarity index 100%
rename from plugins/completion/cmp/default.nix
rename to plugins/cmp/default.nix
diff --git a/plugins/completion/cmp/deprecations.nix b/plugins/cmp/deprecations.nix
similarity index 100%
rename from plugins/completion/cmp/deprecations.nix
rename to plugins/cmp/deprecations.nix
diff --git a/plugins/completion/cmp/options/default.nix b/plugins/cmp/options/default.nix
similarity index 100%
rename from plugins/completion/cmp/options/default.nix
rename to plugins/cmp/options/default.nix
diff --git a/plugins/completion/cmp/options/settings-options.nix b/plugins/cmp/options/settings-options.nix
similarity index 100%
rename from plugins/completion/cmp/options/settings-options.nix
rename to plugins/cmp/options/settings-options.nix
diff --git a/plugins/completion/cmp/options/sources-option.nix b/plugins/cmp/options/sources-option.nix
similarity index 100%
rename from plugins/completion/cmp/options/sources-option.nix
rename to plugins/cmp/options/sources-option.nix
diff --git a/plugins/completion/cmp/sources/_mk-cmp-plugin.nix b/plugins/cmp/sources/_mk-cmp-plugin.nix
similarity index 100%
rename from plugins/completion/cmp/sources/_mk-cmp-plugin.nix
rename to plugins/cmp/sources/_mk-cmp-plugin.nix
diff --git a/plugins/completion/cmp/sources/cmp-ai.nix b/plugins/cmp/sources/cmp-ai.nix
similarity index 100%
rename from plugins/completion/cmp/sources/cmp-ai.nix
rename to plugins/cmp/sources/cmp-ai.nix
diff --git a/plugins/completion/cmp/sources/cmp-fish.nix b/plugins/cmp/sources/cmp-fish.nix
similarity index 100%
rename from plugins/completion/cmp/sources/cmp-fish.nix
rename to plugins/cmp/sources/cmp-fish.nix
diff --git a/plugins/completion/cmp/sources/cmp-git.nix b/plugins/cmp/sources/cmp-git.nix
similarity index 100%
rename from plugins/completion/cmp/sources/cmp-git.nix
rename to plugins/cmp/sources/cmp-git.nix
diff --git a/plugins/completion/cmp/sources/cmp-tabby.nix b/plugins/cmp/sources/cmp-tabby.nix
similarity index 100%
rename from plugins/completion/cmp/sources/cmp-tabby.nix
rename to plugins/cmp/sources/cmp-tabby.nix
diff --git a/plugins/completion/cmp/sources/cmp-tabnine.nix b/plugins/cmp/sources/cmp-tabnine.nix
similarity index 100%
rename from plugins/completion/cmp/sources/cmp-tabnine.nix
rename to plugins/cmp/sources/cmp-tabnine.nix
diff --git a/plugins/completion/cmp/sources/copilot-cmp.nix b/plugins/cmp/sources/copilot-cmp.nix
similarity index 100%
rename from plugins/completion/cmp/sources/copilot-cmp.nix
rename to plugins/cmp/sources/copilot-cmp.nix
diff --git a/plugins/completion/cmp/sources/crates-nvim.nix b/plugins/cmp/sources/crates-nvim.nix
similarity index 100%
rename from plugins/completion/cmp/sources/crates-nvim.nix
rename to plugins/cmp/sources/crates-nvim.nix
diff --git a/plugins/completion/cmp/sources/default.nix b/plugins/cmp/sources/default.nix
similarity index 100%
rename from plugins/completion/cmp/sources/default.nix
rename to plugins/cmp/sources/default.nix
diff --git a/plugins/default.nix b/plugins/default.nix
index e30a36d4ee..a228ed9372 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -1,12 +1,6 @@
 {
   imports = [
-    ./ai/chatgpt.nix
-    ./ai/copilot-chat.nix
-
-    ./bufferlines/barbar.nix
-    ./bufferlines/barbecue.nix
-    ./bufferlines/bufferline.nix
-    ./bufferlines/navic.nix
+    ./cmp
 
     ./colorschemes/ayu.nix
     ./colorschemes/base16
@@ -30,37 +24,6 @@
     ./colorschemes/tokyonight.nix
     ./colorschemes/vscode.nix
 
-    ./completion/codeium-vim.nix
-    ./completion/codeium-nvim.nix
-    ./completion/copilot-lua.nix
-    ./completion/copilot-vim.nix
-    ./completion/coq.nix
-    ./completion/coq-thirdparty.nix
-    ./completion/lspkind.nix
-    ./completion/cmp
-
-    ./dap
-
-    ./filetrees/chadtree.nix
-    ./filetrees/neo-tree.nix
-    ./filetrees/nvim-tree.nix
-    ./filetrees/yazi.nix
-
-    ./git/committia.nix
-    ./git/diffview.nix
-    ./git/fugitive.nix
-    ./git/git-conflict.nix
-    ./git/git-worktree.nix
-    ./git/gitblame.nix
-    ./git/gitgutter.nix
-    ./git/gitignore.nix
-    ./git/gitlinker.nix
-    ./git/gitmessenger.nix
-    ./git/gitsigns
-    ./git/lazygit.nix
-    ./git/neogit
-    ./git/octo.nix
-
     ./languages/clangd-extensions.nix
     ./languages/cmake-tools.nix
     ./languages/debugprint.nix
@@ -90,14 +53,6 @@
     ./languages/sniprun.nix
     ./languages/tagbar.nix
     ./languages/texpresso.nix
-    ./languages/treesitter/hmts.nix
-    ./languages/treesitter/rainbow-delimiters.nix
-    ./languages/treesitter/treesitter-context.nix
-    ./languages/treesitter/treesitter-refactor.nix
-    ./languages/treesitter/treesitter-textobjects.nix
-    ./languages/treesitter/treesitter.nix
-    ./languages/treesitter/ts-autotag.nix
-    ./languages/treesitter/ts-context-commentstring.nix
     ./languages/typescript-tools.nix
     ./languages/typst/typst-vim.nix
     ./languages/vim-slime.nix
@@ -105,17 +60,6 @@
     ./languages/zig.nix
 
     ./lsp
-    ./lsp/conform-nvim.nix
-    ./lsp/fidget.nix
-    ./lsp/inc-rename.nix
-    ./lsp/lspsaga.nix
-    ./lsp/lsp-format.nix
-    ./lsp/lsp-lines.nix
-    ./lsp/lsp-status.nix
-    ./lsp/nvim-lightbulb.nix
-    ./lsp/schemastore.nix
-    ./lsp/trouble.nix
-    ./lsp/wtf.nix
 
     ./neotest
 
@@ -125,129 +69,6 @@
     ./pluginmanagers/lazy.nix
     ./pluginmanagers/lz-n.nix
 
-    ./snippets/friendly-snippets.nix
-    ./snippets/luasnip
-    ./snippets/nvim-snippets.nix
-
-    ./statuslines/airline.nix
-    ./statuslines/lightline.nix
-    ./statuslines/lualine.nix
-
-    ./telescope
-
-    ./ui/edgy.nix
-    ./ui/headlines.nix
-    ./ui/image.nix
-    ./ui/neoscroll.nix
-    ./ui/noice.nix
-    ./ui/numbertoggle.nix
-    ./ui/specs.nix
-    ./ui/statuscol.nix
-    ./ui/transparent.nix
-    ./ui/twilight.nix
-    ./ui/virt-column.nix
-    ./ui/zen-mode.nix
-
-    ./utils/alpha.nix
-    ./utils/arrow.nix
-    ./utils/auto-save.nix
-    ./utils/auto-session.nix
-    ./utils/autoclose.nix
-    ./utils/autosource.nix
-    ./utils/bacon.nix
-    ./utils/baleia.nix
-    ./utils/better-escape.nix
-    ./utils/bufdelete.nix
-    ./utils/ccc.nix
-    ./utils/clipboard-image.nix
-    ./utils/cloak.nix
-    ./utils/codesnap.nix
-    ./utils/comment.nix
-    ./utils/comment-box.nix
-    ./utils/commentary.nix
-    ./utils/competitest.nix
-    ./utils/conjure.nix
-    ./utils/coverage.nix
-    ./utils/cursorline.nix
-    ./utils/dashboard.nix
-    ./utils/direnv.nix
-    ./utils/dressing.nix
-    ./utils/easyescape.nix
-    ./utils/emmet.nix
-    ./utils/endwise.nix
-    ./utils/firenvim.nix
-    ./utils/flash.nix
-    ./utils/floaterm.nix
-    ./utils/fzf-lua.nix
-    ./utils/goyo.nix
-    ./utils/guess-indent.nix
-    ./utils/hardtime.nix
-    ./utils/harpoon.nix
-    ./utils/hop.nix
-    ./utils/hydra
-    ./utils/illuminate.nix
-    ./utils/improved-search.nix
-    ./utils/indent-blankline.nix
-    ./utils/indent-o-matic.nix
-    ./utils/instant.nix
-    ./utils/intellitab.nix
-    ./utils/lastplace.nix
-    ./utils/leap.nix
-    ./utils/magma-nvim.nix
-    ./utils/mark-radar.nix
-    ./utils/marks.nix
-    ./utils/mini.nix
-    ./utils/mkdnflow.nix
-    ./utils/molten.nix
-    ./utils/multicursors.nix
-    ./utils/navbuddy.nix
-    ./utils/neoclip.nix
-    ./utils/neocord.nix
-    ./utils/neogen.nix
-    ./utils/neorg.nix
-    ./utils/netman.nix
-    ./utils/nix-develop.nix
-    ./utils/notify.nix
-    ./utils/nvim-autopairs.nix
-    ./utils/nvim-bqf.nix
-    ./utils/nvim-colorizer.nix
-    ./utils/nvim-osc52.nix
-    ./utils/nvim-ufo.nix
-    ./utils/obsidian
-    ./utils/oil.nix
-    ./utils/ollama.nix
-    ./utils/persistence.nix
-    ./utils/presence-nvim.nix
-    ./utils/project-nvim.nix
-    ./utils/quickmath.nix
-    ./utils/refactoring.nix
-    ./utils/repeat.nix
-    ./utils/rest.nix
-    ./utils/sandwich.nix
-    ./utils/scope.nix
-    ./utils/sleuth.nix
-    ./utils/smart-splits.nix
-    ./utils/spectre.nix
-    ./utils/spider.nix
-    ./utils/startify
-    ./utils/startup.nix
-    ./utils/surround.nix
-    ./utils/tmux-navigator.nix
-    ./utils/todo-comments.nix
-    ./utils/toggleterm.nix
-    ./utils/trim.nix
-    ./utils/undotree.nix
-    ./utils/vim-bbye.nix
-    ./utils/vim-css-color.nix
-    ./utils/vim-matchup.nix
-    ./utils/wakatime.nix
-    ./utils/web-devicons.nix
-    ./utils/which-key.nix
-    ./utils/wilder.nix
-    ./utils/yanky.nix
-    ./utils/zellij.nix
-    ./utils/zk.nix
-
     ./deprecation.nix
   ];
 }
diff --git a/tests/plugins-by-name.nix b/tests/plugins-by-name.nix
new file mode 100644
index 0000000000..5841cf6472
--- /dev/null
+++ b/tests/plugins-by-name.nix
@@ -0,0 +1,190 @@
+{
+  lib,
+  evaluatedNixvim,
+  linkFarmFromDrvs,
+  runCommandNoCCLocal,
+}:
+let
+  by-name = ../plugins/by-name;
+  options = lib.collect lib.isOption evaluatedNixvim.options;
+
+  # Option namespaces that we allow by-name plugins to declare
+  knownPluginNamespaces = [
+    "colorschemes"
+    "plugins"
+  ];
+
+  # Group by-name children by filetype; "regular", "directory", "symlink" and "unknown".
+  children =
+    let
+      apply =
+        prev: name: type:
+        prev // { ${type} = prev.${type} ++ [ name ]; };
+
+      nil = {
+        regular = [ ];
+        directory = [ ];
+        symlink = [ ];
+        unknown = [ ];
+      };
+    in
+    lib.foldlAttrs apply nil (builtins.readDir by-name);
+
+  # Find plugins by looking for `*.*.enable` options that are declared in `plugins/by-name`
+  by-name-enable-opts =
+    let
+      regex = ''/nix/store/[^/]+/plugins/by-name/(.*)'';
+      optionalPair =
+        opt: file:
+        let
+          result = builtins.match regex file;
+        in
+        lib.optional (result != null) {
+          # Use the file name relative to `plugins/by-name/`
+          name = builtins.head result;
+          # Use only the first two parts of the option location
+          value = lib.genList (builtins.elemAt opt.loc) 2;
+        };
+    in
+    lib.pipe options [
+      (builtins.filter (opt: builtins.length opt.loc == 3 && lib.last opt.loc == "enable"))
+      (builtins.concatMap (opt: (builtins.concatMap (optionalPair opt) opt.declarations)))
+      builtins.listToAttrs
+    ];
+in
+linkFarmFromDrvs "plugins-by-name" [
+  # Ensures all files matching `plugins/by-name/*` are directories
+  (runCommandNoCCLocal "file-types"
+    {
+      __structuredAttrs = true;
+      inherit (children) regular symlink unknown;
+    }
+    ''
+      declare -i errs=0
+
+      showErrs() {
+        type="$1"
+        shift
+
+        if (( $# > 0 )); then
+          ((++errs))
+          echo "Unexpected $type in plugins/by-name ($#):"
+          for f in "$@"; do
+            echo "  - $f"
+          done
+          echo
+        fi
+      }
+
+      showErrs 'symlinks' "''${symlink[@]}"
+      showErrs 'regular files' "''${regular[@]}"
+      showErrs 'unknown-type files' "''${unknown[@]}"
+
+      if (( $errs > 0 )); then
+        exit 1
+      fi
+      touch $out
+    ''
+  )
+
+  # Check default.nix files exist for each directory
+  (runCommandNoCCLocal "default-nix-exists"
+    {
+      __structuredAttrs = true;
+      missingPlugins = builtins.filter (
+        name: !(builtins.pathExists "${by-name}/${name}/default.nix")
+      ) children.directory;
+      missingTests = builtins.filter (
+        name: !(builtins.pathExists "${./test-sources/plugins/by-name}/${name}/default.nix")
+      ) children.directory;
+    }
+    ''
+      declare -i errs=0
+
+      if (( ''${#missingPlugins[@]} > 0 )); then
+        ((++errs))
+        echo "The following (''${#missingPlugins[@]}) directories do not have a default.nix file:"
+        for name in "''${missingPlugins[@]}"; do
+          echo "  - plugins/by-name/$name"
+        done
+        echo
+      fi
+
+      if (( ''${#missingTests[@]} > 0 )); then
+        ((++errs))
+        echo "The following (''${#missingTests[@]}) test files do not exist:"
+        for name in "''${missingTests[@]}"; do
+          echo "  - tests/test-sources/plugins/by-name/$name/default.nix"
+        done
+        echo
+      fi
+
+      if (( $errs > 0 )); then
+        exit 1
+      fi
+      touch $out
+    ''
+  )
+
+  # Ensures all plugin enable options are declared in a directory matching the plugin name
+  (runCommandNoCCLocal "mismatched-plugin-names"
+    {
+      __structuredAttrs = true;
+
+      options = lib.pipe by-name-enable-opts [
+        (lib.filterAttrs (file: loc: file != lib.last loc))
+        (lib.mapAttrs (file: loc: lib.showOption loc))
+      ];
+
+      passthru = {
+        inherit evaluatedNixvim;
+      };
+    }
+    ''
+      if (( ''${#options[@]} > 0 )); then
+        echo "Found plugin modules with mismatched option & directory names (''${#options[@]})"
+        for file in "''${!options[@]}"; do
+          echo "- ''${options[$file]} is declared in '$file'"
+        done
+        exit 1
+      fi
+      touch $out
+    ''
+  )
+
+  # Ensure all plugin enable option are declared under an expected namespace
+  (runCommandNoCCLocal "unknown-plugin-namespaces"
+    {
+      __structuredAttrs = true;
+
+      # I'm sorry, I couldn't help implementing oxford-comma...
+      expected =
+        let
+          len = builtins.length knownPluginNamespaces;
+        in
+        lib.concatImapStringsSep ", " (
+          i: str: lib.optionalString (i > 1 && i == len) "or " + "`${str}`"
+        ) knownPluginNamespaces;
+
+      options = lib.pipe by-name-enable-opts [
+        (lib.filterAttrs (file: loc: !(builtins.elem (builtins.head loc) knownPluginNamespaces)))
+        (lib.mapAttrs (file: loc: "`${lib.showOption loc}`"))
+      ];
+
+      passthru = {
+        inherit evaluatedNixvim;
+      };
+    }
+    ''
+      if (( ''${#options[@]} > 0 )); then
+        echo "Found plugin modules with unknown option namespaces (''${#options[@]})"
+        echo "Expected all plugins to be scoped as $expected"
+        for file in "''${!options[@]}"; do
+          echo "- ''${options[$file]} is declared in '$file'"
+        done
+        exit 1
+      fi
+      touch $out
+    ''
+  )
+]
diff --git a/tests/test-sources/plugins/statuslines/airline.nix b/tests/test-sources/plugins/by-name/airline/default.nix
similarity index 100%
rename from tests/test-sources/plugins/statuslines/airline.nix
rename to tests/test-sources/plugins/by-name/airline/default.nix
diff --git a/tests/test-sources/plugins/utils/alpha.nix b/tests/test-sources/plugins/by-name/alpha/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/alpha.nix
rename to tests/test-sources/plugins/by-name/alpha/default.nix
diff --git a/tests/test-sources/plugins/utils/arrow.nix b/tests/test-sources/plugins/by-name/arrow/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/arrow.nix
rename to tests/test-sources/plugins/by-name/arrow/default.nix
diff --git a/tests/test-sources/plugins/utils/auto-save.nix b/tests/test-sources/plugins/by-name/auto-save/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/auto-save.nix
rename to tests/test-sources/plugins/by-name/auto-save/default.nix
diff --git a/tests/test-sources/plugins/utils/auto-session.nix b/tests/test-sources/plugins/by-name/auto-session/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/auto-session.nix
rename to tests/test-sources/plugins/by-name/auto-session/default.nix
diff --git a/tests/test-sources/plugins/utils/autoclose-nvim.nix b/tests/test-sources/plugins/by-name/autoclose-nvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/autoclose-nvim.nix
rename to tests/test-sources/plugins/by-name/autoclose-nvim/default.nix
diff --git a/tests/test-sources/plugins/by-name/autoclose/default.nix b/tests/test-sources/plugins/by-name/autoclose/default.nix
new file mode 100644
index 0000000000..827f5651be
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/autoclose/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.autoclose.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/utils/autosource.nix b/tests/test-sources/plugins/by-name/autosource/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/autosource.nix
rename to tests/test-sources/plugins/by-name/autosource/default.nix
diff --git a/tests/test-sources/plugins/utils/bacon.nix b/tests/test-sources/plugins/by-name/bacon/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/bacon.nix
rename to tests/test-sources/plugins/by-name/bacon/default.nix
diff --git a/tests/test-sources/plugins/utils/baleia.nix b/tests/test-sources/plugins/by-name/baleia/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/baleia.nix
rename to tests/test-sources/plugins/by-name/baleia/default.nix
diff --git a/tests/test-sources/plugins/bufferlines/barbar.nix b/tests/test-sources/plugins/by-name/barbar/default.nix
similarity index 100%
rename from tests/test-sources/plugins/bufferlines/barbar.nix
rename to tests/test-sources/plugins/by-name/barbar/default.nix
diff --git a/tests/test-sources/plugins/bufferlines/barbecue.nix b/tests/test-sources/plugins/by-name/barbecue/default.nix
similarity index 100%
rename from tests/test-sources/plugins/bufferlines/barbecue.nix
rename to tests/test-sources/plugins/by-name/barbecue/default.nix
diff --git a/tests/test-sources/plugins/utils/better-escape.nix b/tests/test-sources/plugins/by-name/better-escape/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/better-escape.nix
rename to tests/test-sources/plugins/by-name/better-escape/default.nix
diff --git a/tests/test-sources/plugins/utils/bufdelete.nix b/tests/test-sources/plugins/by-name/bufdelete/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/bufdelete.nix
rename to tests/test-sources/plugins/by-name/bufdelete/default.nix
diff --git a/tests/test-sources/plugins/bufferlines/bufferline.nix b/tests/test-sources/plugins/by-name/bufferline/default.nix
similarity index 100%
rename from tests/test-sources/plugins/bufferlines/bufferline.nix
rename to tests/test-sources/plugins/by-name/bufferline/default.nix
diff --git a/tests/test-sources/plugins/utils/ccc.nix b/tests/test-sources/plugins/by-name/ccc/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/ccc.nix
rename to tests/test-sources/plugins/by-name/ccc/default.nix
diff --git a/tests/test-sources/plugins/filetrees/chadtree.nix b/tests/test-sources/plugins/by-name/chadtree/default.nix
similarity index 100%
rename from tests/test-sources/plugins/filetrees/chadtree.nix
rename to tests/test-sources/plugins/by-name/chadtree/default.nix
diff --git a/tests/test-sources/plugins/ai/chatgpt.nix b/tests/test-sources/plugins/by-name/chatgpt/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ai/chatgpt.nix
rename to tests/test-sources/plugins/by-name/chatgpt/default.nix
diff --git a/tests/test-sources/plugins/utils/clipboard-image.nix b/tests/test-sources/plugins/by-name/clipboard-image/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/clipboard-image.nix
rename to tests/test-sources/plugins/by-name/clipboard-image/default.nix
diff --git a/tests/test-sources/plugins/utils/cloak.nix b/tests/test-sources/plugins/by-name/cloak/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/cloak.nix
rename to tests/test-sources/plugins/by-name/cloak/default.nix
diff --git a/tests/test-sources/plugins/completion/codeium-nvim.nix b/tests/test-sources/plugins/by-name/codeium-nvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/codeium-nvim.nix
rename to tests/test-sources/plugins/by-name/codeium-nvim/default.nix
diff --git a/tests/test-sources/plugins/completion/codeium-vim.nix b/tests/test-sources/plugins/by-name/codeium-vim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/codeium-vim.nix
rename to tests/test-sources/plugins/by-name/codeium-vim/default.nix
diff --git a/tests/test-sources/plugins/utils/codesnap.nix b/tests/test-sources/plugins/by-name/codesnap/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/codesnap.nix
rename to tests/test-sources/plugins/by-name/codesnap/default.nix
diff --git a/tests/test-sources/plugins/utils/comment-box.nix b/tests/test-sources/plugins/by-name/comment-box/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/comment-box.nix
rename to tests/test-sources/plugins/by-name/comment-box/default.nix
diff --git a/tests/test-sources/plugins/utils/comment.nix b/tests/test-sources/plugins/by-name/comment/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/comment.nix
rename to tests/test-sources/plugins/by-name/comment/default.nix
diff --git a/tests/test-sources/plugins/by-name/commentary/default.nix b/tests/test-sources/plugins/by-name/commentary/default.nix
new file mode 100644
index 0000000000..34461158ca
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/commentary/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.commentary.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/git/committia.nix b/tests/test-sources/plugins/by-name/committia/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/committia.nix
rename to tests/test-sources/plugins/by-name/committia/default.nix
diff --git a/tests/test-sources/plugins/utils/competitest.nix b/tests/test-sources/plugins/by-name/competitest/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/competitest.nix
rename to tests/test-sources/plugins/by-name/competitest/default.nix
diff --git a/tests/test-sources/plugins/lsp/conform-nvim.nix b/tests/test-sources/plugins/by-name/conform-nvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/lsp/conform-nvim.nix
rename to tests/test-sources/plugins/by-name/conform-nvim/default.nix
diff --git a/tests/test-sources/plugins/utils/conjure.nix b/tests/test-sources/plugins/by-name/conjure/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/conjure.nix
rename to tests/test-sources/plugins/by-name/conjure/default.nix
diff --git a/tests/test-sources/plugins/ai/copilot-chat.nix b/tests/test-sources/plugins/by-name/copilot-chat/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ai/copilot-chat.nix
rename to tests/test-sources/plugins/by-name/copilot-chat/default.nix
diff --git a/tests/test-sources/plugins/completion/copilot-lua.nix b/tests/test-sources/plugins/by-name/copilot-lua/default.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/copilot-lua.nix
rename to tests/test-sources/plugins/by-name/copilot-lua/default.nix
diff --git a/tests/test-sources/plugins/completion/copilot-vim.nix b/tests/test-sources/plugins/by-name/copilot-vim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/copilot-vim.nix
rename to tests/test-sources/plugins/by-name/copilot-vim/default.nix
diff --git a/tests/test-sources/plugins/completion/coq.nix b/tests/test-sources/plugins/by-name/coq-nvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/coq.nix
rename to tests/test-sources/plugins/by-name/coq-nvim/default.nix
diff --git a/tests/test-sources/plugins/completion/coq-thirdparty.nix b/tests/test-sources/plugins/by-name/coq-thirdparty/default.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/coq-thirdparty.nix
rename to tests/test-sources/plugins/by-name/coq-thirdparty/default.nix
diff --git a/tests/test-sources/plugins/utils/coverage.nix b/tests/test-sources/plugins/by-name/coverage/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/coverage.nix
rename to tests/test-sources/plugins/by-name/coverage/default.nix
diff --git a/tests/test-sources/plugins/utils/cursorline.nix b/tests/test-sources/plugins/by-name/cursorline/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/cursorline.nix
rename to tests/test-sources/plugins/by-name/cursorline/default.nix
diff --git a/tests/test-sources/plugins/dap/dap-go.nix b/tests/test-sources/plugins/by-name/dap/dap-go.nix
similarity index 100%
rename from tests/test-sources/plugins/dap/dap-go.nix
rename to tests/test-sources/plugins/by-name/dap/dap-go.nix
diff --git a/tests/test-sources/plugins/dap/dap-python.nix b/tests/test-sources/plugins/by-name/dap/dap-python.nix
similarity index 100%
rename from tests/test-sources/plugins/dap/dap-python.nix
rename to tests/test-sources/plugins/by-name/dap/dap-python.nix
diff --git a/tests/test-sources/plugins/dap/dap-ui.nix b/tests/test-sources/plugins/by-name/dap/dap-ui.nix
similarity index 100%
rename from tests/test-sources/plugins/dap/dap-ui.nix
rename to tests/test-sources/plugins/by-name/dap/dap-ui.nix
diff --git a/tests/test-sources/plugins/dap/dap-virtual-text.nix b/tests/test-sources/plugins/by-name/dap/dap-virtual-text.nix
similarity index 100%
rename from tests/test-sources/plugins/dap/dap-virtual-text.nix
rename to tests/test-sources/plugins/by-name/dap/dap-virtual-text.nix
diff --git a/tests/test-sources/plugins/dap/_dap.nix b/tests/test-sources/plugins/by-name/dap/default.nix
similarity index 100%
rename from tests/test-sources/plugins/dap/_dap.nix
rename to tests/test-sources/plugins/by-name/dap/default.nix
diff --git a/tests/test-sources/plugins/utils/dashboard.nix b/tests/test-sources/plugins/by-name/dashboard/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/dashboard.nix
rename to tests/test-sources/plugins/by-name/dashboard/default.nix
diff --git a/tests/test-sources/plugins/git/diffview.nix b/tests/test-sources/plugins/by-name/diffview/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/diffview.nix
rename to tests/test-sources/plugins/by-name/diffview/default.nix
diff --git a/tests/test-sources/plugins/utils/direnv.nix b/tests/test-sources/plugins/by-name/direnv/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/direnv.nix
rename to tests/test-sources/plugins/by-name/direnv/default.nix
diff --git a/tests/test-sources/plugins/utils/dressing.nix b/tests/test-sources/plugins/by-name/dressing/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/dressing.nix
rename to tests/test-sources/plugins/by-name/dressing/default.nix
diff --git a/tests/test-sources/plugins/by-name/easyescape/default.nix b/tests/test-sources/plugins/by-name/easyescape/default.nix
new file mode 100644
index 0000000000..31552f7234
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/easyescape/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.easyescape.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/ui/edgy.nix b/tests/test-sources/plugins/by-name/edgy/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/edgy.nix
rename to tests/test-sources/plugins/by-name/edgy/default.nix
diff --git a/tests/test-sources/plugins/utils/emmet.nix b/tests/test-sources/plugins/by-name/emmet/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/emmet.nix
rename to tests/test-sources/plugins/by-name/emmet/default.nix
diff --git a/tests/test-sources/plugins/utils/endwise.nix b/tests/test-sources/plugins/by-name/endwise/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/endwise.nix
rename to tests/test-sources/plugins/by-name/endwise/default.nix
diff --git a/tests/test-sources/plugins/lsp/fidget.nix b/tests/test-sources/plugins/by-name/fidget/default.nix
similarity index 100%
rename from tests/test-sources/plugins/lsp/fidget.nix
rename to tests/test-sources/plugins/by-name/fidget/default.nix
diff --git a/tests/test-sources/plugins/utils/firenvim.nix b/tests/test-sources/plugins/by-name/firenvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/firenvim.nix
rename to tests/test-sources/plugins/by-name/firenvim/default.nix
diff --git a/tests/test-sources/plugins/utils/flash.nix b/tests/test-sources/plugins/by-name/flash/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/flash.nix
rename to tests/test-sources/plugins/by-name/flash/default.nix
diff --git a/tests/test-sources/plugins/by-name/floaterm/default.nix b/tests/test-sources/plugins/by-name/floaterm/default.nix
new file mode 100644
index 0000000000..db8ffba8e9
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/floaterm/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.floaterm.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/snippets/friendly-snippets.nix b/tests/test-sources/plugins/by-name/friendly-snippets/default.nix
similarity index 100%
rename from tests/test-sources/plugins/snippets/friendly-snippets.nix
rename to tests/test-sources/plugins/by-name/friendly-snippets/default.nix
diff --git a/tests/test-sources/plugins/by-name/fugitive/default.nix b/tests/test-sources/plugins/by-name/fugitive/default.nix
new file mode 100644
index 0000000000..e6aa13e8ab
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/fugitive/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.fugitive.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/utils/fzf-lua.nix b/tests/test-sources/plugins/by-name/fzf-lua/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/fzf-lua.nix
rename to tests/test-sources/plugins/by-name/fzf-lua/default.nix
diff --git a/tests/test-sources/plugins/git/git-conflict.nix b/tests/test-sources/plugins/by-name/git-conflict/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/git-conflict.nix
rename to tests/test-sources/plugins/by-name/git-conflict/default.nix
diff --git a/tests/test-sources/plugins/git/git-worktree.nix b/tests/test-sources/plugins/by-name/git-worktree/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/git-worktree.nix
rename to tests/test-sources/plugins/by-name/git-worktree/default.nix
diff --git a/tests/test-sources/plugins/git/gitblame.nix b/tests/test-sources/plugins/by-name/gitblame/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/gitblame.nix
rename to tests/test-sources/plugins/by-name/gitblame/default.nix
diff --git a/tests/test-sources/plugins/git/gitgutter.nix b/tests/test-sources/plugins/by-name/gitgutter/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/gitgutter.nix
rename to tests/test-sources/plugins/by-name/gitgutter/default.nix
diff --git a/tests/test-sources/plugins/git/gitignore.nix b/tests/test-sources/plugins/by-name/gitignore/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/gitignore.nix
rename to tests/test-sources/plugins/by-name/gitignore/default.nix
diff --git a/tests/test-sources/plugins/git/gitlinker.nix b/tests/test-sources/plugins/by-name/gitlinker/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/gitlinker.nix
rename to tests/test-sources/plugins/by-name/gitlinker/default.nix
diff --git a/tests/test-sources/plugins/by-name/gitmessenger/default.nix b/tests/test-sources/plugins/by-name/gitmessenger/default.nix
new file mode 100644
index 0000000000..8b3f4ee7b4
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/gitmessenger/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.gitmessenger.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/git/gitsigns.nix b/tests/test-sources/plugins/by-name/gitsigns/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/gitsigns.nix
rename to tests/test-sources/plugins/by-name/gitsigns/default.nix
diff --git a/tests/test-sources/plugins/utils/goyo.nix b/tests/test-sources/plugins/by-name/goyo/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/goyo.nix
rename to tests/test-sources/plugins/by-name/goyo/default.nix
diff --git a/tests/test-sources/plugins/utils/guess-indent.nix b/tests/test-sources/plugins/by-name/guess-indent/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/guess-indent.nix
rename to tests/test-sources/plugins/by-name/guess-indent/default.nix
diff --git a/tests/test-sources/plugins/utils/hardtime.nix b/tests/test-sources/plugins/by-name/hardtime/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/hardtime.nix
rename to tests/test-sources/plugins/by-name/hardtime/default.nix
diff --git a/tests/test-sources/plugins/utils/harpoon.nix b/tests/test-sources/plugins/by-name/harpoon/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/harpoon.nix
rename to tests/test-sources/plugins/by-name/harpoon/default.nix
diff --git a/tests/test-sources/plugins/ui/headlines.nix b/tests/test-sources/plugins/by-name/headlines/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/headlines.nix
rename to tests/test-sources/plugins/by-name/headlines/default.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/hmts.nix b/tests/test-sources/plugins/by-name/hmts/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/hmts.nix
rename to tests/test-sources/plugins/by-name/hmts/default.nix
diff --git a/tests/test-sources/plugins/utils/hop.nix b/tests/test-sources/plugins/by-name/hop/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/hop.nix
rename to tests/test-sources/plugins/by-name/hop/default.nix
diff --git a/tests/test-sources/plugins/utils/hydra.nix b/tests/test-sources/plugins/by-name/hydra/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/hydra.nix
rename to tests/test-sources/plugins/by-name/hydra/default.nix
diff --git a/tests/test-sources/plugins/utils/illuminate.nix b/tests/test-sources/plugins/by-name/illuminate/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/illuminate.nix
rename to tests/test-sources/plugins/by-name/illuminate/default.nix
diff --git a/tests/test-sources/plugins/ui/image.nix b/tests/test-sources/plugins/by-name/image/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/image.nix
rename to tests/test-sources/plugins/by-name/image/default.nix
diff --git a/tests/test-sources/plugins/utils/improved-search.nix b/tests/test-sources/plugins/by-name/improved-search/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/improved-search.nix
rename to tests/test-sources/plugins/by-name/improved-search/default.nix
diff --git a/tests/test-sources/plugins/lsp/inc-rename.nix b/tests/test-sources/plugins/by-name/inc-rename/default.nix
similarity index 100%
rename from tests/test-sources/plugins/lsp/inc-rename.nix
rename to tests/test-sources/plugins/by-name/inc-rename/default.nix
diff --git a/tests/test-sources/plugins/utils/indent-blankline.nix b/tests/test-sources/plugins/by-name/indent-blankline/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/indent-blankline.nix
rename to tests/test-sources/plugins/by-name/indent-blankline/default.nix
diff --git a/tests/test-sources/plugins/utils/indent-o-matic.nix b/tests/test-sources/plugins/by-name/indent-o-matic/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/indent-o-matic.nix
rename to tests/test-sources/plugins/by-name/indent-o-matic/default.nix
diff --git a/tests/test-sources/plugins/utils/instant.nix b/tests/test-sources/plugins/by-name/instant/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/instant.nix
rename to tests/test-sources/plugins/by-name/instant/default.nix
diff --git a/tests/test-sources/plugins/by-name/intellitab/default.nix b/tests/test-sources/plugins/by-name/intellitab/default.nix
new file mode 100644
index 0000000000..9fcb78649c
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/intellitab/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.intellitab.enable = false;
+  };
+}
diff --git a/tests/test-sources/plugins/utils/lastplace.nix b/tests/test-sources/plugins/by-name/lastplace/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/lastplace.nix
rename to tests/test-sources/plugins/by-name/lastplace/default.nix
diff --git a/tests/test-sources/plugins/git/lazygit.nix b/tests/test-sources/plugins/by-name/lazygit/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/lazygit.nix
rename to tests/test-sources/plugins/by-name/lazygit/default.nix
diff --git a/tests/test-sources/plugins/utils/leap.nix b/tests/test-sources/plugins/by-name/leap/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/leap.nix
rename to tests/test-sources/plugins/by-name/leap/default.nix
diff --git a/tests/test-sources/plugins/statuslines/lightline.nix b/tests/test-sources/plugins/by-name/lightline/default.nix
similarity index 100%
rename from tests/test-sources/plugins/statuslines/lightline.nix
rename to tests/test-sources/plugins/by-name/lightline/default.nix
diff --git a/tests/test-sources/plugins/lsp/lsp-format.nix b/tests/test-sources/plugins/by-name/lsp-format/default.nix
similarity index 100%
rename from tests/test-sources/plugins/lsp/lsp-format.nix
rename to tests/test-sources/plugins/by-name/lsp-format/default.nix
diff --git a/tests/test-sources/plugins/lsp/lsp-lines.nix b/tests/test-sources/plugins/by-name/lsp-lines/default.nix
similarity index 100%
rename from tests/test-sources/plugins/lsp/lsp-lines.nix
rename to tests/test-sources/plugins/by-name/lsp-lines/default.nix
diff --git a/tests/test-sources/plugins/lsp/lsp-status.nix b/tests/test-sources/plugins/by-name/lsp-status/default.nix
similarity index 100%
rename from tests/test-sources/plugins/lsp/lsp-status.nix
rename to tests/test-sources/plugins/by-name/lsp-status/default.nix
diff --git a/tests/test-sources/plugins/completion/lspkind.nix b/tests/test-sources/plugins/by-name/lspkind/default.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/lspkind.nix
rename to tests/test-sources/plugins/by-name/lspkind/default.nix
diff --git a/tests/test-sources/plugins/lsp/lspsaga.nix b/tests/test-sources/plugins/by-name/lspsaga/default.nix
similarity index 100%
rename from tests/test-sources/plugins/lsp/lspsaga.nix
rename to tests/test-sources/plugins/by-name/lspsaga/default.nix
diff --git a/tests/test-sources/plugins/statuslines/lualine.nix b/tests/test-sources/plugins/by-name/lualine/default.nix
similarity index 100%
rename from tests/test-sources/plugins/statuslines/lualine.nix
rename to tests/test-sources/plugins/by-name/lualine/default.nix
diff --git a/tests/test-sources/plugins/snippets/luasnip.nix b/tests/test-sources/plugins/by-name/luasnip/default.nix
similarity index 100%
rename from tests/test-sources/plugins/snippets/luasnip.nix
rename to tests/test-sources/plugins/by-name/luasnip/default.nix
diff --git a/tests/test-sources/plugins/utils/magma-nvim.nix b/tests/test-sources/plugins/by-name/magma-nvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/magma-nvim.nix
rename to tests/test-sources/plugins/by-name/magma-nvim/default.nix
diff --git a/tests/test-sources/plugins/utils/mark-radar.nix b/tests/test-sources/plugins/by-name/mark-radar/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/mark-radar.nix
rename to tests/test-sources/plugins/by-name/mark-radar/default.nix
diff --git a/tests/test-sources/plugins/utils/marks.nix b/tests/test-sources/plugins/by-name/marks/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/marks.nix
rename to tests/test-sources/plugins/by-name/marks/default.nix
diff --git a/tests/test-sources/plugins/utils/mini.nix b/tests/test-sources/plugins/by-name/mini/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/mini.nix
rename to tests/test-sources/plugins/by-name/mini/default.nix
diff --git a/tests/test-sources/plugins/utils/mkdnflow.nix b/tests/test-sources/plugins/by-name/mkdnflow/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/mkdnflow.nix
rename to tests/test-sources/plugins/by-name/mkdnflow/default.nix
diff --git a/tests/test-sources/plugins/utils/molten.nix b/tests/test-sources/plugins/by-name/molten/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/molten.nix
rename to tests/test-sources/plugins/by-name/molten/default.nix
diff --git a/tests/test-sources/plugins/utils/multicursors.nix b/tests/test-sources/plugins/by-name/multicursors/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/multicursors.nix
rename to tests/test-sources/plugins/by-name/multicursors/default.nix
diff --git a/tests/test-sources/plugins/utils/navbuddy.nix b/tests/test-sources/plugins/by-name/navbuddy/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/navbuddy.nix
rename to tests/test-sources/plugins/by-name/navbuddy/default.nix
diff --git a/tests/test-sources/plugins/bufferlines/navic.nix b/tests/test-sources/plugins/by-name/navic/default.nix
similarity index 100%
rename from tests/test-sources/plugins/bufferlines/navic.nix
rename to tests/test-sources/plugins/by-name/navic/default.nix
diff --git a/tests/test-sources/plugins/filetrees/neo-tree.nix b/tests/test-sources/plugins/by-name/neo-tree/default.nix
similarity index 100%
rename from tests/test-sources/plugins/filetrees/neo-tree.nix
rename to tests/test-sources/plugins/by-name/neo-tree/default.nix
diff --git a/tests/test-sources/plugins/utils/neoclip.nix b/tests/test-sources/plugins/by-name/neoclip/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/neoclip.nix
rename to tests/test-sources/plugins/by-name/neoclip/default.nix
diff --git a/tests/test-sources/plugins/utils/neocord.nix b/tests/test-sources/plugins/by-name/neocord/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/neocord.nix
rename to tests/test-sources/plugins/by-name/neocord/default.nix
diff --git a/tests/test-sources/plugins/utils/neogen.nix b/tests/test-sources/plugins/by-name/neogen/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/neogen.nix
rename to tests/test-sources/plugins/by-name/neogen/default.nix
diff --git a/tests/test-sources/plugins/git/neogit.nix b/tests/test-sources/plugins/by-name/neogit/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/neogit.nix
rename to tests/test-sources/plugins/by-name/neogit/default.nix
diff --git a/tests/test-sources/plugins/utils/neorg.nix b/tests/test-sources/plugins/by-name/neorg/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/neorg.nix
rename to tests/test-sources/plugins/by-name/neorg/default.nix
diff --git a/tests/test-sources/plugins/ui/neoscroll.nix b/tests/test-sources/plugins/by-name/neoscroll/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/neoscroll.nix
rename to tests/test-sources/plugins/by-name/neoscroll/default.nix
diff --git a/tests/test-sources/plugins/utils/netman.nix b/tests/test-sources/plugins/by-name/netman/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/netman.nix
rename to tests/test-sources/plugins/by-name/netman/default.nix
diff --git a/tests/test-sources/plugins/utils/nix-develop.nix b/tests/test-sources/plugins/by-name/nix-develop/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/nix-develop.nix
rename to tests/test-sources/plugins/by-name/nix-develop/default.nix
diff --git a/tests/test-sources/plugins/ui/noice.nix b/tests/test-sources/plugins/by-name/noice/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/noice.nix
rename to tests/test-sources/plugins/by-name/noice/default.nix
diff --git a/tests/test-sources/plugins/utils/notify.nix b/tests/test-sources/plugins/by-name/notify/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/notify.nix
rename to tests/test-sources/plugins/by-name/notify/default.nix
diff --git a/tests/test-sources/plugins/ui/numbertoggle.nix b/tests/test-sources/plugins/by-name/numbertoggle/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/numbertoggle.nix
rename to tests/test-sources/plugins/by-name/numbertoggle/default.nix
diff --git a/tests/test-sources/plugins/utils/nvim-autopairs.nix b/tests/test-sources/plugins/by-name/nvim-autopairs/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/nvim-autopairs.nix
rename to tests/test-sources/plugins/by-name/nvim-autopairs/default.nix
diff --git a/tests/test-sources/plugins/by-name/nvim-bqf/default.nix b/tests/test-sources/plugins/by-name/nvim-bqf/default.nix
new file mode 100644
index 0000000000..3ade56d3f8
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/nvim-bqf/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.nvim-bqf.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/by-name/nvim-colorizer/default.nix b/tests/test-sources/plugins/by-name/nvim-colorizer/default.nix
new file mode 100644
index 0000000000..fa233f7a47
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/nvim-colorizer/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.nvim-colorizer.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/lsp/nvim-lightbulb.nix b/tests/test-sources/plugins/by-name/nvim-lightbulb/default.nix
similarity index 100%
rename from tests/test-sources/plugins/lsp/nvim-lightbulb.nix
rename to tests/test-sources/plugins/by-name/nvim-lightbulb/default.nix
diff --git a/tests/test-sources/plugins/utils/nvim-osc52.nix b/tests/test-sources/plugins/by-name/nvim-osc52/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/nvim-osc52.nix
rename to tests/test-sources/plugins/by-name/nvim-osc52/default.nix
diff --git a/tests/test-sources/plugins/snippets/nvim-snippets.nix b/tests/test-sources/plugins/by-name/nvim-snippets/default.nix
similarity index 100%
rename from tests/test-sources/plugins/snippets/nvim-snippets.nix
rename to tests/test-sources/plugins/by-name/nvim-snippets/default.nix
diff --git a/tests/test-sources/plugins/filetrees/nvim-tree.nix b/tests/test-sources/plugins/by-name/nvim-tree/default.nix
similarity index 100%
rename from tests/test-sources/plugins/filetrees/nvim-tree.nix
rename to tests/test-sources/plugins/by-name/nvim-tree/default.nix
diff --git a/tests/test-sources/plugins/utils/nvim-ufo.nix b/tests/test-sources/plugins/by-name/nvim-ufo/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/nvim-ufo.nix
rename to tests/test-sources/plugins/by-name/nvim-ufo/default.nix
diff --git a/tests/test-sources/plugins/utils/obsidian.nix b/tests/test-sources/plugins/by-name/obsidian/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/obsidian.nix
rename to tests/test-sources/plugins/by-name/obsidian/default.nix
diff --git a/tests/test-sources/plugins/git/octo.nix b/tests/test-sources/plugins/by-name/octo/default.nix
similarity index 100%
rename from tests/test-sources/plugins/git/octo.nix
rename to tests/test-sources/plugins/by-name/octo/default.nix
diff --git a/tests/test-sources/plugins/utils/oil.nix b/tests/test-sources/plugins/by-name/oil/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/oil.nix
rename to tests/test-sources/plugins/by-name/oil/default.nix
diff --git a/tests/test-sources/plugins/utils/ollama.nix b/tests/test-sources/plugins/by-name/ollama/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/ollama.nix
rename to tests/test-sources/plugins/by-name/ollama/default.nix
diff --git a/tests/test-sources/plugins/utils/persistence.nix b/tests/test-sources/plugins/by-name/persistence/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/persistence.nix
rename to tests/test-sources/plugins/by-name/persistence/default.nix
diff --git a/tests/test-sources/plugins/utils/presence-nvim.nix b/tests/test-sources/plugins/by-name/presence-nvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/presence-nvim.nix
rename to tests/test-sources/plugins/by-name/presence-nvim/default.nix
diff --git a/tests/test-sources/plugins/utils/project-nvim.nix b/tests/test-sources/plugins/by-name/project-nvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/project-nvim.nix
rename to tests/test-sources/plugins/by-name/project-nvim/default.nix
diff --git a/tests/test-sources/plugins/utils/quickmath.nix b/tests/test-sources/plugins/by-name/quickmath/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/quickmath.nix
rename to tests/test-sources/plugins/by-name/quickmath/default.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/rainbow-delimiters.nix b/tests/test-sources/plugins/by-name/rainbow-delimiters/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/rainbow-delimiters.nix
rename to tests/test-sources/plugins/by-name/rainbow-delimiters/default.nix
diff --git a/tests/test-sources/plugins/utils/refactoring.nix b/tests/test-sources/plugins/by-name/refactoring/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/refactoring.nix
rename to tests/test-sources/plugins/by-name/refactoring/default.nix
diff --git a/tests/test-sources/plugins/utils/repeat.nix b/tests/test-sources/plugins/by-name/repeat/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/repeat.nix
rename to tests/test-sources/plugins/by-name/repeat/default.nix
diff --git a/tests/test-sources/plugins/utils/rest.nix b/tests/test-sources/plugins/by-name/rest/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/rest.nix
rename to tests/test-sources/plugins/by-name/rest/default.nix
diff --git a/tests/test-sources/plugins/utils/sandwich.nix b/tests/test-sources/plugins/by-name/sandwich/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/sandwich.nix
rename to tests/test-sources/plugins/by-name/sandwich/default.nix
diff --git a/tests/test-sources/plugins/lsp/schemastore.nix b/tests/test-sources/plugins/by-name/schemastore/default.nix
similarity index 100%
rename from tests/test-sources/plugins/lsp/schemastore.nix
rename to tests/test-sources/plugins/by-name/schemastore/default.nix
diff --git a/tests/test-sources/plugins/utils/scope.nix b/tests/test-sources/plugins/by-name/scope/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/scope.nix
rename to tests/test-sources/plugins/by-name/scope/default.nix
diff --git a/tests/test-sources/plugins/utils/sleuth.nix b/tests/test-sources/plugins/by-name/sleuth/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/sleuth.nix
rename to tests/test-sources/plugins/by-name/sleuth/default.nix
diff --git a/tests/test-sources/plugins/utils/smart-splits.nix b/tests/test-sources/plugins/by-name/smart-splits/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/smart-splits.nix
rename to tests/test-sources/plugins/by-name/smart-splits/default.nix
diff --git a/tests/test-sources/plugins/ui/specs.nix b/tests/test-sources/plugins/by-name/specs/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/specs.nix
rename to tests/test-sources/plugins/by-name/specs/default.nix
diff --git a/tests/test-sources/plugins/utils/spectre.nix b/tests/test-sources/plugins/by-name/spectre/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/spectre.nix
rename to tests/test-sources/plugins/by-name/spectre/default.nix
diff --git a/tests/test-sources/plugins/utils/spider.nix b/tests/test-sources/plugins/by-name/spider/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/spider.nix
rename to tests/test-sources/plugins/by-name/spider/default.nix
diff --git a/tests/test-sources/plugins/utils/startify.nix b/tests/test-sources/plugins/by-name/startify/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/startify.nix
rename to tests/test-sources/plugins/by-name/startify/default.nix
diff --git a/tests/test-sources/plugins/utils/startup.nix b/tests/test-sources/plugins/by-name/startup/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/startup.nix
rename to tests/test-sources/plugins/by-name/startup/default.nix
diff --git a/tests/test-sources/plugins/ui/statuscol.nix b/tests/test-sources/plugins/by-name/statuscol/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/statuscol.nix
rename to tests/test-sources/plugins/by-name/statuscol/default.nix
diff --git a/tests/test-sources/plugins/by-name/surround/default.nix b/tests/test-sources/plugins/by-name/surround/default.nix
new file mode 100644
index 0000000000..c5bad8e69d
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/surround/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.surround.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/telescope/default.nix b/tests/test-sources/plugins/by-name/telescope/default.nix
similarity index 100%
rename from tests/test-sources/plugins/telescope/default.nix
rename to tests/test-sources/plugins/by-name/telescope/default.nix
diff --git a/tests/test-sources/plugins/telescope/file-browser.nix b/tests/test-sources/plugins/by-name/telescope/file-browser.nix
similarity index 100%
rename from tests/test-sources/plugins/telescope/file-browser.nix
rename to tests/test-sources/plugins/by-name/telescope/file-browser.nix
diff --git a/tests/test-sources/plugins/telescope/frecency.nix b/tests/test-sources/plugins/by-name/telescope/frecency.nix
similarity index 100%
rename from tests/test-sources/plugins/telescope/frecency.nix
rename to tests/test-sources/plugins/by-name/telescope/frecency.nix
diff --git a/tests/test-sources/plugins/telescope/fzf-native.nix b/tests/test-sources/plugins/by-name/telescope/fzf-native.nix
similarity index 100%
rename from tests/test-sources/plugins/telescope/fzf-native.nix
rename to tests/test-sources/plugins/by-name/telescope/fzf-native.nix
diff --git a/tests/test-sources/plugins/telescope/fzy-native.nix b/tests/test-sources/plugins/by-name/telescope/fzy-native.nix
similarity index 100%
rename from tests/test-sources/plugins/telescope/fzy-native.nix
rename to tests/test-sources/plugins/by-name/telescope/fzy-native.nix
diff --git a/tests/test-sources/plugins/telescope/media-files.nix b/tests/test-sources/plugins/by-name/telescope/media-files.nix
similarity index 100%
rename from tests/test-sources/plugins/telescope/media-files.nix
rename to tests/test-sources/plugins/by-name/telescope/media-files.nix
diff --git a/tests/test-sources/plugins/telescope/ui-select.nix b/tests/test-sources/plugins/by-name/telescope/ui-select.nix
similarity index 100%
rename from tests/test-sources/plugins/telescope/ui-select.nix
rename to tests/test-sources/plugins/by-name/telescope/ui-select.nix
diff --git a/tests/test-sources/plugins/telescope/undo.nix b/tests/test-sources/plugins/by-name/telescope/undo.nix
similarity index 100%
rename from tests/test-sources/plugins/telescope/undo.nix
rename to tests/test-sources/plugins/by-name/telescope/undo.nix
diff --git a/tests/test-sources/plugins/utils/tmux-navigator.nix b/tests/test-sources/plugins/by-name/tmux-navigator/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/tmux-navigator.nix
rename to tests/test-sources/plugins/by-name/tmux-navigator/default.nix
diff --git a/tests/test-sources/plugins/utils/todo-comments.nix b/tests/test-sources/plugins/by-name/todo-comments/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/todo-comments.nix
rename to tests/test-sources/plugins/by-name/todo-comments/default.nix
diff --git a/tests/test-sources/plugins/utils/toggleterm.nix b/tests/test-sources/plugins/by-name/toggleterm/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/toggleterm.nix
rename to tests/test-sources/plugins/by-name/toggleterm/default.nix
diff --git a/tests/test-sources/plugins/ui/transparent.nix b/tests/test-sources/plugins/by-name/transparent/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/transparent.nix
rename to tests/test-sources/plugins/by-name/transparent/default.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/treesitter-context.nix b/tests/test-sources/plugins/by-name/treesitter-context/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/treesitter-context.nix
rename to tests/test-sources/plugins/by-name/treesitter-context/default.nix
diff --git a/tests/test-sources/plugins/by-name/treesitter-refactor/default.nix b/tests/test-sources/plugins/by-name/treesitter-refactor/default.nix
new file mode 100644
index 0000000000..5ac19c30b2
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/treesitter-refactor/default.nix
@@ -0,0 +1,9 @@
+{
+  empty = {
+    plugins = {
+      treesitter-refactor.enable = true;
+      # Also needs treesitter, to avoid warnings
+      treesitter.enable = true;
+    };
+  };
+}
diff --git a/tests/test-sources/plugins/languages/treesitter/treesitter-textobjects.nix b/tests/test-sources/plugins/by-name/treesitter-textobjects/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/treesitter-textobjects.nix
rename to tests/test-sources/plugins/by-name/treesitter-textobjects/default.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/combine-plugins.nix b/tests/test-sources/plugins/by-name/treesitter/combine-plugins.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/combine-plugins.nix
rename to tests/test-sources/plugins/by-name/treesitter/combine-plugins.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/treesitter.nix b/tests/test-sources/plugins/by-name/treesitter/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/treesitter.nix
rename to tests/test-sources/plugins/by-name/treesitter/default.nix
diff --git a/tests/test-sources/plugins/utils/trim.nix b/tests/test-sources/plugins/by-name/trim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/trim.nix
rename to tests/test-sources/plugins/by-name/trim/default.nix
diff --git a/tests/test-sources/plugins/lsp/trouble.nix b/tests/test-sources/plugins/by-name/trouble/default.nix
similarity index 100%
rename from tests/test-sources/plugins/lsp/trouble.nix
rename to tests/test-sources/plugins/by-name/trouble/default.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/ts-autotag.nix b/tests/test-sources/plugins/by-name/ts-autotag/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/ts-autotag.nix
rename to tests/test-sources/plugins/by-name/ts-autotag/default.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/ts-context-commentstring.nix b/tests/test-sources/plugins/by-name/ts-context-commentstring/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/ts-context-commentstring.nix
rename to tests/test-sources/plugins/by-name/ts-context-commentstring/default.nix
diff --git a/tests/test-sources/plugins/ui/twilight.nix b/tests/test-sources/plugins/by-name/twilight/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/twilight.nix
rename to tests/test-sources/plugins/by-name/twilight/default.nix
diff --git a/tests/test-sources/plugins/utils/undotree.nix b/tests/test-sources/plugins/by-name/undotree/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/undotree.nix
rename to tests/test-sources/plugins/by-name/undotree/default.nix
diff --git a/tests/test-sources/plugins/utils/vim-bbye.nix b/tests/test-sources/plugins/by-name/vim-bbye/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/vim-bbye.nix
rename to tests/test-sources/plugins/by-name/vim-bbye/default.nix
diff --git a/tests/test-sources/plugins/utils/vim-css-color.nix b/tests/test-sources/plugins/by-name/vim-css-color/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/vim-css-color.nix
rename to tests/test-sources/plugins/by-name/vim-css-color/default.nix
diff --git a/tests/test-sources/plugins/by-name/vim-matchup/default.nix b/tests/test-sources/plugins/by-name/vim-matchup/default.nix
new file mode 100644
index 0000000000..0e02295eb8
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/vim-matchup/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.vim-matchup.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/ui/virt-column.nix b/tests/test-sources/plugins/by-name/virt-column/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/virt-column.nix
rename to tests/test-sources/plugins/by-name/virt-column/default.nix
diff --git a/tests/test-sources/plugins/utils/wakatime.nix b/tests/test-sources/plugins/by-name/wakatime/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/wakatime.nix
rename to tests/test-sources/plugins/by-name/wakatime/default.nix
diff --git a/tests/test-sources/plugins/utils/web-devicons.nix b/tests/test-sources/plugins/by-name/web-devicons/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/web-devicons.nix
rename to tests/test-sources/plugins/by-name/web-devicons/default.nix
diff --git a/tests/test-sources/plugins/utils/which-key.nix b/tests/test-sources/plugins/by-name/which-key/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/which-key.nix
rename to tests/test-sources/plugins/by-name/which-key/default.nix
diff --git a/tests/test-sources/plugins/utils/wilder.nix b/tests/test-sources/plugins/by-name/wilder/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/wilder.nix
rename to tests/test-sources/plugins/by-name/wilder/default.nix
diff --git a/tests/test-sources/plugins/lsp/wtf.nix b/tests/test-sources/plugins/by-name/wtf/default.nix
similarity index 100%
rename from tests/test-sources/plugins/lsp/wtf.nix
rename to tests/test-sources/plugins/by-name/wtf/default.nix
diff --git a/tests/test-sources/plugins/utils/yanky.nix b/tests/test-sources/plugins/by-name/yanky/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/yanky.nix
rename to tests/test-sources/plugins/by-name/yanky/default.nix
diff --git a/tests/test-sources/plugins/filetrees/yazi.nix b/tests/test-sources/plugins/by-name/yazi/default.nix
similarity index 100%
rename from tests/test-sources/plugins/filetrees/yazi.nix
rename to tests/test-sources/plugins/by-name/yazi/default.nix
diff --git a/tests/test-sources/plugins/utils/zellij.nix b/tests/test-sources/plugins/by-name/zellij/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/zellij.nix
rename to tests/test-sources/plugins/by-name/zellij/default.nix
diff --git a/tests/test-sources/plugins/ui/zen-mode.nix b/tests/test-sources/plugins/by-name/zen-mode/default.nix
similarity index 100%
rename from tests/test-sources/plugins/ui/zen-mode.nix
rename to tests/test-sources/plugins/by-name/zen-mode/default.nix
diff --git a/tests/test-sources/plugins/utils/zk.nix b/tests/test-sources/plugins/by-name/zk/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/zk.nix
rename to tests/test-sources/plugins/by-name/zk/default.nix
diff --git a/tests/test-sources/plugins/completion/cmp-all-sources.nix b/tests/test-sources/plugins/cmp/all-sources.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/cmp-all-sources.nix
rename to tests/test-sources/plugins/cmp/all-sources.nix
diff --git a/tests/test-sources/plugins/completion/cmp-ai.nix b/tests/test-sources/plugins/cmp/cmp-ai.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/cmp-ai.nix
rename to tests/test-sources/plugins/cmp/cmp-ai.nix
diff --git a/tests/test-sources/plugins/completion/cmp-async-path.nix b/tests/test-sources/plugins/cmp/cmp-async-path.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/cmp-async-path.nix
rename to tests/test-sources/plugins/cmp/cmp-async-path.nix
diff --git a/tests/test-sources/plugins/completion/cmp-git.nix b/tests/test-sources/plugins/cmp/cmp-git.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/cmp-git.nix
rename to tests/test-sources/plugins/cmp/cmp-git.nix
diff --git a/tests/test-sources/plugins/completion/cmp-tabby.nix b/tests/test-sources/plugins/cmp/cmp-tabby.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/cmp-tabby.nix
rename to tests/test-sources/plugins/cmp/cmp-tabby.nix
diff --git a/tests/test-sources/plugins/completion/cmp.nix b/tests/test-sources/plugins/cmp/default.nix
similarity index 100%
rename from tests/test-sources/plugins/completion/cmp.nix
rename to tests/test-sources/plugins/cmp/default.nix