From 5e9a6c00a95ed842467270246ccc2c0f0863e53c Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Sun, 22 Dec 2024 09:58:27 +0000 Subject: [PATCH] treewide: `neovim-plugin` -> `plugins` --- CONTRIBUTING.md | 2 +- flake-modules/dev/new-plugin.py | 2 +- plugins/TEMPLATE.nix | 2 +- plugins/by-name/aerial/default.nix | 2 +- plugins/by-name/arrow/default.nix | 2 +- plugins/by-name/auto-save/default.nix | 2 +- plugins/by-name/auto-session/default.nix | 2 +- plugins/by-name/avante/default.nix | 2 +- plugins/by-name/bacon/default.nix | 2 +- plugins/by-name/baleia/default.nix | 2 +- plugins/by-name/barbar/default.nix | 2 +- plugins/by-name/barbecue/default.nix | 2 +- plugins/by-name/better-escape/default.nix | 2 +- plugins/by-name/blink-cmp/default.nix | 2 +- plugins/by-name/bufferline/default.nix | 2 +- plugins/by-name/ccc/default.nix | 2 +- plugins/by-name/chadtree/default.nix | 2 +- plugins/by-name/chatgpt/default.nix | 2 +- plugins/by-name/clangd-extensions/default.nix | 2 +- plugins/by-name/clipboard-image/default.nix | 2 +- plugins/by-name/cloak/default.nix | 2 +- plugins/by-name/cmake-tools/default.nix | 2 +- plugins/by-name/cmp-ai/default.nix | 2 +- plugins/by-name/cmp-git/default.nix | 2 +- plugins/by-name/cmp-tabby/default.nix | 2 +- plugins/by-name/cmp-tabnine/default.nix | 2 +- plugins/by-name/codecompanion/default.nix | 2 +- plugins/by-name/codeium-nvim/default.nix | 2 +- plugins/by-name/codesnap/default.nix | 2 +- plugins/by-name/colorizer/default.nix | 2 +- plugins/by-name/comment-box/default.nix | 2 +- plugins/by-name/comment/default.nix | 2 +- plugins/by-name/competitest/default.nix | 2 +- plugins/by-name/compiler/default.nix | 2 +- plugins/by-name/conform-nvim/default.nix | 2 +- plugins/by-name/copilot-chat/default.nix | 2 +- plugins/by-name/copilot-cmp/default.nix | 2 +- plugins/by-name/copilot-lua/default.nix | 2 +- plugins/by-name/coq-nvim/default.nix | 2 +- plugins/by-name/coverage/default.nix | 2 +- plugins/by-name/crates/default.nix | 2 +- plugins/by-name/cursorline/default.nix | 2 +- plugins/by-name/dap-lldb/default.nix | 2 +- plugins/by-name/dap/dap-ui.nix | 2 +- plugins/by-name/dap/default.nix | 2 +- plugins/by-name/dashboard/default.nix | 2 +- plugins/by-name/debugprint/default.nix | 2 +- plugins/by-name/diffview/default.nix | 2 +- plugins/by-name/dotnet/default.nix | 2 +- plugins/by-name/dressing/default.nix | 2 +- plugins/by-name/edgy/default.nix | 2 +- plugins/by-name/fastaction/default.nix | 2 +- plugins/by-name/fidget/default.nix | 2 +- plugins/by-name/firenvim/default.nix | 2 +- plugins/by-name/flash/default.nix | 2 +- plugins/by-name/fzf-lua/default.nix | 2 +- plugins/by-name/git-conflict/default.nix | 2 +- plugins/by-name/gitblame/default.nix | 2 +- plugins/by-name/gitlab/default.nix | 2 +- plugins/by-name/gitlinker/default.nix | 2 +- plugins/by-name/gitsigns/default.nix | 2 +- plugins/by-name/glow/default.nix | 2 +- plugins/by-name/grug-far/default.nix | 2 +- plugins/by-name/guess-indent/default.nix | 2 +- plugins/by-name/hardtime/default.nix | 2 +- plugins/by-name/harpoon/default.nix | 2 +- plugins/by-name/headlines/default.nix | 2 +- plugins/by-name/helpview/default.nix | 2 +- plugins/by-name/hex/default.nix | 2 +- plugins/by-name/hmts/default.nix | 2 +- plugins/by-name/hop/default.nix | 2 +- plugins/by-name/hydra/default.nix | 2 +- plugins/by-name/idris2/default.nix | 2 +- plugins/by-name/illuminate/default.nix | 2 +- plugins/by-name/image/default.nix | 2 +- plugins/by-name/indent-blankline/default.nix | 2 +- plugins/by-name/indent-o-matic/default.nix | 2 +- plugins/by-name/jupytext/default.nix | 2 +- plugins/by-name/kulala/default.nix | 2 +- plugins/by-name/lastplace/default.nix | 2 +- plugins/by-name/lean/default.nix | 2 +- plugins/by-name/leap/default.nix | 2 +- plugins/by-name/lightline/default.nix | 2 +- plugins/by-name/lint/default.nix | 2 +- plugins/by-name/lsp-format/default.nix | 2 +- plugins/by-name/lsp-lines/default.nix | 2 +- plugins/by-name/lsp-signature/default.nix | 2 +- plugins/by-name/lsp-status/default.nix | 2 +- plugins/by-name/lspkind/default.nix | 2 +- plugins/by-name/lspsaga/default.nix | 2 +- plugins/by-name/ltex-extra/default.nix | 2 +- plugins/by-name/lualine/default.nix | 2 +- plugins/by-name/luasnip/default.nix | 2 +- plugins/by-name/mark-radar/default.nix | 2 +- plugins/by-name/marks/default.nix | 2 +- plugins/by-name/markview/default.nix | 2 +- plugins/by-name/mini/default.nix | 2 +- plugins/by-name/mkdnflow/default.nix | 2 +- plugins/by-name/multicursors/default.nix | 2 +- plugins/by-name/muren/default.nix | 2 +- plugins/by-name/navbuddy/default.nix | 2 +- plugins/by-name/navic/default.nix | 2 +- plugins/by-name/neo-tree/default.nix | 2 +- plugins/by-name/neoclip/default.nix | 2 +- plugins/by-name/neoconf/default.nix | 2 +- plugins/by-name/neocord/default.nix | 2 +- plugins/by-name/neogen/default.nix | 2 +- plugins/by-name/neogit/default.nix | 2 +- plugins/by-name/neorg/default.nix | 2 +- plugins/by-name/neoscroll/default.nix | 2 +- plugins/by-name/neotest/default.nix | 2 +- plugins/by-name/netman/default.nix | 2 +- plugins/by-name/nix-develop/default.nix | 2 +- plugins/by-name/noice/default.nix | 2 +- plugins/by-name/none-ls/default.nix | 2 +- plugins/by-name/notebook-navigator/default.nix | 2 +- plugins/by-name/notify/default.nix | 2 +- plugins/by-name/nui/default.nix | 2 +- plugins/by-name/nvim-autopairs/default.nix | 2 +- plugins/by-name/nvim-bqf/default.nix | 2 +- plugins/by-name/nvim-jdtls/default.nix | 2 +- plugins/by-name/nvim-lightbulb/default.nix | 2 +- plugins/by-name/nvim-snippets/default.nix | 2 +- plugins/by-name/nvim-surround/default.nix | 2 +- plugins/by-name/nvim-tree/default.nix | 2 +- plugins/by-name/nvim-ufo/default.nix | 2 +- plugins/by-name/obsidian/default.nix | 2 +- plugins/by-name/octo/default.nix | 2 +- plugins/by-name/oil/default.nix | 2 +- plugins/by-name/ollama/default.nix | 2 +- plugins/by-name/openscad/default.nix | 2 +- plugins/by-name/orgmode/default.nix | 2 +- plugins/by-name/otter/default.nix | 2 +- plugins/by-name/overseer/default.nix | 2 +- plugins/by-name/package-info/default.nix | 2 +- plugins/by-name/persisted/default.nix | 2 +- plugins/by-name/persistence/default.nix | 2 +- plugins/by-name/precognition/default.nix | 2 +- plugins/by-name/presence-nvim/default.nix | 2 +- plugins/by-name/preview/default.nix | 2 +- plugins/by-name/project-nvim/default.nix | 2 +- plugins/by-name/qmk/default.nix | 2 +- plugins/by-name/quarto/default.nix | 2 +- plugins/by-name/rainbow-delimiters/default.nix | 2 +- plugins/by-name/refactoring/default.nix | 2 +- plugins/by-name/remote-nvim/default.nix | 2 +- plugins/by-name/render-markdown/default.nix | 2 +- plugins/by-name/rest/default.nix | 2 +- plugins/by-name/rust-tools/default.nix | 2 +- plugins/by-name/rustaceanvim/default.nix | 2 +- plugins/by-name/scope/default.nix | 2 +- plugins/by-name/smart-splits/default.nix | 2 +- plugins/by-name/smartcolumn/default.nix | 2 +- plugins/by-name/snacks/default.nix | 2 +- plugins/by-name/sniprun/default.nix | 2 +- plugins/by-name/specs/default.nix | 2 +- plugins/by-name/spectre/default.nix | 2 +- plugins/by-name/spider/default.nix | 2 +- plugins/by-name/sqlite-lua/default.nix | 2 +- plugins/by-name/startup/default.nix | 2 +- plugins/by-name/statuscol/default.nix | 2 +- plugins/by-name/telekasten/default.nix | 2 +- plugins/by-name/telescope/default.nix | 2 +- plugins/by-name/tiny-devicons-auto-colors/default.nix | 2 +- plugins/by-name/todo-comments/default.nix | 2 +- plugins/by-name/toggleterm/default.nix | 2 +- plugins/by-name/transparent/default.nix | 2 +- plugins/by-name/treesitter-context/default.nix | 2 +- plugins/by-name/treesitter-textobjects/default.nix | 2 +- plugins/by-name/treesitter/default.nix | 2 +- plugins/by-name/trim/default.nix | 2 +- plugins/by-name/trouble/default.nix | 2 +- plugins/by-name/ts-autotag/default.nix | 2 +- plugins/by-name/ts-comments/default.nix | 2 +- plugins/by-name/ts-context-commentstring/default.nix | 2 +- plugins/by-name/twilight/default.nix | 2 +- plugins/by-name/typescript-tools/default.nix | 2 +- plugins/by-name/vim-be-good/default.nix | 2 +- plugins/by-name/virt-column/default.nix | 2 +- plugins/by-name/web-devicons/default.nix | 2 +- plugins/by-name/which-key/default.nix | 2 +- plugins/by-name/wilder/default.nix | 2 +- plugins/by-name/wrapping/default.nix | 2 +- plugins/by-name/wtf/default.nix | 2 +- plugins/by-name/yanky/default.nix | 2 +- plugins/by-name/yazi/default.nix | 2 +- plugins/by-name/zellij/default.nix | 2 +- plugins/by-name/zen-mode/default.nix | 2 +- plugins/by-name/zk/default.nix | 2 +- plugins/cmp/default.nix | 2 +- plugins/colorschemes/ayu.nix | 2 +- plugins/colorschemes/base16/default.nix | 2 +- plugins/colorschemes/catppuccin.nix | 2 +- plugins/colorschemes/cyberdream.nix | 2 +- plugins/colorschemes/dracula-nvim.nix | 2 +- plugins/colorschemes/gruvbox.nix | 2 +- plugins/colorschemes/kanagawa.nix | 2 +- plugins/colorschemes/modus.nix | 2 +- plugins/colorschemes/nightfox.nix | 2 +- plugins/colorschemes/onedark.nix | 2 +- plugins/colorschemes/palette.nix | 2 +- plugins/colorschemes/poimandres.nix | 2 +- plugins/colorschemes/rose-pine.nix | 2 +- plugins/colorschemes/tokyonight.nix | 2 +- plugins/colorschemes/vscode.nix | 2 +- plugins/pluginmanagers/lz-n.nix | 2 +- 206 files changed, 206 insertions(+), 206 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5e5c2275..b5e281ec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,7 +44,7 @@ To add a new plugin you need to do the following. For those, you should use the `lib.nixvim.vim-plugin.mkVimPlugin`.\ -> See [this plugin](plugins/utils/direnv.nix) for an example. - _neovim plugins_: They are configured through a `setup` function (`require('plugin').setup({opts})`).\ - For those, you should use the `lib.nixvim.neovim-plugin.mkNeovimPlugin`.\ + For those, you should use the `lib.nixvim.plugins.mkNeovimPlugin`.\ -> See the [template](plugins/TEMPLATE.nix). 3. Add the necessary arguments when calling either [`mkNeovimPlugin`](#mkneovimplugin) or [`mkVimPlugin`](#mkvimplugin) diff --git a/flake-modules/dev/new-plugin.py b/flake-modules/dev/new-plugin.py index 26f91904..cadab64a 100644 --- a/flake-modules/dev/new-plugin.py +++ b/flake-modules/dev/new-plugin.py @@ -7,7 +7,7 @@ from argparse import ArgumentParser # Template for default.nix # TODO: conditionally include parts of the template based on args default_nix_template = """{{ lib, ... }}: -lib.nixvim.neovim-plugin.mkNeovimPlugin {{ +lib.nixvim.plugins.mkNeovimPlugin {{ name = "{name}"; packPathName = "{originalName}"; package = "{package}"; diff --git a/plugins/TEMPLATE.nix b/plugins/TEMPLATE.nix index c074a1a9..a49b690e 100644 --- a/plugins/TEMPLATE.nix +++ b/plugins/TEMPLATE.nix @@ -2,7 +2,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "my-plugin"; moduleName = "my-plugin"; # TODO replace (or remove entirely if it is the same as `name`) packPathName = "my-plugin.nvim"; # TODO replace (or remove entirely if it is the same as `name`) diff --git a/plugins/by-name/aerial/default.nix b/plugins/by-name/aerial/default.nix index 4e1bb50b..542865d8 100644 --- a/plugins/by-name/aerial/default.nix +++ b/plugins/by-name/aerial/default.nix @@ -3,7 +3,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "aerial"; packPathName = "aerial.nvim"; package = "aerial-nvim"; diff --git a/plugins/by-name/arrow/default.nix b/plugins/by-name/arrow/default.nix index 31649e91..8aa1bc8b 100644 --- a/plugins/by-name/arrow/default.nix +++ b/plugins/by-name/arrow/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "arrow"; packPathName = "arrow.nvim"; package = "arrow-nvim"; diff --git a/plugins/by-name/auto-save/default.nix b/plugins/by-name/auto-save/default.nix index 247864a4..51dc03be 100644 --- a/plugins/by-name/auto-save/default.nix +++ b/plugins/by-name/auto-save/default.nix @@ -3,7 +3,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "auto-save"; packPathName = "auto-save.nvim"; package = "auto-save-nvim"; diff --git a/plugins/by-name/auto-session/default.nix b/plugins/by-name/auto-session/default.nix index 718677bc..22a06ef7 100644 --- a/plugins/by-name/auto-session/default.nix +++ b/plugins/by-name/auto-session/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "auto-session"; package = "auto-session"; diff --git a/plugins/by-name/avante/default.nix b/plugins/by-name/avante/default.nix index 28a6df75..1b5b475a 100644 --- a/plugins/by-name/avante/default.nix +++ b/plugins/by-name/avante/default.nix @@ -2,7 +2,7 @@ let inherit (lib.nixvim) defaultNullOpts mkNullOrOption'; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "avante"; packPathName = "avante.nvim"; package = "avante-nvim"; diff --git a/plugins/by-name/bacon/default.nix b/plugins/by-name/bacon/default.nix index 72a5e7ea..1c239db8 100644 --- a/plugins/by-name/bacon/default.nix +++ b/plugins/by-name/bacon/default.nix @@ -1,5 +1,5 @@ { lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "bacon"; package = "nvim-bacon"; maintainers = [ lib.maintainers.alisonjenkins ]; diff --git a/plugins/by-name/baleia/default.nix b/plugins/by-name/baleia/default.nix index 52b60924..936fbe3b 100644 --- a/plugins/by-name/baleia/default.nix +++ b/plugins/by-name/baleia/default.nix @@ -2,7 +2,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "baleia"; packPathName = "baleia.nvim"; package = "baleia-nvim"; diff --git a/plugins/by-name/barbar/default.nix b/plugins/by-name/barbar/default.nix index 22ac0a31..930b51fd 100644 --- a/plugins/by-name/barbar/default.nix +++ b/plugins/by-name/barbar/default.nix @@ -51,7 +51,7 @@ let orderByWindowNumber = "OrderByWindowNumber"; }; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "barbar"; packPathName = "barbar.nvim"; package = "barbar-nvim"; diff --git a/plugins/by-name/barbecue/default.nix b/plugins/by-name/barbecue/default.nix index 899a7b51..4dc98fdd 100644 --- a/plugins/by-name/barbecue/default.nix +++ b/plugins/by-name/barbecue/default.nix @@ -2,7 +2,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "barbecue"; packPathName = "barbecue.nvim"; package = "barbecue-nvim"; diff --git a/plugins/by-name/better-escape/default.nix b/plugins/by-name/better-escape/default.nix index de701d9b..bf67037a 100644 --- a/plugins/by-name/better-escape/default.nix +++ b/plugins/by-name/better-escape/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "better-escape"; packPathName = "better-escape.nvim"; moduleName = "better_escape"; diff --git a/plugins/by-name/blink-cmp/default.nix b/plugins/by-name/blink-cmp/default.nix index 108be07e..b5f1abed 100644 --- a/plugins/by-name/blink-cmp/default.nix +++ b/plugins/by-name/blink-cmp/default.nix @@ -6,7 +6,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "blink-cmp"; packPathName = "blink.cmp"; package = "blink-cmp"; diff --git a/plugins/by-name/bufferline/default.nix b/plugins/by-name/bufferline/default.nix index 76293a06..62d2a48c 100644 --- a/plugins/by-name/bufferline/default.nix +++ b/plugins/by-name/bufferline/default.nix @@ -8,7 +8,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts mkSettingsRenamedOptionModules; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "bufferline"; packPathName = "bufferline.nvim"; package = "bufferline-nvim"; diff --git a/plugins/by-name/ccc/default.nix b/plugins/by-name/ccc/default.nix index 1c5239df..6e86843e 100644 --- a/plugins/by-name/ccc/default.nix +++ b/plugins/by-name/ccc/default.nix @@ -3,7 +3,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "ccc"; packPathName = "ccc.nvim"; package = "ccc-nvim"; diff --git a/plugins/by-name/chadtree/default.nix b/plugins/by-name/chadtree/default.nix index 7bf52ac3..d2508cf0 100644 --- a/plugins/by-name/chadtree/default.nix +++ b/plugins/by-name/chadtree/default.nix @@ -12,7 +12,7 @@ let mkListStr = helpers.defaultNullOpts.mkNullable (types.listOf types.str); in { - options.plugins.chadtree = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.chadtree = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "chadtree"; package = lib.mkPackageOption pkgs "chadtree" { diff --git a/plugins/by-name/chatgpt/default.nix b/plugins/by-name/chatgpt/default.nix index c94e76fd..8cea857c 100644 --- a/plugins/by-name/chatgpt/default.nix +++ b/plugins/by-name/chatgpt/default.nix @@ -5,7 +5,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "chatgpt"; packPathName = "ChatGPT.nvim"; package = "ChatGPT-nvim"; diff --git a/plugins/by-name/clangd-extensions/default.nix b/plugins/by-name/clangd-extensions/default.nix index 9ef3452c..8299e5fa 100644 --- a/plugins/by-name/clangd-extensions/default.nix +++ b/plugins/by-name/clangd-extensions/default.nix @@ -95,7 +95,7 @@ in ] ); - options.plugins.clangd-extensions = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.clangd-extensions = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "clangd_extensions, plugins implementing clangd LSP extensions"; package = lib.mkPackageOption pkgs "clangd_extensions.nvim" { diff --git a/plugins/by-name/clipboard-image/default.nix b/plugins/by-name/clipboard-image/default.nix index fa885bcf..71c1ab1c 100644 --- a/plugins/by-name/clipboard-image/default.nix +++ b/plugins/by-name/clipboard-image/default.nix @@ -85,7 +85,7 @@ in { meta.maintainers = [ maintainers.GaetanLepage ]; - options.plugins.clipboard-image = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.clipboard-image = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "clipboard-image.nvim"; package = lib.mkPackageOption pkgs "clipboard-image.nvim" { diff --git a/plugins/by-name/cloak/default.nix b/plugins/by-name/cloak/default.nix index e24c8aef..43e41024 100644 --- a/plugins/by-name/cloak/default.nix +++ b/plugins/by-name/cloak/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "cloak"; packPathName = "cloak.nvim"; package = "cloak-nvim"; diff --git a/plugins/by-name/cmake-tools/default.nix b/plugins/by-name/cmake-tools/default.nix index 393d98ec..09096f75 100644 --- a/plugins/by-name/cmake-tools/default.nix +++ b/plugins/by-name/cmake-tools/default.nix @@ -2,7 +2,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "cmake-tools"; packPathName = "cmake-tools.nvim"; package = "cmake-tools-nvim"; diff --git a/plugins/by-name/cmp-ai/default.nix b/plugins/by-name/cmp-ai/default.nix index 0a1f55c8..aee2bd05 100644 --- a/plugins/by-name/cmp-ai/default.nix +++ b/plugins/by-name/cmp-ai/default.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "cmp-ai"; maintainers = [ lib.maintainers.GaetanLepage ]; diff --git a/plugins/by-name/cmp-git/default.nix b/plugins/by-name/cmp-git/default.nix index f11cf704..1c079ce1 100644 --- a/plugins/by-name/cmp-git/default.nix +++ b/plugins/by-name/cmp-git/default.nix @@ -2,7 +2,7 @@ lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "cmp-git"; moduleName = "cmp_git"; diff --git a/plugins/by-name/cmp-tabby/default.nix b/plugins/by-name/cmp-tabby/default.nix index 215d7fe6..fe5fdd8c 100644 --- a/plugins/by-name/cmp-tabby/default.nix +++ b/plugins/by-name/cmp-tabby/default.nix @@ -3,7 +3,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "cmp-tabby"; maintainers = [ lib.maintainers.GaetanLepage ]; diff --git a/plugins/by-name/cmp-tabnine/default.nix b/plugins/by-name/cmp-tabnine/default.nix index f671142e..2f5b37d0 100644 --- a/plugins/by-name/cmp-tabnine/default.nix +++ b/plugins/by-name/cmp-tabnine/default.nix @@ -3,7 +3,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "cmp-tabnine"; maintainers = [ lib.maintainers.GaetanLepage ]; diff --git a/plugins/by-name/codecompanion/default.nix b/plugins/by-name/codecompanion/default.nix index 60edaf81..fe6f54c3 100644 --- a/plugins/by-name/codecompanion/default.nix +++ b/plugins/by-name/codecompanion/default.nix @@ -7,7 +7,7 @@ let ; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "codecompanion"; packPathName = "codecompanion.nvim"; package = "codecompanion-nvim"; diff --git a/plugins/by-name/codeium-nvim/default.nix b/plugins/by-name/codeium-nvim/default.nix index b9a0acf9..01fdb962 100644 --- a/plugins/by-name/codeium-nvim/default.nix +++ b/plugins/by-name/codeium-nvim/default.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "codeium-nvim"; packPathName = "codeium.nvim"; moduleName = "codeium"; diff --git a/plugins/by-name/codesnap/default.nix b/plugins/by-name/codesnap/default.nix index 14a68d47..1244e31e 100644 --- a/plugins/by-name/codesnap/default.nix +++ b/plugins/by-name/codesnap/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "codesnap"; packPathName = "codesnap.nvim"; package = "codesnap-nvim"; diff --git a/plugins/by-name/colorizer/default.nix b/plugins/by-name/colorizer/default.nix index eb7b52e4..24d0aac8 100644 --- a/plugins/by-name/colorizer/default.nix +++ b/plugins/by-name/colorizer/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "colorizer"; packPathName = "nvim-colorizer.lua"; package = "nvim-colorizer-lua"; diff --git a/plugins/by-name/comment-box/default.nix b/plugins/by-name/comment-box/default.nix index ae5e8a41..ddd06ab9 100644 --- a/plugins/by-name/comment-box/default.nix +++ b/plugins/by-name/comment-box/default.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "comment-box"; packPathName = "comment-box.nvim"; package = "comment-box-nvim"; diff --git a/plugins/by-name/comment/default.nix b/plugins/by-name/comment/default.nix index e2379e1d..c45ec07d 100644 --- a/plugins/by-name/comment/default.nix +++ b/plugins/by-name/comment/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "comment"; packPathName = "Comment.nvim"; moduleName = "Comment"; diff --git a/plugins/by-name/competitest/default.nix b/plugins/by-name/competitest/default.nix index f4761ba3..d8fa258c 100644 --- a/plugins/by-name/competitest/default.nix +++ b/plugins/by-name/competitest/default.nix @@ -3,7 +3,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "competitest"; packPathName = "competitest.nvim"; package = "competitest-nvim"; diff --git a/plugins/by-name/compiler/default.nix b/plugins/by-name/compiler/default.nix index 6fcdcf1f..01742c78 100644 --- a/plugins/by-name/compiler/default.nix +++ b/plugins/by-name/compiler/default.nix @@ -2,7 +2,7 @@ lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "compiler"; packPathName = "compiler.nvim"; package = "compiler-nvim"; diff --git a/plugins/by-name/conform-nvim/default.nix b/plugins/by-name/conform-nvim/default.nix index cd8b872c..58879d0d 100644 --- a/plugins/by-name/conform-nvim/default.nix +++ b/plugins/by-name/conform-nvim/default.nix @@ -6,7 +6,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "conform-nvim"; moduleName = "conform"; packPathName = "conform.nvim"; diff --git a/plugins/by-name/copilot-chat/default.nix b/plugins/by-name/copilot-chat/default.nix index 10ecb65f..ee35a248 100644 --- a/plugins/by-name/copilot-chat/default.nix +++ b/plugins/by-name/copilot-chat/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "copilot-chat"; packPathName = "CopilotChat.nvim"; moduleName = "CopilotChat"; diff --git a/plugins/by-name/copilot-cmp/default.nix b/plugins/by-name/copilot-cmp/default.nix index 4ddc0472..cc823c32 100644 --- a/plugins/by-name/copilot-cmp/default.nix +++ b/plugins/by-name/copilot-cmp/default.nix @@ -3,7 +3,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "copilot-cmp"; moduleName = "copilot_cmp"; diff --git a/plugins/by-name/copilot-lua/default.nix b/plugins/by-name/copilot-lua/default.nix index 385bccbd..40e7c1bf 100644 --- a/plugins/by-name/copilot-lua/default.nix +++ b/plugins/by-name/copilot-lua/default.nix @@ -15,7 +15,7 @@ in let keymapOption = helpers.defaultNullOpts.mkNullable (with types; either (enum [ false ]) str); in - lib.nixvim.neovim-plugin.extraOptionsOptions + lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "copilot.lua"; diff --git a/plugins/by-name/coq-nvim/default.nix b/plugins/by-name/coq-nvim/default.nix index f9f7a6d3..5ba8f6a7 100644 --- a/plugins/by-name/coq-nvim/default.nix +++ b/plugins/by-name/coq-nvim/default.nix @@ -7,7 +7,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "coq-nvim"; packPathName = "coq_nvim"; package = "coq_nvim"; diff --git a/plugins/by-name/coverage/default.nix b/plugins/by-name/coverage/default.nix index 94b41c6b..605f001c 100644 --- a/plugins/by-name/coverage/default.nix +++ b/plugins/by-name/coverage/default.nix @@ -60,7 +60,7 @@ let }; in { - options.plugins.coverage = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.coverage = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "nvim-coverage"; package = lib.mkPackageOption pkgs "nvim-coverage" { diff --git a/plugins/by-name/crates/default.nix b/plugins/by-name/crates/default.nix index d443b3b4..17429adb 100644 --- a/plugins/by-name/crates/default.nix +++ b/plugins/by-name/crates/default.nix @@ -1,5 +1,5 @@ { lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "crates"; packPathName = "crates.nvim"; package = "crates-nvim"; diff --git a/plugins/by-name/cursorline/default.nix b/plugins/by-name/cursorline/default.nix index adf1bb17..4602e92c 100644 --- a/plugins/by-name/cursorline/default.nix +++ b/plugins/by-name/cursorline/default.nix @@ -10,7 +10,7 @@ let cfg = config.plugins.cursorline; in { - options.plugins.cursorline = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.cursorline = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "nvim-cursorline"; package = lib.mkPackageOption pkgs "nvim-cursorline" { diff --git a/plugins/by-name/dap-lldb/default.nix b/plugins/by-name/dap-lldb/default.nix index a1283b83..a43d9332 100644 --- a/plugins/by-name/dap-lldb/default.nix +++ b/plugins/by-name/dap-lldb/default.nix @@ -1,5 +1,5 @@ { lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "dap-lldb"; packPathName = "nvim-dap-lldb"; package = "nvim-dap-lldb"; diff --git a/plugins/by-name/dap/dap-ui.nix b/plugins/by-name/dap/dap-ui.nix index 19692fc3..606f10e3 100644 --- a/plugins/by-name/dap/dap-ui.nix +++ b/plugins/by-name/dap/dap-ui.nix @@ -56,7 +56,7 @@ let }; in { - options.plugins.dap.extensions.dap-ui = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.dap.extensions.dap-ui = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "dap-ui"; package = lib.mkPackageOption pkgs "dap-ui" { diff --git a/plugins/by-name/dap/default.nix b/plugins/by-name/dap/default.nix index d0236875..3cac28bd 100644 --- a/plugins/by-name/dap/default.nix +++ b/plugins/by-name/dap/default.nix @@ -19,7 +19,7 @@ with dapHelpers; ./dap-virtual-text.nix ]; - options.plugins.dap = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.dap = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "dap"; package = lib.mkPackageOption pkgs "dap" { diff --git a/plugins/by-name/dashboard/default.nix b/plugins/by-name/dashboard/default.nix index 5883de45..38fb33dc 100644 --- a/plugins/by-name/dashboard/default.nix +++ b/plugins/by-name/dashboard/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "dashboard"; packPathName = "dashboard-nvim"; package = "dashboard-nvim"; diff --git a/plugins/by-name/debugprint/default.nix b/plugins/by-name/debugprint/default.nix index 6807369b..4ddc7b8f 100644 --- a/plugins/by-name/debugprint/default.nix +++ b/plugins/by-name/debugprint/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "debugprint"; packPathName = "debugprint.nvim"; package = "debugprint-nvim"; diff --git a/plugins/by-name/diffview/default.nix b/plugins/by-name/diffview/default.nix index 7c027f5b..4ef172da 100644 --- a/plugins/by-name/diffview/default.nix +++ b/plugins/by-name/diffview/default.nix @@ -83,7 +83,7 @@ in { options.plugins.diffview = with helpers.defaultNullOpts; - lib.nixvim.neovim-plugin.extraOptionsOptions + lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "diffview"; diff --git a/plugins/by-name/dotnet/default.nix b/plugins/by-name/dotnet/default.nix index 2bdee2bb..3707fd1c 100644 --- a/plugins/by-name/dotnet/default.nix +++ b/plugins/by-name/dotnet/default.nix @@ -1,5 +1,5 @@ { lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "dotnet"; packPathName = "dotnet.nvim"; package = "dotnet-nvim"; diff --git a/plugins/by-name/dressing/default.nix b/plugins/by-name/dressing/default.nix index 3de4beb9..70ef84ca 100644 --- a/plugins/by-name/dressing/default.nix +++ b/plugins/by-name/dressing/default.nix @@ -3,7 +3,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "dressing"; packPathName = "dressing.nvim"; package = "dressing-nvim"; diff --git a/plugins/by-name/edgy/default.nix b/plugins/by-name/edgy/default.nix index 5c31b7a6..5a58028a 100644 --- a/plugins/by-name/edgy/default.nix +++ b/plugins/by-name/edgy/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "edgy"; packPathName = "edgy.nvim"; package = "edgy-nvim"; diff --git a/plugins/by-name/fastaction/default.nix b/plugins/by-name/fastaction/default.nix index 4401d79e..59b6ba8e 100644 --- a/plugins/by-name/fastaction/default.nix +++ b/plugins/by-name/fastaction/default.nix @@ -3,7 +3,7 @@ let inherit (lib.nixvim) defaultNullOpts mkNullOrStr'; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "fastaction"; packPathName = "fastaction.nvim"; package = "fastaction-nvim"; diff --git a/plugins/by-name/fidget/default.nix b/plugins/by-name/fidget/default.nix index a88cc793..b31c678e 100644 --- a/plugins/by-name/fidget/default.nix +++ b/plugins/by-name/fidget/default.nix @@ -142,7 +142,7 @@ in ]; options = { - plugins.fidget = lib.nixvim.neovim-plugin.extraOptionsOptions // { + plugins.fidget = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "fidget-nvim"; package = lib.mkPackageOption pkgs "fidget-nvim" { diff --git a/plugins/by-name/firenvim/default.nix b/plugins/by-name/firenvim/default.nix index 616e74e9..90cf3784 100644 --- a/plugins/by-name/firenvim/default.nix +++ b/plugins/by-name/firenvim/default.nix @@ -8,7 +8,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "firenvim"; maintainers = with lib.maintainers; [ GaetanLepage ]; diff --git a/plugins/by-name/flash/default.nix b/plugins/by-name/flash/default.nix index f05afb3b..91f5430d 100644 --- a/plugins/by-name/flash/default.nix +++ b/plugins/by-name/flash/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "flash"; packPathName = "flash.nvim"; package = "flash-nvim"; diff --git a/plugins/by-name/fzf-lua/default.nix b/plugins/by-name/fzf-lua/default.nix index 3ae7c0f1..92330dd4 100644 --- a/plugins/by-name/fzf-lua/default.nix +++ b/plugins/by-name/fzf-lua/default.nix @@ -31,7 +31,7 @@ let }; }; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "fzf-lua"; maintainers = [ maintainers.GaetanLepage ]; diff --git a/plugins/by-name/git-conflict/default.nix b/plugins/by-name/git-conflict/default.nix index 6298d02b..9cec866e 100644 --- a/plugins/by-name/git-conflict/default.nix +++ b/plugins/by-name/git-conflict/default.nix @@ -5,7 +5,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "git-conflict"; packPathName = "git-conflict.nvim"; package = "git-conflict-nvim"; diff --git a/plugins/by-name/gitblame/default.nix b/plugins/by-name/gitblame/default.nix index 684b43ed..15bab057 100644 --- a/plugins/by-name/gitblame/default.nix +++ b/plugins/by-name/gitblame/default.nix @@ -7,7 +7,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "gitblame"; packPathName = "git-blame.nvim"; package = "git-blame-nvim"; diff --git a/plugins/by-name/gitlab/default.nix b/plugins/by-name/gitlab/default.nix index c7bf9197..48c1f1f0 100644 --- a/plugins/by-name/gitlab/default.nix +++ b/plugins/by-name/gitlab/default.nix @@ -7,7 +7,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "gitlab"; packPathName = "gitlab.vim"; package = "gitlab-vim"; diff --git a/plugins/by-name/gitlinker/default.nix b/plugins/by-name/gitlinker/default.nix index 7dcc1ece..63765c4a 100644 --- a/plugins/by-name/gitlinker/default.nix +++ b/plugins/by-name/gitlinker/default.nix @@ -7,7 +7,7 @@ }: with lib; { - options.plugins.gitlinker = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.gitlinker = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "gitlinker.nvim"; package = lib.mkPackageOption pkgs "gitlinker.nvim" { diff --git a/plugins/by-name/gitsigns/default.nix b/plugins/by-name/gitsigns/default.nix index af88be52..527c8f1c 100644 --- a/plugins/by-name/gitsigns/default.nix +++ b/plugins/by-name/gitsigns/default.nix @@ -6,7 +6,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "gitsigns"; packPathName = "gitsigns.nvim"; package = "gitsigns-nvim"; diff --git a/plugins/by-name/glow/default.nix b/plugins/by-name/glow/default.nix index 34ff062b..d1b6acd2 100644 --- a/plugins/by-name/glow/default.nix +++ b/plugins/by-name/glow/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "glow"; packPathName = "glow.nvim"; package = "glow-nvim"; diff --git a/plugins/by-name/grug-far/default.nix b/plugins/by-name/grug-far/default.nix index ce640cb4..69e4bd12 100644 --- a/plugins/by-name/grug-far/default.nix +++ b/plugins/by-name/grug-far/default.nix @@ -1,5 +1,5 @@ { lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "grug-far"; packPathName = "grug-far.nvim"; package = "grug-far-nvim"; diff --git a/plugins/by-name/guess-indent/default.nix b/plugins/by-name/guess-indent/default.nix index 55fd5950..05ba031a 100644 --- a/plugins/by-name/guess-indent/default.nix +++ b/plugins/by-name/guess-indent/default.nix @@ -3,7 +3,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "guess-indent"; packPathName = "guess-indent.nvim"; package = "guess-indent-nvim"; diff --git a/plugins/by-name/hardtime/default.nix b/plugins/by-name/hardtime/default.nix index 74217128..da6cbd2a 100644 --- a/plugins/by-name/hardtime/default.nix +++ b/plugins/by-name/hardtime/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "hardtime"; packPathName = "hardtime.nvim"; package = "hardtime-nvim"; diff --git a/plugins/by-name/harpoon/default.nix b/plugins/by-name/harpoon/default.nix index 6826d748..ce073cbc 100644 --- a/plugins/by-name/harpoon/default.nix +++ b/plugins/by-name/harpoon/default.nix @@ -22,7 +22,7 @@ let }; in { - options.plugins.harpoon = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.harpoon = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "harpoon"; package = lib.mkPackageOption pkgs "harpoon" { diff --git a/plugins/by-name/headlines/default.nix b/plugins/by-name/headlines/default.nix index e9cf963f..7896e1be 100644 --- a/plugins/by-name/headlines/default.nix +++ b/plugins/by-name/headlines/default.nix @@ -5,7 +5,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "headlines"; packPathName = "headlines.nvim"; package = "headlines-nvim"; diff --git a/plugins/by-name/helpview/default.nix b/plugins/by-name/helpview/default.nix index 84a2cdba..5ca4e219 100644 --- a/plugins/by-name/helpview/default.nix +++ b/plugins/by-name/helpview/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "helpview"; packPathName = "helpview.nvim"; package = "helpview-nvim"; diff --git a/plugins/by-name/hex/default.nix b/plugins/by-name/hex/default.nix index cde21a8a..292deab6 100644 --- a/plugins/by-name/hex/default.nix +++ b/plugins/by-name/hex/default.nix @@ -2,7 +2,7 @@ let inherit (lib.nixvim) defaultNullOpts mkNullOrLuaFn; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "hex"; packPathName = "hex.nvim"; package = "hex-nvim"; diff --git a/plugins/by-name/hmts/default.nix b/plugins/by-name/hmts/default.nix index 65539fc6..b8d4e199 100644 --- a/plugins/by-name/hmts/default.nix +++ b/plugins/by-name/hmts/default.nix @@ -3,7 +3,7 @@ config, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "hmts"; packPathName = "hmts.nvim"; package = "hmts-nvim"; diff --git a/plugins/by-name/hop/default.nix b/plugins/by-name/hop/default.nix index 2a28424c..f3c0494a 100644 --- a/plugins/by-name/hop/default.nix +++ b/plugins/by-name/hop/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "hop"; packPathName = "hop.nvim"; package = "hop-nvim"; diff --git a/plugins/by-name/hydra/default.nix b/plugins/by-name/hydra/default.nix index 94f09611..0e2702aa 100644 --- a/plugins/by-name/hydra/default.nix +++ b/plugins/by-name/hydra/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "hydra"; packPathName = "hydra.nvim"; package = "hydra-nvim"; diff --git a/plugins/by-name/idris2/default.nix b/plugins/by-name/idris2/default.nix index 03fd467e..0773c6e7 100644 --- a/plugins/by-name/idris2/default.nix +++ b/plugins/by-name/idris2/default.nix @@ -3,7 +3,7 @@ lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "idris2"; packPathName = "idris2"; package = "idris2-nvim"; diff --git a/plugins/by-name/illuminate/default.nix b/plugins/by-name/illuminate/default.nix index c7e66c32..277292f4 100644 --- a/plugins/by-name/illuminate/default.nix +++ b/plugins/by-name/illuminate/default.nix @@ -83,7 +83,7 @@ in options.plugins.illuminate = with helpers; with defaultNullOpts; - lib.nixvim.neovim-plugin.extraOptionsOptions + lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "vim-illuminate"; diff --git a/plugins/by-name/image/default.nix b/plugins/by-name/image/default.nix index 3a4d55b2..cf5fd346 100644 --- a/plugins/by-name/image/default.nix +++ b/plugins/by-name/image/default.nix @@ -12,7 +12,7 @@ in { meta.maintainers = [ maintainers.GaetanLepage ]; - options.plugins.image = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.image = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "image.nvim"; package = lib.mkPackageOption pkgs "image.nvim" { diff --git a/plugins/by-name/indent-blankline/default.nix b/plugins/by-name/indent-blankline/default.nix index 03a91beb..b69e973a 100644 --- a/plugins/by-name/indent-blankline/default.nix +++ b/plugins/by-name/indent-blankline/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "indent-blankline"; packPathName = "indent-blankline.nvim"; moduleName = "ibl"; diff --git a/plugins/by-name/indent-o-matic/default.nix b/plugins/by-name/indent-o-matic/default.nix index e032ee9c..2a08d936 100644 --- a/plugins/by-name/indent-o-matic/default.nix +++ b/plugins/by-name/indent-o-matic/default.nix @@ -3,7 +3,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "indent-o-matic"; maintainers = [ lib.maintainers.alisonjenkins ]; settingsOptions = { diff --git a/plugins/by-name/jupytext/default.nix b/plugins/by-name/jupytext/default.nix index 901c17f9..ad47d60f 100644 --- a/plugins/by-name/jupytext/default.nix +++ b/plugins/by-name/jupytext/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "jupytext"; packPathName = "jupytext.nvim"; package = "jupytext-nvim"; diff --git a/plugins/by-name/kulala/default.nix b/plugins/by-name/kulala/default.nix index 470175dd..cf2c6053 100644 --- a/plugins/by-name/kulala/default.nix +++ b/plugins/by-name/kulala/default.nix @@ -3,7 +3,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "kulala"; packPathName = "kulala.nvim"; package = "kulala-nvim"; diff --git a/plugins/by-name/lastplace/default.nix b/plugins/by-name/lastplace/default.nix index e00dc39c..29a42f56 100644 --- a/plugins/by-name/lastplace/default.nix +++ b/plugins/by-name/lastplace/default.nix @@ -10,7 +10,7 @@ let in with lib; { - options.plugins.lastplace = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.lastplace = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "lastplace"; package = lib.mkPackageOption pkgs "lastplace" { diff --git a/plugins/by-name/lean/default.nix b/plugins/by-name/lean/default.nix index 4eddcaf1..5de69fd0 100644 --- a/plugins/by-name/lean/default.nix +++ b/plugins/by-name/lean/default.nix @@ -10,7 +10,7 @@ let cfg = config.plugins.lean; in { - options.plugins.lean = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.lean = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "lean-nvim"; package = lib.mkPackageOption pkgs "lean-nvim" { diff --git a/plugins/by-name/leap/default.nix b/plugins/by-name/leap/default.nix index b06debe8..7a43535c 100644 --- a/plugins/by-name/leap/default.nix +++ b/plugins/by-name/leap/default.nix @@ -10,7 +10,7 @@ let cfg = config.plugins.leap; in { - options.plugins.leap = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.leap = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "leap.nvim"; package = lib.mkPackageOption pkgs "leap.nvim" { diff --git a/plugins/by-name/lightline/default.nix b/plugins/by-name/lightline/default.nix index cc4ab0b9..0927ceb5 100644 --- a/plugins/by-name/lightline/default.nix +++ b/plugins/by-name/lightline/default.nix @@ -7,7 +7,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "lightline"; packPathName = "lightline.vim"; package = "lightline-vim"; diff --git a/plugins/by-name/lint/default.nix b/plugins/by-name/lint/default.nix index 86f0c3f7..3dbeff08 100644 --- a/plugins/by-name/lint/default.nix +++ b/plugins/by-name/lint/default.nix @@ -133,7 +133,7 @@ let }; in { - options.plugins.lint = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.lint = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "nvim-lint"; package = lib.mkPackageOption pkgs "nvim-lint" { diff --git a/plugins/by-name/lsp-format/default.nix b/plugins/by-name/lsp-format/default.nix index ff205a19..f65b8ba9 100644 --- a/plugins/by-name/lsp-format/default.nix +++ b/plugins/by-name/lsp-format/default.nix @@ -3,7 +3,7 @@ config, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "lsp-format"; packPathName = "lsp-format.nvim"; package = "lsp-format-nvim"; diff --git a/plugins/by-name/lsp-lines/default.nix b/plugins/by-name/lsp-lines/default.nix index e6c5b2ab..fa02e497 100644 --- a/plugins/by-name/lsp-lines/default.nix +++ b/plugins/by-name/lsp-lines/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "lsp-lines"; moduleName = "lsp_lines"; packPathName = "lsp_lines.nvim"; diff --git a/plugins/by-name/lsp-signature/default.nix b/plugins/by-name/lsp-signature/default.nix index e01bcb03..72212b38 100644 --- a/plugins/by-name/lsp-signature/default.nix +++ b/plugins/by-name/lsp-signature/default.nix @@ -2,7 +2,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "lsp-signature"; packPathName = "lsp_signature.nvim"; package = "lsp_signature-nvim"; diff --git a/plugins/by-name/lsp-status/default.nix b/plugins/by-name/lsp-status/default.nix index adf40b7c..c1fe47cb 100644 --- a/plugins/by-name/lsp-status/default.nix +++ b/plugins/by-name/lsp-status/default.nix @@ -7,7 +7,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "lsp-status"; packPathName = "lsp-status.nvim"; package = "lsp-status-nvim"; diff --git a/plugins/by-name/lspkind/default.nix b/plugins/by-name/lspkind/default.nix index df3716f8..b6f1f724 100644 --- a/plugins/by-name/lspkind/default.nix +++ b/plugins/by-name/lspkind/default.nix @@ -10,7 +10,7 @@ let cfg = config.plugins.lspkind; in { - options.plugins.lspkind = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.lspkind = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "lspkind.nvim"; package = lib.mkPackageOption pkgs "lspkind" { diff --git a/plugins/by-name/lspsaga/default.nix b/plugins/by-name/lspsaga/default.nix index 36d7cbee..ca99307a 100644 --- a/plugins/by-name/lspsaga/default.nix +++ b/plugins/by-name/lspsaga/default.nix @@ -47,7 +47,7 @@ in ]; options = { - plugins.lspsaga = lib.nixvim.neovim-plugin.extraOptionsOptions // { + plugins.lspsaga = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "lspsaga.nvim"; package = lib.mkPackageOption pkgs "lspsaga" { diff --git a/plugins/by-name/ltex-extra/default.nix b/plugins/by-name/ltex-extra/default.nix index 5ea867cd..c505cf39 100644 --- a/plugins/by-name/ltex-extra/default.nix +++ b/plugins/by-name/ltex-extra/default.nix @@ -5,7 +5,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "ltex-extra"; packPathName = "ltex_extra.nvim"; package = "ltex_extra-nvim"; diff --git a/plugins/by-name/lualine/default.nix b/plugins/by-name/lualine/default.nix index 4f24e591..8598f806 100644 --- a/plugins/by-name/lualine/default.nix +++ b/plugins/by-name/lualine/default.nix @@ -7,7 +7,7 @@ let inherit (lib.nixvim) defaultNullOpts mkSettingsRenamedOptionModules; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "lualine"; packPathName = "lualine.nvim"; package = "lualine-nvim"; diff --git a/plugins/by-name/luasnip/default.nix b/plugins/by-name/luasnip/default.nix index 1c080d4a..10fd2f10 100644 --- a/plugins/by-name/luasnip/default.nix +++ b/plugins/by-name/luasnip/default.nix @@ -43,7 +43,7 @@ let }; }; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "luasnip"; package = "luasnip"; setup = ".config.setup"; diff --git a/plugins/by-name/mark-radar/default.nix b/plugins/by-name/mark-radar/default.nix index e0c40685..4846a7ac 100644 --- a/plugins/by-name/mark-radar/default.nix +++ b/plugins/by-name/mark-radar/default.nix @@ -10,7 +10,7 @@ let cfg = config.plugins.mark-radar; in { - options.plugins.mark-radar = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.mark-radar = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "mark-radar"; package = lib.mkPackageOption pkgs "mark-radar" { diff --git a/plugins/by-name/marks/default.nix b/plugins/by-name/marks/default.nix index 8034571c..816261c0 100644 --- a/plugins/by-name/marks/default.nix +++ b/plugins/by-name/marks/default.nix @@ -12,7 +12,7 @@ in { meta.maintainers = [ maintainers.GaetanLepage ]; - options.plugins.marks = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.marks = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "marks.nvim"; package = lib.mkPackageOption pkgs "marks.nvim" { diff --git a/plugins/by-name/markview/default.nix b/plugins/by-name/markview/default.nix index 3e60661b..1272b0a7 100644 --- a/plugins/by-name/markview/default.nix +++ b/plugins/by-name/markview/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "markview"; packPathName = "markview.nvim"; package = "markview-nvim"; diff --git a/plugins/by-name/mini/default.nix b/plugins/by-name/mini/default.nix index ce91a7c4..d2a9d320 100644 --- a/plugins/by-name/mini/default.nix +++ b/plugins/by-name/mini/default.nix @@ -2,7 +2,7 @@ lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "mini"; packPathName = "mini.nvim"; # Just want it before most other plugins for the icons provider. diff --git a/plugins/by-name/mkdnflow/default.nix b/plugins/by-name/mkdnflow/default.nix index 8b17520d..d7b43c11 100644 --- a/plugins/by-name/mkdnflow/default.nix +++ b/plugins/by-name/mkdnflow/default.nix @@ -10,7 +10,7 @@ let cfg = config.plugins.mkdnflow; in { - options.plugins.mkdnflow = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.mkdnflow = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "mkdnflow.nvim"; package = lib.mkPackageOption pkgs "mkdnflow.nvim" { diff --git a/plugins/by-name/multicursors/default.nix b/plugins/by-name/multicursors/default.nix index ef1b6a29..8f74daa8 100644 --- a/plugins/by-name/multicursors/default.nix +++ b/plugins/by-name/multicursors/default.nix @@ -45,7 +45,7 @@ let in { options = { - plugins.multicursors = lib.nixvim.neovim-plugin.extraOptionsOptions // { + plugins.multicursors = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "multicursors.nvim"; package = lib.mkPackageOption pkgs "multicursors.nvim" { diff --git a/plugins/by-name/muren/default.nix b/plugins/by-name/muren/default.nix index ab4e79a4..90bf41dc 100644 --- a/plugins/by-name/muren/default.nix +++ b/plugins/by-name/muren/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "muren"; packPathName = "muren.nvim"; package = "muren-nvim"; diff --git a/plugins/by-name/navbuddy/default.nix b/plugins/by-name/navbuddy/default.nix index 852cc52d..befaf70e 100644 --- a/plugins/by-name/navbuddy/default.nix +++ b/plugins/by-name/navbuddy/default.nix @@ -13,7 +13,7 @@ let mkPercentageOpt = default: helpers.defaultNullOpts.mkNullable percentageType (toString default); in { - options.plugins.navbuddy = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.navbuddy = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "nvim-navbuddy"; package = lib.mkPackageOption pkgs "nvim-navbuddy" { diff --git a/plugins/by-name/navic/default.nix b/plugins/by-name/navic/default.nix index 7948519d..0810f1de 100644 --- a/plugins/by-name/navic/default.nix +++ b/plugins/by-name/navic/default.nix @@ -2,7 +2,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "navic"; packPathName = "nvim-navic"; moduleName = "nvim-navic"; diff --git a/plugins/by-name/neo-tree/default.nix b/plugins/by-name/neo-tree/default.nix index d8d36285..2e2d6598 100644 --- a/plugins/by-name/neo-tree/default.nix +++ b/plugins/by-name/neo-tree/default.nix @@ -52,7 +52,7 @@ in ''; }; in - lib.nixvim.neovim-plugin.extraOptionsOptions + lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "neo-tree"; diff --git a/plugins/by-name/neoclip/default.nix b/plugins/by-name/neoclip/default.nix index 28a037d7..42e593be 100644 --- a/plugins/by-name/neoclip/default.nix +++ b/plugins/by-name/neoclip/default.nix @@ -6,7 +6,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "neoclip"; packPathName = "nvim-neoclip.lua"; package = "nvim-neoclip-lua"; diff --git a/plugins/by-name/neoconf/default.nix b/plugins/by-name/neoconf/default.nix index abf2a6c9..7c972e50 100644 --- a/plugins/by-name/neoconf/default.nix +++ b/plugins/by-name/neoconf/default.nix @@ -2,7 +2,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "neoconf"; packPathName = "neoconf.nvim"; package = "neoconf-nvim"; diff --git a/plugins/by-name/neocord/default.nix b/plugins/by-name/neocord/default.nix index 68ef1550..d046b5fa 100644 --- a/plugins/by-name/neocord/default.nix +++ b/plugins/by-name/neocord/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "neocord"; maintainers = [ ]; diff --git a/plugins/by-name/neogen/default.nix b/plugins/by-name/neogen/default.nix index 8b2d87d9..aaebc5d8 100644 --- a/plugins/by-name/neogen/default.nix +++ b/plugins/by-name/neogen/default.nix @@ -44,7 +44,7 @@ let }; in { - options.plugins.neogen = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.neogen = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "neogen"; package = lib.mkPackageOption pkgs "neogen" { diff --git a/plugins/by-name/neogit/default.nix b/plugins/by-name/neogit/default.nix index 9b7b4e8b..796f7d85 100644 --- a/plugins/by-name/neogit/default.nix +++ b/plugins/by-name/neogit/default.nix @@ -6,7 +6,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "neogit"; maintainers = [ maintainers.GaetanLepage ]; diff --git a/plugins/by-name/neorg/default.nix b/plugins/by-name/neorg/default.nix index 65f71b3f..22005178 100644 --- a/plugins/by-name/neorg/default.nix +++ b/plugins/by-name/neorg/default.nix @@ -13,7 +13,7 @@ let ; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "neorg"; maintainers = [ lib.maintainers.GaetanLepage ]; diff --git a/plugins/by-name/neoscroll/default.nix b/plugins/by-name/neoscroll/default.nix index 141467d0..2a7e588f 100644 --- a/plugins/by-name/neoscroll/default.nix +++ b/plugins/by-name/neoscroll/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "neoscroll"; packPathName = "neoscroll.nvim"; package = "neoscroll-nvim"; diff --git a/plugins/by-name/neotest/default.nix b/plugins/by-name/neotest/default.nix index cbbf115e..29b6857c 100644 --- a/plugins/by-name/neotest/default.nix +++ b/plugins/by-name/neotest/default.nix @@ -3,7 +3,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "neotest"; maintainers = [ maintainers.GaetanLepage ]; diff --git a/plugins/by-name/netman/default.nix b/plugins/by-name/netman/default.nix index 3427422f..f954b4d5 100644 --- a/plugins/by-name/netman/default.nix +++ b/plugins/by-name/netman/default.nix @@ -2,7 +2,7 @@ lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "netman"; packPathName = "netman.nvim"; package = "netman-nvim"; diff --git a/plugins/by-name/nix-develop/default.nix b/plugins/by-name/nix-develop/default.nix index e816b94c..a5cb5a66 100644 --- a/plugins/by-name/nix-develop/default.nix +++ b/plugins/by-name/nix-develop/default.nix @@ -3,7 +3,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts toLuaObject; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "nix-develop"; packPathName = "nix-develop.nvim"; package = "nix-develop-nvim"; diff --git a/plugins/by-name/noice/default.nix b/plugins/by-name/noice/default.nix index ad9d3002..5f763ddb 100644 --- a/plugins/by-name/noice/default.nix +++ b/plugins/by-name/noice/default.nix @@ -6,7 +6,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "noice"; packPathName = "noice.nvim"; package = "noice-nvim"; diff --git a/plugins/by-name/none-ls/default.nix b/plugins/by-name/none-ls/default.nix index 5b5c3248..c0e328cc 100644 --- a/plugins/by-name/none-ls/default.nix +++ b/plugins/by-name/none-ls/default.nix @@ -4,7 +4,7 @@ options, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "none-ls"; packPathName = "none-ls.nvim"; moduleName = "null-ls"; diff --git a/plugins/by-name/notebook-navigator/default.nix b/plugins/by-name/notebook-navigator/default.nix index e5c03db3..597630cd 100644 --- a/plugins/by-name/notebook-navigator/default.nix +++ b/plugins/by-name/notebook-navigator/default.nix @@ -3,7 +3,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "notebook-navigator"; packPathName = "NotebookNavigator-nvim"; package = "NotebookNavigator-nvim"; diff --git a/plugins/by-name/notify/default.nix b/plugins/by-name/notify/default.nix index 5b910ec3..f6dbcf5d 100644 --- a/plugins/by-name/notify/default.nix +++ b/plugins/by-name/notify/default.nix @@ -10,7 +10,7 @@ let cfg = config.plugins.notify; in { - options.plugins.notify = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.notify = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "nvim-notify"; package = lib.mkPackageOption pkgs "nvim-notify" { diff --git a/plugins/by-name/nui/default.nix b/plugins/by-name/nui/default.nix index 0feed62d..cea5428f 100644 --- a/plugins/by-name/nui/default.nix +++ b/plugins/by-name/nui/default.nix @@ -1,5 +1,5 @@ { lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "nui"; packPathName = "nui.nvim"; package = "nui-nvim"; diff --git a/plugins/by-name/nvim-autopairs/default.nix b/plugins/by-name/nvim-autopairs/default.nix index 216e8b1c..76a13118 100644 --- a/plugins/by-name/nvim-autopairs/default.nix +++ b/plugins/by-name/nvim-autopairs/default.nix @@ -5,7 +5,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "nvim-autopairs"; maintainers = [ maintainers.GaetanLepage ]; diff --git a/plugins/by-name/nvim-bqf/default.nix b/plugins/by-name/nvim-bqf/default.nix index d203a37f..62a7d352 100644 --- a/plugins/by-name/nvim-bqf/default.nix +++ b/plugins/by-name/nvim-bqf/default.nix @@ -10,7 +10,7 @@ let cfg = config.plugins.nvim-bqf; in { - options.plugins.nvim-bqf = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.nvim-bqf = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "nvim-bqf"; package = lib.mkPackageOption pkgs "nvim-bqf" { diff --git a/plugins/by-name/nvim-jdtls/default.nix b/plugins/by-name/nvim-jdtls/default.nix index fe831ba8..dbeb4f46 100644 --- a/plugins/by-name/nvim-jdtls/default.nix +++ b/plugins/by-name/nvim-jdtls/default.nix @@ -10,7 +10,7 @@ let cfg = config.plugins.nvim-jdtls; in { - options.plugins.nvim-jdtls = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.nvim-jdtls = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "nvim-jdtls"; package = lib.mkPackageOption pkgs "nvim-jdtls" { diff --git a/plugins/by-name/nvim-lightbulb/default.nix b/plugins/by-name/nvim-lightbulb/default.nix index 607dc13f..3fe46531 100644 --- a/plugins/by-name/nvim-lightbulb/default.nix +++ b/plugins/by-name/nvim-lightbulb/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "nvim-lightbulb"; maintainers = [ maintainers.GaetanLepage ]; diff --git a/plugins/by-name/nvim-snippets/default.nix b/plugins/by-name/nvim-snippets/default.nix index ae27ed76..f9327272 100644 --- a/plugins/by-name/nvim-snippets/default.nix +++ b/plugins/by-name/nvim-snippets/default.nix @@ -6,7 +6,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "nvim-snippets"; moduleName = "snippets"; diff --git a/plugins/by-name/nvim-surround/default.nix b/plugins/by-name/nvim-surround/default.nix index 04e88172..164e4dad 100644 --- a/plugins/by-name/nvim-surround/default.nix +++ b/plugins/by-name/nvim-surround/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "nvim-surround"; packPathName = "nvim-surround"; package = "nvim-surround"; diff --git a/plugins/by-name/nvim-tree/default.nix b/plugins/by-name/nvim-tree/default.nix index b14c726f..d858746c 100644 --- a/plugins/by-name/nvim-tree/default.nix +++ b/plugins/by-name/nvim-tree/default.nix @@ -36,7 +36,7 @@ in "hideRootFolder" ] "Set `plugins.nvim-tree.renderer.rootFolderLabel` to `false` to hide the root folder.") ]; - options.plugins.nvim-tree = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.nvim-tree = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "nvim-tree"; package = lib.mkPackageOption pkgs "nvim-tree" { diff --git a/plugins/by-name/nvim-ufo/default.nix b/plugins/by-name/nvim-ufo/default.nix index 43d72316..2edda413 100644 --- a/plugins/by-name/nvim-ufo/default.nix +++ b/plugins/by-name/nvim-ufo/default.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "nvim-ufo"; moduleName = "ufo"; package = "nvim-ufo"; diff --git a/plugins/by-name/obsidian/default.nix b/plugins/by-name/obsidian/default.nix index 1218f437..55733515 100644 --- a/plugins/by-name/obsidian/default.nix +++ b/plugins/by-name/obsidian/default.nix @@ -5,7 +5,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "obsidian"; packPathName = "obsidian.nvim"; package = "obsidian-nvim"; diff --git a/plugins/by-name/octo/default.nix b/plugins/by-name/octo/default.nix index 8101b10b..b353e962 100644 --- a/plugins/by-name/octo/default.nix +++ b/plugins/by-name/octo/default.nix @@ -7,7 +7,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "octo"; packPathName = "octo.nvim"; package = "octo-nvim"; diff --git a/plugins/by-name/oil/default.nix b/plugins/by-name/oil/default.nix index 1808e732..94eea732 100644 --- a/plugins/by-name/oil/default.nix +++ b/plugins/by-name/oil/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "oil"; packPathName = "oil.nvim"; package = "oil-nvim"; diff --git a/plugins/by-name/ollama/default.nix b/plugins/by-name/ollama/default.nix index 49bbcf1a..a0a7b55d 100644 --- a/plugins/by-name/ollama/default.nix +++ b/plugins/by-name/ollama/default.nix @@ -60,7 +60,7 @@ in { meta.maintainers = [ maintainers.GaetanLepage ]; - options.plugins.ollama = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.ollama = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "ollama.nvim"; package = lib.mkPackageOption pkgs "ollama.nvim" { diff --git a/plugins/by-name/openscad/default.nix b/plugins/by-name/openscad/default.nix index ec6251fa..6d3b9a32 100644 --- a/plugins/by-name/openscad/default.nix +++ b/plugins/by-name/openscad/default.nix @@ -12,7 +12,7 @@ let name = "openscad"; globalPrefix = "openscad_"; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { inherit name; packPathName = "openscad.nvim"; package = "openscad-nvim"; diff --git a/plugins/by-name/orgmode/default.nix b/plugins/by-name/orgmode/default.nix index 0b716df4..19466c86 100644 --- a/plugins/by-name/orgmode/default.nix +++ b/plugins/by-name/orgmode/default.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "orgmode"; packPathName = "nvim-orgmode"; diff --git a/plugins/by-name/otter/default.nix b/plugins/by-name/otter/default.nix index 173812e2..0bfa1eb5 100644 --- a/plugins/by-name/otter/default.nix +++ b/plugins/by-name/otter/default.nix @@ -4,7 +4,7 @@ config, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "otter"; packPathName = "otter.nvim"; package = "otter-nvim"; diff --git a/plugins/by-name/overseer/default.nix b/plugins/by-name/overseer/default.nix index 3a54588e..d17bceb6 100644 --- a/plugins/by-name/overseer/default.nix +++ b/plugins/by-name/overseer/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "overseer"; packPathName = "overseer.nvim"; package = "overseer-nvim"; diff --git a/plugins/by-name/package-info/default.nix b/plugins/by-name/package-info/default.nix index a603c303..b2487354 100644 --- a/plugins/by-name/package-info/default.nix +++ b/plugins/by-name/package-info/default.nix @@ -7,7 +7,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "package-info"; packPathName = "package-info.nvim"; package = "package-info-nvim"; diff --git a/plugins/by-name/persisted/default.nix b/plugins/by-name/persisted/default.nix index ef329119..ea4a5b88 100644 --- a/plugins/by-name/persisted/default.nix +++ b/plugins/by-name/persisted/default.nix @@ -7,7 +7,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "persisted"; packPathName = "persisted.nvim"; package = "persisted-nvim"; diff --git a/plugins/by-name/persistence/default.nix b/plugins/by-name/persistence/default.nix index e34ffb75..9a64c6b3 100644 --- a/plugins/by-name/persistence/default.nix +++ b/plugins/by-name/persistence/default.nix @@ -7,7 +7,7 @@ }: with lib; { - options.plugins.persistence = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.persistence = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "persistence.nvim"; package = lib.mkPackageOption pkgs "persistence.nvim" { diff --git a/plugins/by-name/precognition/default.nix b/plugins/by-name/precognition/default.nix index a0ff1313..6c17c921 100644 --- a/plugins/by-name/precognition/default.nix +++ b/plugins/by-name/precognition/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "precognition"; packPathName = "precognition.nvim"; package = "precognition-nvim"; diff --git a/plugins/by-name/presence-nvim/default.nix b/plugins/by-name/presence-nvim/default.nix index f4da602c..5dc6c3d2 100644 --- a/plugins/by-name/presence-nvim/default.nix +++ b/plugins/by-name/presence-nvim/default.nix @@ -11,7 +11,7 @@ let in { options = { - plugins.presence-nvim = lib.nixvim.neovim-plugin.extraOptionsOptions // { + plugins.presence-nvim = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "presence-nvim"; package = lib.mkPackageOption pkgs "presence-nvim" { default = [ diff --git a/plugins/by-name/preview/default.nix b/plugins/by-name/preview/default.nix index e239752a..a9bb33e3 100644 --- a/plugins/by-name/preview/default.nix +++ b/plugins/by-name/preview/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "preview"; packPathName = "Preview.nvim"; package = "Preview-nvim"; diff --git a/plugins/by-name/project-nvim/default.nix b/plugins/by-name/project-nvim/default.nix index e1a23c10..fb23367f 100644 --- a/plugins/by-name/project-nvim/default.nix +++ b/plugins/by-name/project-nvim/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "project-nvim"; packPathName = "project.nvim"; moduleName = "project_nvim"; diff --git a/plugins/by-name/qmk/default.nix b/plugins/by-name/qmk/default.nix index 08c5317a..5f648866 100644 --- a/plugins/by-name/qmk/default.nix +++ b/plugins/by-name/qmk/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "qmk"; packPathName = "qmk.nvim"; package = "qmk-nvim"; diff --git a/plugins/by-name/quarto/default.nix b/plugins/by-name/quarto/default.nix index 0f257ce6..269a6f00 100644 --- a/plugins/by-name/quarto/default.nix +++ b/plugins/by-name/quarto/default.nix @@ -3,7 +3,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "quarto"; packPathName = "quarto-nvim"; package = "quarto-nvim"; diff --git a/plugins/by-name/rainbow-delimiters/default.nix b/plugins/by-name/rainbow-delimiters/default.nix index 1586e314..2bf722c3 100644 --- a/plugins/by-name/rainbow-delimiters/default.nix +++ b/plugins/by-name/rainbow-delimiters/default.nix @@ -7,7 +7,7 @@ }: with lib; { - options.plugins.rainbow-delimiters = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.rainbow-delimiters = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "rainbow-delimiters.nvim"; package = lib.mkPackageOption pkgs "rainbow-delimiters.nvim" { diff --git a/plugins/by-name/refactoring/default.nix b/plugins/by-name/refactoring/default.nix index 92224395..f6135251 100644 --- a/plugins/by-name/refactoring/default.nix +++ b/plugins/by-name/refactoring/default.nix @@ -5,7 +5,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "refactoring"; packPathName = "refactoring.nvim"; package = "refactoring-nvim"; diff --git a/plugins/by-name/remote-nvim/default.nix b/plugins/by-name/remote-nvim/default.nix index 29f4373a..10e26d4d 100644 --- a/plugins/by-name/remote-nvim/default.nix +++ b/plugins/by-name/remote-nvim/default.nix @@ -1,5 +1,5 @@ { lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "remote-nvim"; packPathName = "remote-nvim.nvim"; package = "remote-nvim-nvim"; diff --git a/plugins/by-name/render-markdown/default.nix b/plugins/by-name/render-markdown/default.nix index 899c1282..7ba89df4 100644 --- a/plugins/by-name/render-markdown/default.nix +++ b/plugins/by-name/render-markdown/default.nix @@ -3,7 +3,7 @@ let inherit (lib.nixvim) defaultNullOpts mkNullOrOption; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "render-markdown"; packPathName = "render-markdown.nvim"; package = "render-markdown-nvim"; diff --git a/plugins/by-name/rest/default.nix b/plugins/by-name/rest/default.nix index 272329cf..6a847d45 100644 --- a/plugins/by-name/rest/default.nix +++ b/plugins/by-name/rest/default.nix @@ -8,7 +8,7 @@ let inherit (lib) mkRemovedOptionModule types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "rest"; packPathName = "rest.nvim"; moduleName = "rest-nvim"; diff --git a/plugins/by-name/rust-tools/default.nix b/plugins/by-name/rust-tools/default.nix index e81eaea4..951dcc77 100644 --- a/plugins/by-name/rust-tools/default.nix +++ b/plugins/by-name/rust-tools/default.nix @@ -8,7 +8,7 @@ let cfg = config.plugins.rust-tools; in { - options.plugins.rust-tools = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.rust-tools = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = lib.mkEnableOption "rust tools plugins"; package = lib.mkPackageOption pkgs "rust-tools" { default = [ diff --git a/plugins/by-name/rustaceanvim/default.nix b/plugins/by-name/rustaceanvim/default.nix index 1f2b5ea1..a6e5f531 100644 --- a/plugins/by-name/rustaceanvim/default.nix +++ b/plugins/by-name/rustaceanvim/default.nix @@ -6,7 +6,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "rustaceanvim"; maintainers = [ maintainers.GaetanLepage ]; diff --git a/plugins/by-name/scope/default.nix b/plugins/by-name/scope/default.nix index 5aff4551..9c9d54b1 100644 --- a/plugins/by-name/scope/default.nix +++ b/plugins/by-name/scope/default.nix @@ -2,7 +2,7 @@ lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "scope"; packPathName = "scope.nvim"; package = "scope-nvim"; diff --git a/plugins/by-name/smart-splits/default.nix b/plugins/by-name/smart-splits/default.nix index 8c641495..2adbf3d8 100644 --- a/plugins/by-name/smart-splits/default.nix +++ b/plugins/by-name/smart-splits/default.nix @@ -3,7 +3,7 @@ helpers, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "smart-splits"; packPathName = "smart-splits.nvim"; package = "smart-splits-nvim"; diff --git a/plugins/by-name/smartcolumn/default.nix b/plugins/by-name/smartcolumn/default.nix index a53a47b9..9a6b5940 100644 --- a/plugins/by-name/smartcolumn/default.nix +++ b/plugins/by-name/smartcolumn/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "smartcolumn"; packPathName = "smartcolumn.nvim"; package = "smartcolumn-nvim"; diff --git a/plugins/by-name/snacks/default.nix b/plugins/by-name/snacks/default.nix index 1c939f7b..7017ff22 100644 --- a/plugins/by-name/snacks/default.nix +++ b/plugins/by-name/snacks/default.nix @@ -3,7 +3,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "snacks"; packPathName = "snacks.nvim"; package = "snacks-nvim"; diff --git a/plugins/by-name/sniprun/default.nix b/plugins/by-name/sniprun/default.nix index 88b965c5..16a927d7 100644 --- a/plugins/by-name/sniprun/default.nix +++ b/plugins/by-name/sniprun/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "sniprun"; url = "https://github.com/michaelb/sniprun"; diff --git a/plugins/by-name/specs/default.nix b/plugins/by-name/specs/default.nix index 78828bda..e08ced4a 100644 --- a/plugins/by-name/specs/default.nix +++ b/plugins/by-name/specs/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "specs"; packPathName = "specs.nvim"; package = "specs-nvim"; diff --git a/plugins/by-name/spectre/default.nix b/plugins/by-name/spectre/default.nix index 8ad38107..7bd14caf 100644 --- a/plugins/by-name/spectre/default.nix +++ b/plugins/by-name/spectre/default.nix @@ -6,7 +6,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "spectre"; packPathName = "nvim-spectre"; package = "nvim-spectre"; diff --git a/plugins/by-name/spider/default.nix b/plugins/by-name/spider/default.nix index 16c37f67..a2e1a43d 100644 --- a/plugins/by-name/spider/default.nix +++ b/plugins/by-name/spider/default.nix @@ -11,7 +11,7 @@ let cfg = config.plugins.${pluginName}; in { - options.plugins.${pluginName} = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.${pluginName} = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption pluginName; package = lib.mkPackageOption pkgs pluginName { diff --git a/plugins/by-name/sqlite-lua/default.nix b/plugins/by-name/sqlite-lua/default.nix index d8276c9a..ba27e3d4 100644 --- a/plugins/by-name/sqlite-lua/default.nix +++ b/plugins/by-name/sqlite-lua/default.nix @@ -2,7 +2,7 @@ lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "sqlite-lua"; packPathName = "sqlite.lua"; moduleName = "sqlite.lua"; diff --git a/plugins/by-name/startup/default.nix b/plugins/by-name/startup/default.nix index 1c5a0ede..d5265036 100644 --- a/plugins/by-name/startup/default.nix +++ b/plugins/by-name/startup/default.nix @@ -12,7 +12,7 @@ in { meta.maintainers = [ maintainers.GaetanLepage ]; - options.plugins.startup = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.startup = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "startup.nvim"; package = lib.mkPackageOption pkgs "startup.nvim" { diff --git a/plugins/by-name/statuscol/default.nix b/plugins/by-name/statuscol/default.nix index 6b982c00..2475b20b 100644 --- a/plugins/by-name/statuscol/default.nix +++ b/plugins/by-name/statuscol/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "statuscol"; packPathName = "statuscol.nvim"; package = "statuscol-nvim"; diff --git a/plugins/by-name/telekasten/default.nix b/plugins/by-name/telekasten/default.nix index 5146e951..904f066b 100644 --- a/plugins/by-name/telekasten/default.nix +++ b/plugins/by-name/telekasten/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "telekasten"; packPathName = "telekasten.nvim"; package = "telekasten-nvim"; diff --git a/plugins/by-name/telescope/default.nix b/plugins/by-name/telescope/default.nix index 2fa1a0e9..2be5c67f 100644 --- a/plugins/by-name/telescope/default.nix +++ b/plugins/by-name/telescope/default.nix @@ -14,7 +14,7 @@ let ; in # TODO:add support for additional filetypes. This requires autocommands! -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "telescope"; packPathName = "telescope.nvim"; package = "telescope-nvim"; diff --git a/plugins/by-name/tiny-devicons-auto-colors/default.nix b/plugins/by-name/tiny-devicons-auto-colors/default.nix index 0e0acc05..d78a21fd 100644 --- a/plugins/by-name/tiny-devicons-auto-colors/default.nix +++ b/plugins/by-name/tiny-devicons-auto-colors/default.nix @@ -2,7 +2,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "tiny-devicons-auto-colors"; packPathName = "tiny-devicons-auto-colors.nvim"; package = "tiny-devicons-auto-colors-nvim"; diff --git a/plugins/by-name/todo-comments/default.nix b/plugins/by-name/todo-comments/default.nix index a81404a7..9ea29262 100644 --- a/plugins/by-name/todo-comments/default.nix +++ b/plugins/by-name/todo-comments/default.nix @@ -15,7 +15,7 @@ let ; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "todo-comments"; packPathName = "todo-comments.nvim"; package = "todo-comments-nvim"; diff --git a/plugins/by-name/toggleterm/default.nix b/plugins/by-name/toggleterm/default.nix index a36d449f..39733139 100644 --- a/plugins/by-name/toggleterm/default.nix +++ b/plugins/by-name/toggleterm/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "toggleterm"; packPathName = "toggleterm.nvim"; package = "toggleterm-nvim"; diff --git a/plugins/by-name/transparent/default.nix b/plugins/by-name/transparent/default.nix index 5262c29b..45f014fb 100644 --- a/plugins/by-name/transparent/default.nix +++ b/plugins/by-name/transparent/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "transparent"; packPathName = "transparent.nvim"; package = "transparent-nvim"; diff --git a/plugins/by-name/treesitter-context/default.nix b/plugins/by-name/treesitter-context/default.nix index b2b74f4f..2074a125 100644 --- a/plugins/by-name/treesitter-context/default.nix +++ b/plugins/by-name/treesitter-context/default.nix @@ -5,7 +5,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "treesitter-context"; packPathName = "nvim-treesitter-context"; package = "nvim-treesitter-context"; diff --git a/plugins/by-name/treesitter-textobjects/default.nix b/plugins/by-name/treesitter-textobjects/default.nix index ee6cc5c2..65e13020 100644 --- a/plugins/by-name/treesitter-textobjects/default.nix +++ b/plugins/by-name/treesitter-textobjects/default.nix @@ -37,7 +37,7 @@ with lib; }) ) { } desc; in - lib.nixvim.neovim-plugin.extraOptionsOptions + lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "treesitter-textobjects (requires plugins.treesitter.enable to be true)"; diff --git a/plugins/by-name/treesitter/default.nix b/plugins/by-name/treesitter/default.nix index 940abd1c..4b24b88c 100644 --- a/plugins/by-name/treesitter/default.nix +++ b/plugins/by-name/treesitter/default.nix @@ -6,7 +6,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "treesitter"; packPathName = "nvim-treesitter"; moduleName = "nvim-treesitter.configs"; diff --git a/plugins/by-name/trim/default.nix b/plugins/by-name/trim/default.nix index 2cc2322f..4b5bf0a3 100644 --- a/plugins/by-name/trim/default.nix +++ b/plugins/by-name/trim/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "trim"; packPathName = "trim.nvim"; package = "trim-nvim"; diff --git a/plugins/by-name/trouble/default.nix b/plugins/by-name/trouble/default.nix index 5ec38ae3..05cd9e30 100644 --- a/plugins/by-name/trouble/default.nix +++ b/plugins/by-name/trouble/default.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "trouble"; packPathName = "trouble.nvim"; package = "trouble-nvim"; diff --git a/plugins/by-name/ts-autotag/default.nix b/plugins/by-name/ts-autotag/default.nix index 4575ee30..a30db9f6 100644 --- a/plugins/by-name/ts-autotag/default.nix +++ b/plugins/by-name/ts-autotag/default.nix @@ -5,7 +5,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "ts-autotag"; packPathName = "nvim-ts-autotag"; moduleName = "nvim-ts-autotag"; diff --git a/plugins/by-name/ts-comments/default.nix b/plugins/by-name/ts-comments/default.nix index 1c9e96a2..76cf3ae9 100644 --- a/plugins/by-name/ts-comments/default.nix +++ b/plugins/by-name/ts-comments/default.nix @@ -2,7 +2,7 @@ lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "ts-comments"; packPathName = "ts-comments.nvim"; package = "ts-comments-nvim"; diff --git a/plugins/by-name/ts-context-commentstring/default.nix b/plugins/by-name/ts-context-commentstring/default.nix index 8c8c4415..930fd0de 100644 --- a/plugins/by-name/ts-context-commentstring/default.nix +++ b/plugins/by-name/ts-context-commentstring/default.nix @@ -7,7 +7,7 @@ }: with lib; { - options.plugins.ts-context-commentstring = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.ts-context-commentstring = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "nvim-ts-context-commentstring"; package = lib.mkPackageOption pkgs "ts-context-commentstring" { diff --git a/plugins/by-name/twilight/default.nix b/plugins/by-name/twilight/default.nix index f87bef86..47796294 100644 --- a/plugins/by-name/twilight/default.nix +++ b/plugins/by-name/twilight/default.nix @@ -5,7 +5,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "twilight"; packPathName = "twilight.nvim"; package = "twilight-nvim"; diff --git a/plugins/by-name/typescript-tools/default.nix b/plugins/by-name/typescript-tools/default.nix index f56f07d0..50dfe097 100644 --- a/plugins/by-name/typescript-tools/default.nix +++ b/plugins/by-name/typescript-tools/default.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "typescript-tools"; packPathName = "typescript-tools.nvim"; package = "typescript-tools-nvim"; diff --git a/plugins/by-name/vim-be-good/default.nix b/plugins/by-name/vim-be-good/default.nix index 14161d73..0ea1ec50 100644 --- a/plugins/by-name/vim-be-good/default.nix +++ b/plugins/by-name/vim-be-good/default.nix @@ -1,5 +1,5 @@ { lib, pkgs, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "vim-be-good"; package = "vim-be-good"; diff --git a/plugins/by-name/virt-column/default.nix b/plugins/by-name/virt-column/default.nix index 768eb20b..c87eb7c6 100644 --- a/plugins/by-name/virt-column/default.nix +++ b/plugins/by-name/virt-column/default.nix @@ -3,7 +3,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "virt-column"; packPathName = "virt-column.nvim"; package = "virt-column-nvim"; diff --git a/plugins/by-name/web-devicons/default.nix b/plugins/by-name/web-devicons/default.nix index 7ebd339f..ecd3fc63 100644 --- a/plugins/by-name/web-devicons/default.nix +++ b/plugins/by-name/web-devicons/default.nix @@ -2,7 +2,7 @@ let inherit (lib.nixvim) defaultNullOpts mkNullOrOption toLuaObject; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "web-devicons"; packPathName = "nvim-web-devicons"; moduleName = "nvim-web-devicons"; diff --git a/plugins/by-name/which-key/default.nix b/plugins/by-name/which-key/default.nix index 879df509..a6b1f704 100644 --- a/plugins/by-name/which-key/default.nix +++ b/plugins/by-name/which-key/default.nix @@ -69,7 +69,7 @@ let ]; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "which-key"; packPathName = "which-key.nvim"; package = "which-key-nvim"; diff --git a/plugins/by-name/wilder/default.nix b/plugins/by-name/wilder/default.nix index 5c4aca74..dd5bda3b 100644 --- a/plugins/by-name/wilder/default.nix +++ b/plugins/by-name/wilder/default.nix @@ -63,7 +63,7 @@ in ) ]; - options.plugins.wilder = lib.nixvim.neovim-plugin.extraOptionsOptions // { + options.plugins.wilder = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "wilder-nvim"; package = lib.mkPackageOption pkgs "wilder-nvim" { diff --git a/plugins/by-name/wrapping/default.nix b/plugins/by-name/wrapping/default.nix index fb4a3926..dc36670c 100644 --- a/plugins/by-name/wrapping/default.nix +++ b/plugins/by-name/wrapping/default.nix @@ -2,7 +2,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "wrapping"; packPathName = "wrapping.nvim"; package = "wrapping-nvim"; diff --git a/plugins/by-name/wtf/default.nix b/plugins/by-name/wtf/default.nix index d79e2339..ce0d8543 100644 --- a/plugins/by-name/wtf/default.nix +++ b/plugins/by-name/wtf/default.nix @@ -40,7 +40,7 @@ let in { options = { - plugins.wtf = lib.nixvim.neovim-plugin.extraOptionsOptions // { + plugins.wtf = lib.nixvim.plugins.neovim.extraOptionsOptions // { enable = mkEnableOption "wtf.nvim"; package = lib.mkPackageOption pkgs "wtf.nvim" { diff --git a/plugins/by-name/yanky/default.nix b/plugins/by-name/yanky/default.nix index 0762a05d..02243a13 100644 --- a/plugins/by-name/yanky/default.nix +++ b/plugins/by-name/yanky/default.nix @@ -6,7 +6,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "yanky"; packPathName = "yanky.nvim"; package = "yanky-nvim"; diff --git a/plugins/by-name/yazi/default.nix b/plugins/by-name/yazi/default.nix index d74b4697..ed67f065 100644 --- a/plugins/by-name/yazi/default.nix +++ b/plugins/by-name/yazi/default.nix @@ -7,7 +7,7 @@ let inherit (lib) types; inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "yazi"; packPathName = "yazi.nvim"; package = "yazi-nvim"; diff --git a/plugins/by-name/zellij/default.nix b/plugins/by-name/zellij/default.nix index 892e2e52..b7e979f0 100644 --- a/plugins/by-name/zellij/default.nix +++ b/plugins/by-name/zellij/default.nix @@ -3,7 +3,7 @@ helpers, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "zellij"; packPathName = "zellij.nvim"; package = "zellij-nvim"; diff --git a/plugins/by-name/zen-mode/default.nix b/plugins/by-name/zen-mode/default.nix index 2a7ca79a..293a50c3 100644 --- a/plugins/by-name/zen-mode/default.nix +++ b/plugins/by-name/zen-mode/default.nix @@ -4,7 +4,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "zen-mode"; packPathName = "zen-mode.nvim"; package = "zen-mode-nvim"; diff --git a/plugins/by-name/zk/default.nix b/plugins/by-name/zk/default.nix index aafafb7b..dfc509f1 100644 --- a/plugins/by-name/zk/default.nix +++ b/plugins/by-name/zk/default.nix @@ -6,7 +6,7 @@ ... }: with lib; -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "zk"; packPathName = "zk.nvim"; package = "zk-nvim"; diff --git a/plugins/cmp/default.nix b/plugins/cmp/default.nix index be7a690d..bf3378b4 100644 --- a/plugins/cmp/default.nix +++ b/plugins/cmp/default.nix @@ -7,7 +7,7 @@ let cmpOptions = import ./options { inherit lib; }; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "cmp"; packPathName = "nvim-cmp"; package = "nvim-cmp"; diff --git a/plugins/colorschemes/ayu.nix b/plugins/colorschemes/ayu.nix index bc06e666..adc4a3f8 100644 --- a/plugins/colorschemes/ayu.nix +++ b/plugins/colorschemes/ayu.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts toLuaObject; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "ayu"; isColorscheme = true; packPathName = "neovim-ayu"; diff --git a/plugins/colorschemes/base16/default.nix b/plugins/colorschemes/base16/default.nix index 4faa2aa4..ac358e39 100644 --- a/plugins/colorschemes/base16/default.nix +++ b/plugins/colorschemes/base16/default.nix @@ -9,7 +9,7 @@ let moduleName = "base16-colorscheme"; packPathName = "base16.nvim"; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { inherit name moduleName packPathName; setup = ".with_config"; package = "base16-nvim"; diff --git a/plugins/colorschemes/catppuccin.nix b/plugins/colorschemes/catppuccin.nix index 8a2005a1..a6b581f2 100644 --- a/plugins/colorschemes/catppuccin.nix +++ b/plugins/colorschemes/catppuccin.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts mkNullOrOption mkNullOrStrLuaFnOr; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "catppuccin"; packPathName = "catppuccin-nvim"; isColorscheme = true; diff --git a/plugins/colorschemes/cyberdream.nix b/plugins/colorschemes/cyberdream.nix index 92ce9fb0..27556aaf 100644 --- a/plugins/colorschemes/cyberdream.nix +++ b/plugins/colorschemes/cyberdream.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "cyberdream"; isColorscheme = true; packPathName = "cyberdream.nvim"; diff --git a/plugins/colorschemes/dracula-nvim.nix b/plugins/colorschemes/dracula-nvim.nix index 9ec144de..fddca7d4 100644 --- a/plugins/colorschemes/dracula-nvim.nix +++ b/plugins/colorschemes/dracula-nvim.nix @@ -1,5 +1,5 @@ { lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "dracula-nvim"; packPathName = "dracula.nvim "; moduleName = "dracula"; diff --git a/plugins/colorschemes/gruvbox.nix b/plugins/colorschemes/gruvbox.nix index 1f2400b6..e2889d3b 100644 --- a/plugins/colorschemes/gruvbox.nix +++ b/plugins/colorschemes/gruvbox.nix @@ -2,7 +2,7 @@ lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "gruvbox"; isColorscheme = true; packPathName = "gruvbox.nvim"; diff --git a/plugins/colorschemes/kanagawa.nix b/plugins/colorschemes/kanagawa.nix index 2aad0805..b6dc61bf 100644 --- a/plugins/colorschemes/kanagawa.nix +++ b/plugins/colorschemes/kanagawa.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "kanagawa"; isColorscheme = true; packPathName = "kanagawa.nvim"; diff --git a/plugins/colorschemes/modus.nix b/plugins/colorschemes/modus.nix index d8b87a81..99f4d551 100644 --- a/plugins/colorschemes/modus.nix +++ b/plugins/colorschemes/modus.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "modus"; moduleName = "modus-themes"; packPathName = "modus-themes.nvim"; diff --git a/plugins/colorschemes/nightfox.nix b/plugins/colorschemes/nightfox.nix index ff095de4..b8c542ae 100644 --- a/plugins/colorschemes/nightfox.nix +++ b/plugins/colorschemes/nightfox.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts mkNullOrOption; inherit (lib) types; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "nightfox"; isColorscheme = true; packPathName = "nightfox.nvim"; diff --git a/plugins/colorschemes/onedark.nix b/plugins/colorschemes/onedark.nix index c411c049..4c57bfb3 100644 --- a/plugins/colorschemes/onedark.nix +++ b/plugins/colorschemes/onedark.nix @@ -2,7 +2,7 @@ lib, ... }: -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "onedark"; isColorscheme = true; packPathName = "onedark.nvim"; diff --git a/plugins/colorschemes/palette.nix b/plugins/colorschemes/palette.nix index d2ddce3d..22351939 100644 --- a/plugins/colorschemes/palette.nix +++ b/plugins/colorschemes/palette.nix @@ -6,7 +6,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "palette"; isColorscheme = true; packPathName = "palette.nvim"; diff --git a/plugins/colorschemes/poimandres.nix b/plugins/colorschemes/poimandres.nix index ffdd4910..2fa5ad1f 100644 --- a/plugins/colorschemes/poimandres.nix +++ b/plugins/colorschemes/poimandres.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts mkNullOrOption; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "poimandres"; isColorscheme = true; packPathName = "poimandres.nvim"; diff --git a/plugins/colorschemes/rose-pine.nix b/plugins/colorschemes/rose-pine.nix index cc927218..5e188b84 100644 --- a/plugins/colorschemes/rose-pine.nix +++ b/plugins/colorschemes/rose-pine.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts mkNullOrOption; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "rose-pine"; isColorscheme = true; diff --git a/plugins/colorschemes/tokyonight.nix b/plugins/colorschemes/tokyonight.nix index 4b1ca10e..5128f925 100644 --- a/plugins/colorschemes/tokyonight.nix +++ b/plugins/colorschemes/tokyonight.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "tokyonight"; isColorscheme = true; packPathName = "tokyonight.nvim"; diff --git a/plugins/colorschemes/vscode.nix b/plugins/colorschemes/vscode.nix index d6b53560..5a90d3ed 100644 --- a/plugins/colorschemes/vscode.nix +++ b/plugins/colorschemes/vscode.nix @@ -5,7 +5,7 @@ let inherit (lib.nixvim) defaultNullOpts toLuaObject; in -lib.nixvim.neovim-plugin.mkNeovimPlugin { +lib.nixvim.plugins.mkNeovimPlugin { name = "vscode"; isColorscheme = true; packPathName = "vscode-nvim"; diff --git a/plugins/pluginmanagers/lz-n.nix b/plugins/pluginmanagers/lz-n.nix index bc7a434f..64934c35 100644 --- a/plugins/pluginmanagers/lz-n.nix +++ b/plugins/pluginmanagers/lz-n.nix @@ -7,7 +7,7 @@ with lib; let inherit (lib.nixvim) defaultNullOpts; in -nixvim.neovim-plugin.mkNeovimPlugin { +nixvim.plugins.mkNeovimPlugin { name = "lz-n"; packPathName = "lz.n"; maintainers = [ maintainers.psfloyd ];