diff --git a/lib/default.nix b/lib/default.nix index 1612cf8c..bc6703b2 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -120,8 +120,8 @@ lib.fix ( wrapVimscriptForLua ; - # TODO: Deprecate this `maintainers` alias - inherit (self.extendedLib) maintainers; + # TODO: Removed 2024-09-27 + maintainers = throw "The `maintainers` alias has been removed. Use `lib.maintainers` on a lib with nixvim's extensions."; # TODO: Deprecate the old `nixvimTypes` alias? nixvimTypes = self.extendedLib.types; diff --git a/plugins/by-name/auto-save/default.nix b/plugins/by-name/auto-save/default.nix index 62bb7e59..efdfc7ad 100644 --- a/plugins/by-name/auto-save/default.nix +++ b/plugins/by-name/auto-save/default.nix @@ -9,7 +9,7 @@ helpers.neovim-plugin.mkNeovimPlugin { originalName = "auto-save.nvim"; package = "auto-save-nvim"; - maintainers = [ helpers.maintainers.braindefender ]; + maintainers = [ lib.maintainers.braindefender ]; # TODO: introduced 2024-06-21, remove after 24.11 deprecateExtraOptions = true; diff --git a/plugins/by-name/autosource/default.nix b/plugins/by-name/autosource/default.nix index db22fa8b..fcb1ade2 100644 --- a/plugins/by-name/autosource/default.nix +++ b/plugins/by-name/autosource/default.nix @@ -11,7 +11,7 @@ lib.nixvim.vim-plugin.mkVimPlugin { package = "vim-autosource"; globalPrefix = "autosource_"; - maintainers = [ lib.nixvim.maintainers.refaelsh ]; + maintainers = [ lib.maintainers.refaelsh ]; settingsOptions = { prompt_for_new_file = defaultNullOpts.mkFlagInt 1 '' diff --git a/plugins/by-name/bacon/default.nix b/plugins/by-name/bacon/default.nix index 238617a7..896ace8d 100644 --- a/plugins/by-name/bacon/default.nix +++ b/plugins/by-name/bacon/default.nix @@ -1,11 +1,12 @@ { + lib, helpers, ... }: helpers.neovim-plugin.mkNeovimPlugin { name = "bacon"; package = "nvim-bacon"; - maintainers = [ helpers.maintainers.alisonjenkins ]; + maintainers = [ lib.maintainers.alisonjenkins ]; settingsOptions = { quickfix = { diff --git a/plugins/by-name/baleia/default.nix b/plugins/by-name/baleia/default.nix index f7ce2efb..3e9d7b3f 100644 --- a/plugins/by-name/baleia/default.nix +++ b/plugins/by-name/baleia/default.nix @@ -1,4 +1,5 @@ { + lib, helpers, ... }: @@ -7,7 +8,7 @@ helpers.neovim-plugin.mkNeovimPlugin { originalName = "baleia.nvim"; package = "baleia-nvim"; - maintainers = [ helpers.maintainers.alisonjenkins ]; + maintainers = [ lib.maintainers.alisonjenkins ]; settingsOptions = { async = helpers.defaultNullOpts.mkBool true '' diff --git a/plugins/by-name/ccc/default.nix b/plugins/by-name/ccc/default.nix index 68a08a58..b3ac4358 100644 --- a/plugins/by-name/ccc/default.nix +++ b/plugins/by-name/ccc/default.nix @@ -9,7 +9,7 @@ helpers.neovim-plugin.mkNeovimPlugin { originalName = "ccc.nvim"; package = "ccc-nvim"; - maintainers = [ helpers.maintainers.JanKremer ]; + maintainers = [ lib.maintainers.JanKremer ]; settingsOptions = let diff --git a/plugins/by-name/cmake-tools/default.nix b/plugins/by-name/cmake-tools/default.nix index 91eabd41..47c9b277 100644 --- a/plugins/by-name/cmake-tools/default.nix +++ b/plugins/by-name/cmake-tools/default.nix @@ -8,7 +8,7 @@ helpers.neovim-plugin.mkNeovimPlugin { originalName = "cmake-tools.nvim"; package = "cmake-tools-nvim"; - maintainers = [ helpers.maintainers.NathanFelber ]; + maintainers = [ lib.maintainers.NathanFelber ]; settingsOptions = { cmake_command = helpers.defaultNullOpts.mkStr "cmake" '' diff --git a/plugins/by-name/committia/default.nix b/plugins/by-name/committia/default.nix index 48919ec0..329917f4 100644 --- a/plugins/by-name/committia/default.nix +++ b/plugins/by-name/committia/default.nix @@ -10,7 +10,7 @@ helpers.vim-plugin.mkVimPlugin { package = "committia-vim"; globalPrefix = "committia_"; - maintainers = [ helpers.maintainers.alisonjenkins ]; + maintainers = [ lib.maintainers.alisonjenkins ]; settingsOptions = { open_only_vim_starting = helpers.defaultNullOpts.mkFlagInt 1 '' diff --git a/plugins/by-name/competitest/default.nix b/plugins/by-name/competitest/default.nix index 1e4e0f99..6c784586 100644 --- a/plugins/by-name/competitest/default.nix +++ b/plugins/by-name/competitest/default.nix @@ -9,7 +9,7 @@ helpers.neovim-plugin.mkNeovimPlugin { originalName = "competitest.nvim"; package = "competitest-nvim"; - maintainers = [ helpers.maintainers.svl ]; + maintainers = [ lib.maintainers.svl ]; settingsOptions = { local_config_file_name = helpers.defaultNullOpts.mkStr ".competitest.lua" '' diff --git a/plugins/by-name/coq-nvim/default.nix b/plugins/by-name/coq-nvim/default.nix index fa9d6972..b7038179 100644 --- a/plugins/by-name/coq-nvim/default.nix +++ b/plugins/by-name/coq-nvim/default.nix @@ -10,9 +10,9 @@ helpers.neovim-plugin.mkNeovimPlugin { originalName = "coq_nvim"; package = "coq_nvim"; - maintainers = [ - maintainers.traxys - helpers.maintainers.Kareem-Medhat + maintainers = with lib.maintainers; [ + traxys + Kareem-Medhat ]; extraOptions = { diff --git a/plugins/by-name/direnv/default.nix b/plugins/by-name/direnv/default.nix index 7fa9539a..6b35cef5 100644 --- a/plugins/by-name/direnv/default.nix +++ b/plugins/by-name/direnv/default.nix @@ -4,14 +4,13 @@ lib, ... }: -with lib; helpers.vim-plugin.mkVimPlugin { name = "direnv"; originalName = "direnv.vim"; package = "direnv-vim"; globalPrefix = "direnv_"; - maintainers = [ helpers.maintainers.alisonjenkins ]; + maintainers = [ lib.maintainers.alisonjenkins ]; settingsOptions = { direnv_auto = helpers.defaultNullOpts.mkFlagInt 1 '' diff --git a/plugins/by-name/dressing/default.nix b/plugins/by-name/dressing/default.nix index 51c76d00..330e5744 100644 --- a/plugins/by-name/dressing/default.nix +++ b/plugins/by-name/dressing/default.nix @@ -9,7 +9,7 @@ helpers.neovim-plugin.mkNeovimPlugin { originalName = "dressing.nvim"; package = "dressing-nvim"; - maintainers = [ helpers.maintainers.AndresBermeoMarinelli ]; + maintainers = [ lib.maintainers.AndresBermeoMarinelli ]; settingsOptions = let diff --git a/plugins/by-name/guess-indent/default.nix b/plugins/by-name/guess-indent/default.nix index ee7354c7..7e284f5d 100644 --- a/plugins/by-name/guess-indent/default.nix +++ b/plugins/by-name/guess-indent/default.nix @@ -9,7 +9,7 @@ helpers.neovim-plugin.mkNeovimPlugin { originalName = "guess-indent.nvim"; package = "guess-indent-nvim"; - maintainers = [ helpers.maintainers.GGORG ]; + maintainers = [ lib.maintainers.GGORG ]; settingsOptions = { auto_cmd = helpers.defaultNullOpts.mkBool true '' diff --git a/plugins/by-name/indent-o-matic/default.nix b/plugins/by-name/indent-o-matic/default.nix index 8acc3236..d9879a21 100644 --- a/plugins/by-name/indent-o-matic/default.nix +++ b/plugins/by-name/indent-o-matic/default.nix @@ -6,7 +6,7 @@ with lib; helpers.neovim-plugin.mkNeovimPlugin { name = "indent-o-matic"; - maintainers = [ helpers.maintainers.alisonjenkins ]; + maintainers = [ lib.maintainers.alisonjenkins ]; settingsOptions = { max_lines = helpers.defaultNullOpts.mkInt 2048 diff --git a/plugins/by-name/lazygit/default.nix b/plugins/by-name/lazygit/default.nix index 9c39fa77..7bd4797a 100644 --- a/plugins/by-name/lazygit/default.nix +++ b/plugins/by-name/lazygit/default.nix @@ -11,7 +11,7 @@ helpers.vim-plugin.mkVimPlugin { package = "lazygit-nvim"; globalPrefix = "lazygit_"; - maintainers = [ helpers.maintainers.AndresBermeoMarinelli ]; + maintainers = [ lib.maintainers.AndresBermeoMarinelli ]; settingsOptions = { floating_window_winblend = helpers.defaultNullOpts.mkNullable (types.ints.between 0 100) 0 '' diff --git a/plugins/by-name/lsp-status/default.nix b/plugins/by-name/lsp-status/default.nix index c2d9be53..cba5b15d 100644 --- a/plugins/by-name/lsp-status/default.nix +++ b/plugins/by-name/lsp-status/default.nix @@ -9,7 +9,7 @@ helpers.neovim-plugin.mkNeovimPlugin { name = "lsp-status"; originalName = "lsp-status.nvim"; package = "lsp-status-nvim"; - maintainers = [ helpers.maintainers.b3nb5n ]; + maintainers = [ lib.maintainers.b3nb5n ]; settingsOptions = let diff --git a/plugins/by-name/numbertoggle/default.nix b/plugins/by-name/numbertoggle/default.nix index 644ae473..8e5a4ae3 100644 --- a/plugins/by-name/numbertoggle/default.nix +++ b/plugins/by-name/numbertoggle/default.nix @@ -7,5 +7,5 @@ lib.nixvim.vim-plugin.mkVimPlugin { originalName = "vim-numbertoggle"; package = "vim-numbertoggle"; - maintainers = [ lib.nixvim.maintainers.refaelsh ]; + maintainers = [ lib.maintainers.refaelsh ]; } diff --git a/plugins/by-name/octo/default.nix b/plugins/by-name/octo/default.nix index 342f0919..aaa1af31 100644 --- a/plugins/by-name/octo/default.nix +++ b/plugins/by-name/octo/default.nix @@ -10,7 +10,7 @@ helpers.neovim-plugin.mkNeovimPlugin { originalName = "octo.nvim"; package = "octo-nvim"; - maintainers = [ helpers.maintainers.svl ]; + maintainers = [ lib.maintainers.svl ]; settingsOptions = { use_local_fs = helpers.defaultNullOpts.mkBool false '' diff --git a/plugins/by-name/orgmode/default.nix b/plugins/by-name/orgmode/default.nix index 15876a6e..3ce2215f 100644 --- a/plugins/by-name/orgmode/default.nix +++ b/plugins/by-name/orgmode/default.nix @@ -9,7 +9,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin { name = "orgmode"; originalName = "nvim-orgmode"; - maintainers = [ lib.nixvim.maintainers.refaelsh ]; + maintainers = [ lib.maintainers.refaelsh ]; settingsOptions = { org_agenda_files = defaultNullOpts.mkNullable (with lib.types; either str (listOf str)) "" '' diff --git a/plugins/by-name/repeat/default.nix b/plugins/by-name/repeat/default.nix index 220076f5..0023256b 100644 --- a/plugins/by-name/repeat/default.nix +++ b/plugins/by-name/repeat/default.nix @@ -7,5 +7,5 @@ lib.nixvim.vim-plugin.mkVimPlugin { originalName = "vim-repeat"; package = "vim-repeat"; - maintainers = [ lib.nixvim.maintainers.refaelsh ]; + maintainers = [ lib.maintainers.refaelsh ]; } diff --git a/plugins/by-name/vim-css-color/default.nix b/plugins/by-name/vim-css-color/default.nix index 323596ac..d990e7a7 100644 --- a/plugins/by-name/vim-css-color/default.nix +++ b/plugins/by-name/vim-css-color/default.nix @@ -1,8 +1,9 @@ { + lib, helpers, ... }: helpers.vim-plugin.mkVimPlugin { name = "vim-css-color"; - maintainers = [ helpers.maintainers.DanielLaing ]; + maintainers = [ lib.maintainers.DanielLaing ]; } diff --git a/plugins/by-name/virt-column/default.nix b/plugins/by-name/virt-column/default.nix index 8d619fe9..a401a17f 100644 --- a/plugins/by-name/virt-column/default.nix +++ b/plugins/by-name/virt-column/default.nix @@ -9,7 +9,7 @@ helpers.neovim-plugin.mkNeovimPlugin { originalName = "virt-column.nvim"; package = "virt-column-nvim"; - maintainers = [ helpers.maintainers.alisonjenkins ]; + maintainers = [ lib.maintainers.alisonjenkins ]; settingsOptions = { enabled = helpers.defaultNullOpts.mkBool true '' diff --git a/plugins/colorschemes/cyberdream.nix b/plugins/colorschemes/cyberdream.nix index cb591069..8555037a 100644 --- a/plugins/colorschemes/cyberdream.nix +++ b/plugins/colorschemes/cyberdream.nix @@ -11,7 +11,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin { originalName = "cyberdream.nvim"; package = "cyberdream-nvim"; - maintainers = [ lib.nixvim.maintainers.AndresBermeoMarinelli ]; + maintainers = [ lib.maintainers.AndresBermeoMarinelli ]; settingsOptions = { transparent = defaultNullOpts.mkBool false '' diff --git a/plugins/colorschemes/dracula-nvim.nix b/plugins/colorschemes/dracula-nvim.nix index f9cd1479..d6901bd1 100644 --- a/plugins/colorschemes/dracula-nvim.nix +++ b/plugins/colorschemes/dracula-nvim.nix @@ -6,7 +6,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin { colorscheme = "dracula"; isColorscheme = true; - maintainers = [ lib.nixvim.maintainers.refaelsh ]; + maintainers = [ lib.maintainers.refaelsh ]; settingsExample = { italic_comment = true; diff --git a/plugins/colorschemes/everforest.nix b/plugins/colorschemes/everforest.nix index 1bd55949..da16486f 100644 --- a/plugins/colorschemes/everforest.nix +++ b/plugins/colorschemes/everforest.nix @@ -10,7 +10,7 @@ lib.nixvim.vim-plugin.mkVimPlugin { isColorscheme = true; globalPrefix = "everforest_"; - maintainers = [ lib.nixvim.maintainers.sheemap ]; + maintainers = [ lib.maintainers.sheemap ]; settingsOptions = { background = diff --git a/plugins/colorschemes/modus.nix b/plugins/colorschemes/modus.nix index 0df9c26c..94361c87 100644 --- a/plugins/colorschemes/modus.nix +++ b/plugins/colorschemes/modus.nix @@ -12,7 +12,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin { package = "modus-themes-nvim"; isColorscheme = true; - maintainers = [ lib.nixvim.maintainers.nwjsmith ]; + maintainers = [ lib.maintainers.nwjsmith ]; settingsOptions = { style =