From ad85cd760ef56b36f62b9d31c9f4409560e712d3 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Thu, 5 Sep 2024 02:36:41 +0100 Subject: [PATCH] plugins/completion: move to by-name - Move nvim-cmp to plugins/cmp - Move other completion plugins to plugins/by-name --- .../codeium-nvim/default.nix} | 0 .../codeium-vim/default.nix} | 0 .../copilot-lua/default.nix} | 0 .../copilot-vim/default.nix} | 0 .../coq.nix => by-name/coq-nvim/default.nix} | 0 .../coq-thirdparty/default.nix} | 0 .../lspkind.nix => by-name/lspkind/default.nix} | 0 plugins/{completion => }/cmp/auto-enable.nix | 0 plugins/{completion => }/cmp/default.nix | 0 plugins/{completion => }/cmp/deprecations.nix | 0 plugins/{completion => }/cmp/options/default.nix | 0 .../{completion => }/cmp/options/settings-options.nix | 0 .../{completion => }/cmp/options/sources-option.nix | 0 .../{completion => }/cmp/sources/_mk-cmp-plugin.nix | 0 plugins/{completion => }/cmp/sources/cmp-ai.nix | 0 plugins/{completion => }/cmp/sources/cmp-fish.nix | 0 plugins/{completion => }/cmp/sources/cmp-git.nix | 0 plugins/{completion => }/cmp/sources/cmp-tabby.nix | 0 plugins/{completion => }/cmp/sources/cmp-tabnine.nix | 0 plugins/{completion => }/cmp/sources/copilot-cmp.nix | 0 plugins/{completion => }/cmp/sources/crates-nvim.nix | 0 plugins/{completion => }/cmp/sources/default.nix | 0 plugins/default.nix | 11 ++--------- .../codeium-nvim/default.nix} | 0 .../codeium-vim/default.nix} | 0 .../copilot-lua/default.nix} | 0 .../copilot-vim/default.nix} | 0 .../coq.nix => by-name/coq-nvim/default.nix} | 0 .../coq-thirdparty/default.nix} | 0 .../lspkind.nix => by-name/lspkind/default.nix} | 0 .../cmp-all-sources.nix => cmp/all-sources.nix} | 0 .../plugins/{completion => cmp}/cmp-ai.nix | 0 .../plugins/{completion => cmp}/cmp-async-path.nix | 0 .../plugins/{completion => cmp}/cmp-git.nix | 0 .../plugins/{completion => cmp}/cmp-tabby.nix | 0 .../plugins/{completion/cmp.nix => cmp/default.nix} | 0 36 files changed, 2 insertions(+), 9 deletions(-) rename plugins/{completion/codeium-nvim.nix => by-name/codeium-nvim/default.nix} (100%) rename plugins/{completion/codeium-vim.nix => by-name/codeium-vim/default.nix} (100%) rename plugins/{completion/copilot-lua.nix => by-name/copilot-lua/default.nix} (100%) rename plugins/{completion/copilot-vim.nix => by-name/copilot-vim/default.nix} (100%) rename plugins/{completion/coq.nix => by-name/coq-nvim/default.nix} (100%) rename plugins/{completion/coq-thirdparty.nix => by-name/coq-thirdparty/default.nix} (100%) rename plugins/{completion/lspkind.nix => by-name/lspkind/default.nix} (100%) rename plugins/{completion => }/cmp/auto-enable.nix (100%) rename plugins/{completion => }/cmp/default.nix (100%) rename plugins/{completion => }/cmp/deprecations.nix (100%) rename plugins/{completion => }/cmp/options/default.nix (100%) rename plugins/{completion => }/cmp/options/settings-options.nix (100%) rename plugins/{completion => }/cmp/options/sources-option.nix (100%) rename plugins/{completion => }/cmp/sources/_mk-cmp-plugin.nix (100%) rename plugins/{completion => }/cmp/sources/cmp-ai.nix (100%) rename plugins/{completion => }/cmp/sources/cmp-fish.nix (100%) rename plugins/{completion => }/cmp/sources/cmp-git.nix (100%) rename plugins/{completion => }/cmp/sources/cmp-tabby.nix (100%) rename plugins/{completion => }/cmp/sources/cmp-tabnine.nix (100%) rename plugins/{completion => }/cmp/sources/copilot-cmp.nix (100%) rename plugins/{completion => }/cmp/sources/crates-nvim.nix (100%) rename plugins/{completion => }/cmp/sources/default.nix (100%) rename tests/test-sources/plugins/{completion/codeium-nvim.nix => by-name/codeium-nvim/default.nix} (100%) rename tests/test-sources/plugins/{completion/codeium-vim.nix => by-name/codeium-vim/default.nix} (100%) rename tests/test-sources/plugins/{completion/copilot-lua.nix => by-name/copilot-lua/default.nix} (100%) rename tests/test-sources/plugins/{completion/copilot-vim.nix => by-name/copilot-vim/default.nix} (100%) rename tests/test-sources/plugins/{completion/coq.nix => by-name/coq-nvim/default.nix} (100%) rename tests/test-sources/plugins/{completion/coq-thirdparty.nix => by-name/coq-thirdparty/default.nix} (100%) rename tests/test-sources/plugins/{completion/lspkind.nix => by-name/lspkind/default.nix} (100%) rename tests/test-sources/plugins/{completion/cmp-all-sources.nix => cmp/all-sources.nix} (100%) rename tests/test-sources/plugins/{completion => cmp}/cmp-ai.nix (100%) rename tests/test-sources/plugins/{completion => cmp}/cmp-async-path.nix (100%) rename tests/test-sources/plugins/{completion => cmp}/cmp-git.nix (100%) rename tests/test-sources/plugins/{completion => cmp}/cmp-tabby.nix (100%) rename tests/test-sources/plugins/{completion/cmp.nix => cmp/default.nix} (100%) 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/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/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/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 f3b8ea10..4a7c9fee 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,5 +1,7 @@ { imports = [ + ./cmp + ./colorschemes/ayu.nix ./colorschemes/base16 ./colorschemes/catppuccin.nix @@ -22,15 +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 - ./filetrees/chadtree.nix ./filetrees/neo-tree.nix ./filetrees/nvim-tree.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/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/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/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