lib/options: rename mkPackageOption to mkPluginPackageOption

This commit is contained in:
Gaetan Lepage 2024-05-17 14:09:20 +02:00 committed by Gaétan Lepage
parent 40598fc1bd
commit 26367692da
110 changed files with 111 additions and 111 deletions

View file

@ -53,7 +53,7 @@ in
plugins.alpha = {
enable = mkEnableOption "alpha-nvim";
package = helpers.mkPackageOption "alpha-nvim" pkgs.vimPlugins.alpha-nvim;
package = helpers.mkPluginPackageOption "alpha-nvim" pkgs.vimPlugins.alpha-nvim;
iconsEnabled = mkOption {
type = types.bool;

View file

@ -13,7 +13,7 @@ in
options.plugins.auto-save = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "auto-save";
package = helpers.mkPackageOption "auto-save" pkgs.vimPlugins.auto-save-nvim;
package = helpers.mkPluginPackageOption "auto-save" pkgs.vimPlugins.auto-save-nvim;
keymaps = {
silent = mkOption {

View file

@ -13,7 +13,7 @@ in
options.plugins.auto-session = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "auto-session";
package = helpers.mkPackageOption "auto-session" pkgs.vimPlugins.auto-session;
package = helpers.mkPluginPackageOption "auto-session" pkgs.vimPlugins.auto-session;
logLevel = helpers.defaultNullOpts.mkEnum [
"debug"

View file

@ -15,7 +15,7 @@ in
options.plugins.autoclose = {
enable = mkEnableOption "autoclose.nvim";
package = helpers.mkPackageOption "autoclose.nvim" pkgs.vimPlugins.autoclose-nvim;
package = helpers.mkPluginPackageOption "autoclose.nvim" pkgs.vimPlugins.autoclose-nvim;
keys = helpers.mkNullOrOption (with types; attrsOf anything) ''
Configures various options, such as shortcuts for pairs, what pair of characters to use in the

View file

@ -13,7 +13,7 @@ in
options.plugins.better-escape = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "better-escape.nvim";
package = helpers.mkPackageOption "better-escape.nvim" pkgs.vimPlugins.better-escape-nvim;
package = helpers.mkPluginPackageOption "better-escape.nvim" pkgs.vimPlugins.better-escape-nvim;
mapping = helpers.mkNullOrOption (with types; listOf str) ''
List of mappings to use to enter escape mode.

View file

@ -86,7 +86,7 @@ in
options.plugins.clipboard-image = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "clipboard-image.nvim";
package = helpers.mkPackageOption "clipboard-image.nvim" pkgs.vimPlugins.clipboard-image-nvim;
package = helpers.mkPluginPackageOption "clipboard-image.nvim" pkgs.vimPlugins.clipboard-image-nvim;
clipboardPackage = mkOption {
type = with types; nullOr package;

View file

@ -16,7 +16,7 @@ in
plugins.commentary = {
enable = mkEnableOption "commentary";
package = helpers.mkPackageOption "commentary" pkgs.vimPlugins.vim-commentary;
package = helpers.mkPluginPackageOption "commentary" pkgs.vimPlugins.vim-commentary;
};
};

View file

@ -13,7 +13,7 @@ in
options.plugins.conjure = {
enable = mkEnableOption "Conjure";
package = helpers.mkPackageOption "conjure" pkgs.vimPlugins.conjure;
package = helpers.mkPluginPackageOption "conjure" pkgs.vimPlugins.conjure;
};
config = mkIf cfg.enable { extraPlugins = [ cfg.package ]; };

View file

@ -56,7 +56,7 @@ in
options.plugins.coverage = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "nvim-coverage";
package = helpers.mkPackageOption "nvim-coverage" pkgs.vimPlugins.nvim-coverage;
package = helpers.mkPluginPackageOption "nvim-coverage" pkgs.vimPlugins.nvim-coverage;
keymapsSilent = mkOption {
type = types.bool;

View file

@ -13,7 +13,7 @@ in
options.plugins.cursorline = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "nvim-cursorline";
package = helpers.mkPackageOption "nvim-cursorline" pkgs.vimPlugins.nvim-cursorline;
package = helpers.mkPluginPackageOption "nvim-cursorline" pkgs.vimPlugins.nvim-cursorline;
cursorline = {
enable = helpers.defaultNullOpts.mkBool true "Show / hide cursorline in connection with cursor moving.";

View file

@ -14,7 +14,7 @@ in
plugins.dashboard = {
enable = mkEnableOption "dashboard";
package = helpers.mkPackageOption "dashboard" pkgs.vimPlugins.dashboard-nvim;
package = helpers.mkPluginPackageOption "dashboard" pkgs.vimPlugins.dashboard-nvim;
header = mkOption {
description = "Header text";

View file

@ -14,7 +14,7 @@ in
plugins.easyescape = {
enable = mkEnableOption "easyescape";
package = helpers.mkPackageOption "easyescape" pkgs.vimPlugins.vim-easyescape;
package = helpers.mkPluginPackageOption "easyescape" pkgs.vimPlugins.vim-easyescape;
};
};
config = mkIf cfg.enable { extraPlugins = [ cfg.package ]; };

View file

@ -278,7 +278,7 @@ in
// {
enable = mkEnableOption "flash.nvim";
package = helpers.mkPackageOption "flash.nvim" pkgs.vimPlugins.flash-nvim;
package = helpers.mkPluginPackageOption "flash.nvim" pkgs.vimPlugins.flash-nvim;
modes =
let

View file

@ -200,7 +200,7 @@ in
{
enable = mkEnableOption "floaterm";
package = helpers.mkPackageOption "floaterm" pkgs.vimPlugins.vim-floaterm;
package = helpers.mkPluginPackageOption "floaterm" pkgs.vimPlugins.vim-floaterm;
keymaps = keymapOptions;
}

View file

@ -14,7 +14,7 @@ in
plugins.hardtime = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "hardtime";
package = helpers.mkPackageOption "hardtime" pkgs.vimPlugins.hardtime-nvim;
package = helpers.mkPluginPackageOption "hardtime" pkgs.vimPlugins.hardtime-nvim;
maxTime = helpers.defaultNullOpts.mkUnsignedInt 1000 ''
Maximum time (in milliseconds) to consider key presses as repeated.

View file

@ -25,7 +25,7 @@ in
options.plugins.harpoon = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "harpoon";
package = helpers.mkPackageOption "harpoon" pkgs.vimPlugins.harpoon;
package = helpers.mkPluginPackageOption "harpoon" pkgs.vimPlugins.harpoon;
enableTelescope = mkEnableOption "telescope integration";

View file

@ -74,7 +74,7 @@ in
// {
enable = mkEnableOption "vim-illuminate";
package = mkPackageOption "vim-illuminate" pkgs.vimPlugins.vim-illuminate;
package = mkPluginPackageOption "vim-illuminate" pkgs.vimPlugins.vim-illuminate;
filetypeOverrides =
helpers.defaultNullOpts.mkNullable

View file

@ -14,7 +14,7 @@ in
plugins.intellitab = {
enable = mkEnableOption "intellitab.nvim";
package = helpers.mkPackageOption "intellitab.nvim" pkgs.vimPlugins.intellitab-nvim;
package = helpers.mkPluginPackageOption "intellitab.nvim" pkgs.vimPlugins.intellitab-nvim;
};
};

View file

@ -13,7 +13,7 @@ with lib;
options.plugins.lastplace = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "lastplace";
package = helpers.mkPackageOption "lastplace" pkgs.vimPlugins.nvim-lastplace;
package = helpers.mkPluginPackageOption "lastplace" pkgs.vimPlugins.nvim-lastplace;
ignoreBuftype =
helpers.defaultNullOpts.mkNullable (types.listOf types.str) ''["quickfix" "nofix" "help"]''

View file

@ -13,7 +13,7 @@ in
options.plugins.leap = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "leap.nvim";
package = helpers.mkPackageOption "leap.nvim" pkgs.vimPlugins.leap-nvim;
package = helpers.mkPluginPackageOption "leap.nvim" pkgs.vimPlugins.leap-nvim;
addDefaultMappings = mkOption {
type = types.bool;

View file

@ -13,7 +13,7 @@ in
options.plugins.mark-radar = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "mark-radar";
package = helpers.mkPackageOption "mark-radar" pkgs.vimPlugins.mark-radar-nvim;
package = helpers.mkPluginPackageOption "mark-radar" pkgs.vimPlugins.mark-radar-nvim;
setDefaultMappings = helpers.defaultNullOpts.mkBool true "Whether to set default mappings.";

View file

@ -15,7 +15,7 @@ in
options.plugins.marks = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "marks.nvim";
package = helpers.mkPackageOption "marks.nvim" pkgs.vimPlugins.marks-nvim;
package = helpers.mkPluginPackageOption "marks.nvim" pkgs.vimPlugins.marks-nvim;
builtinMarks =
helpers.defaultNullOpts.mkListOf

View file

@ -13,7 +13,7 @@ in
options.plugins.mini = {
enable = mkEnableOption "mini.nvim";
package = helpers.mkPackageOption "mini.nvim" pkgs.vimPlugins.mini-nvim;
package = helpers.mkPluginPackageOption "mini.nvim" pkgs.vimPlugins.mini-nvim;
modules = mkOption {
type = with types; attrsOf attrs;

View file

@ -13,7 +13,7 @@ in
options.plugins.mkdnflow = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "mkdnflow.nvim";
package = helpers.mkPackageOption "mkdnflow.nvim" pkgs.vimPlugins.mkdnflow-nvim;
package = helpers.mkPluginPackageOption "mkdnflow.nvim" pkgs.vimPlugins.mkdnflow-nvim;
modules =
mapAttrs

View file

@ -48,7 +48,7 @@ in
plugins.multicursors = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "multicursors.nvim";
package = helpers.mkPackageOption "multicursors.nvim" pkgs.vimPlugins.multicursors-nvim;
package = helpers.mkPluginPackageOption "multicursors.nvim" pkgs.vimPlugins.multicursors-nvim;
debugMode = helpers.defaultNullOpts.mkBool false "Enable debug mode.";

View file

@ -16,7 +16,7 @@ in
options.plugins.navbuddy = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "nvim-navbuddy";
package = helpers.mkPackageOption "nvim-navbuddy" pkgs.vimPlugins.nvim-navbuddy;
package = helpers.mkPluginPackageOption "nvim-navbuddy" pkgs.vimPlugins.nvim-navbuddy;
window = {
border = helpers.defaultNullOpts.mkBorder "rounded" "window border" ''

View file

@ -47,7 +47,7 @@ in
options.plugins.neogen = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "neogen";
package = helpers.mkPackageOption "neogen" pkgs.vimPlugins.neogen;
package = helpers.mkPluginPackageOption "neogen" pkgs.vimPlugins.neogen;
keymaps = mapAttrs (
optionsName: properties: helpers.mkNullOrOption types.str properties.description

View file

@ -13,7 +13,7 @@ with lib;
options.plugins.neorg = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "neorg";
package = helpers.mkPackageOption "neorg" pkgs.vimPlugins.neorg;
package = helpers.mkPluginPackageOption "neorg" pkgs.vimPlugins.neorg;
lazyLoading = helpers.defaultNullOpts.mkBool false '''';

View file

@ -10,7 +10,7 @@ with lib;
options.plugins.netman = {
enable = mkEnableOption "netman.nvim, a framework to access remote resources";
package = helpers.mkPackageOption "netman.nvim" pkgs.vimPlugins.netman-nvim;
package = helpers.mkPluginPackageOption "netman.nvim" pkgs.vimPlugins.netman-nvim;
neoTreeIntegration = mkEnableOption "support for netman as a neo-tree source";
};

View file

@ -13,7 +13,7 @@ in
options.plugins.nix-develop = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "nix-develop.nvim";
package = helpers.mkPackageOption "nix-develop.nvim" pkgs.vimPlugins.nix-develop-nvim;
package = helpers.mkPluginPackageOption "nix-develop.nvim" pkgs.vimPlugins.nix-develop-nvim;
ignoredVariables = mkOption {
type = types.attrsOf types.bool;

View file

@ -13,7 +13,7 @@ in
options.plugins.notify = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "nvim-notify";
package = helpers.mkPackageOption "nvim-notify" pkgs.vimPlugins.nvim-notify;
package = helpers.mkPluginPackageOption "nvim-notify" pkgs.vimPlugins.nvim-notify;
level = helpers.defaultNullOpts.mkLogLevel "info" ''
Minimum log level to display. See `vim.log.levels`.

View file

@ -13,7 +13,7 @@ in
options.plugins.nvim-bqf = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "nvim-bqf";
package = helpers.mkPackageOption "nvim-bqf" pkgs.vimPlugins.nvim-bqf;
package = helpers.mkPluginPackageOption "nvim-bqf" pkgs.vimPlugins.nvim-bqf;
autoEnable = helpers.defaultNullOpts.mkBool true ''
Enable nvim-bqf in quickfix window automatically.

View file

@ -104,7 +104,7 @@ in
plugins.nvim-colorizer = {
enable = mkEnableOption "nvim-colorizer";
package = helpers.mkPackageOption "nvim-colorizer" pkgs.vimPlugins.nvim-colorizer-lua;
package = helpers.mkPluginPackageOption "nvim-colorizer" pkgs.vimPlugins.nvim-colorizer-lua;
fileTypes = mkOption {
description = "Enable and/or configure highlighting for certain filetypes";

View file

@ -10,7 +10,7 @@ with lib;
options.plugins.nvim-osc52 = {
enable = mkEnableOption "nvim-osc52, a plugin to use OSC52 sequences to copy/paste";
package = helpers.mkPackageOption "nvim-osc52" pkgs.vimPlugins.nvim-osc52;
package = helpers.mkPluginPackageOption "nvim-osc52" pkgs.vimPlugins.nvim-osc52;
maxLength = helpers.defaultNullOpts.mkInt 0 "Maximum length of selection (0 for no limit)";
silent = helpers.defaultNullOpts.mkBool false "Disable message on successful copy";

View file

@ -13,7 +13,7 @@ in
options.plugins.nvim-ufo = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "nvim-ufo";
package = helpers.mkPackageOption "nvim-ufo" pkgs.vimPlugins.nvim-ufo;
package = helpers.mkPluginPackageOption "nvim-ufo" pkgs.vimPlugins.nvim-ufo;
openFoldHlTimeout = helpers.defaultNullOpts.mkInt 400 ''
Time in millisecond between the range to be highlgihted and to be cleared

View file

@ -63,7 +63,7 @@ in
options.plugins.ollama = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "ollama.nvim";
package = helpers.mkPackageOption "ollama.nvim" pkgs.vimPlugins.ollama-nvim;
package = helpers.mkPluginPackageOption "ollama.nvim" pkgs.vimPlugins.ollama-nvim;
model = helpers.defaultNullOpts.mkStr "mistral" ''
The default model to use.

View file

@ -10,7 +10,7 @@ with lib;
options.plugins.persistence = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "persistence.nvim";
package = helpers.mkPackageOption "persistence.nvim" pkgs.vimPlugins.persistence-nvim;
package = helpers.mkPluginPackageOption "persistence.nvim" pkgs.vimPlugins.persistence-nvim;
dir =
helpers.defaultNullOpts.mkNullable (with types; either str helpers.nixvimTypes.rawLua)

View file

@ -13,7 +13,7 @@ in
options = {
plugins.presence-nvim = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "presence-nvim";
package = helpers.mkPackageOption "presence-nvim" pkgs.vimPlugins.presence-nvim;
package = helpers.mkPluginPackageOption "presence-nvim" pkgs.vimPlugins.presence-nvim;
# General options.
autoUpdate = helpers.defaultNullOpts.mkBool true ''

View file

@ -30,7 +30,7 @@ in
options.plugins.project-nvim = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "project.nvim";
package = helpers.mkPackageOption "project-nvim" pkgs.vimPlugins.project-nvim;
package = helpers.mkPluginPackageOption "project-nvim" pkgs.vimPlugins.project-nvim;
manualMode = helpers.defaultNullOpts.mkBool false ''
Manual mode doesn't automatically change your root directory, so you have the option to

View file

@ -13,7 +13,7 @@ in
options.plugins.quickmath = {
enable = mkEnableOption "quickmath.nvim";
package = helpers.mkPackageOption "quickmath.nvim" pkgs.vimPlugins.quickmath-nvim;
package = helpers.mkPluginPackageOption "quickmath.nvim" pkgs.vimPlugins.quickmath-nvim;
keymap = {
key = helpers.mkNullOrOption types.str "Keymap to run the `:Quickmath` command.";

View file

@ -10,7 +10,7 @@ with lib;
options.plugins.refactoring = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "refactoring.nvim";
package = helpers.mkPackageOption "refactoring.nvim" pkgs.vimPlugins.refactoring-nvim;
package = helpers.mkPluginPackageOption "refactoring.nvim" pkgs.vimPlugins.refactoring-nvim;
promptFuncReturnType =
helpers.defaultNullOpts.mkNullable (with types; attrsOf bool)

View file

@ -13,7 +13,7 @@ in
options.plugins.specs = {
enable = mkEnableOption "specs-nvim";
package = helpers.mkPackageOption "specs-nvim" pkgs.vimPlugins.specs-nvim;
package = helpers.mkPluginPackageOption "specs-nvim" pkgs.vimPlugins.specs-nvim;
show_jumps = mkOption {
type = types.bool;

View file

@ -14,7 +14,7 @@ in
options.plugins.${pluginName} = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption pluginName;
package = helpers.mkPackageOption pluginName pkgs.vimPlugins.nvim-spider;
package = helpers.mkPluginPackageOption pluginName pkgs.vimPlugins.nvim-spider;
skipInsignificantPunctuation = helpers.defaultNullOpts.mkBool true "Whether to skip insignificant punctuation.";

View file

@ -15,7 +15,7 @@ in
options.plugins.startup = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "startup.nvim";
package = helpers.mkPackageOption "startup.nvim" pkgs.vimPlugins.startup-nvim;
package = helpers.mkPluginPackageOption "startup.nvim" pkgs.vimPlugins.startup-nvim;
theme = helpers.defaultNullOpts.mkStr "dashboard" ''
Use a pre-defined theme.

View file

@ -28,7 +28,7 @@ in
plugins.todo-comments = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "todo-comments";
package = helpers.mkPackageOption "todo-comments" pkgs.vimPlugins.todo-comments-nvim;
package = helpers.mkPluginPackageOption "todo-comments" pkgs.vimPlugins.todo-comments-nvim;
ripgrepPackage = mkOption {
type = with types; nullOr package;

View file

@ -13,7 +13,7 @@ in
options.plugins.vim-bbye = {
enable = mkEnableOption "vim-bbye";
package = helpers.mkPackageOption "vim-bbye" pkgs.vimPlugins.vim-bbye;
package = helpers.mkPluginPackageOption "vim-bbye" pkgs.vimPlugins.vim-bbye;
keymapsSilent = mkOption {
type = types.bool;

View file

@ -10,7 +10,7 @@ with lib;
options.plugins.vim-matchup = {
enable = mkEnableOption "vim-matchup";
package = helpers.mkPackageOption "vim-matchup" pkgs.vimPlugins.vim-matchup;
package = helpers.mkPluginPackageOption "vim-matchup" pkgs.vimPlugins.vim-matchup;
treesitterIntegration = {
enable = mkEnableOption "treesitter integration";

View file

@ -10,7 +10,7 @@ with lib;
options.plugins.which-key = {
enable = mkEnableOption "which-key.nvim, a plugin that popup with possible key bindings of the command you started typing";
package = helpers.mkPackageOption "which-key-nvim" pkgs.vimPlugins.which-key-nvim;
package = helpers.mkPluginPackageOption "which-key-nvim" pkgs.vimPlugins.which-key-nvim;
registrations = mkOption {
type = with types; attrsOf anything;

View file

@ -66,7 +66,7 @@ in
options.plugins.wilder = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "wilder-nvim";
package = helpers.mkPackageOption "wilder-nvim" pkgs.vimPlugins.wilder-nvim;
package = helpers.mkPluginPackageOption "wilder-nvim" pkgs.vimPlugins.wilder-nvim;
### Setup options ###
enableCmdlineEnter = helpers.defaultNullOpts.mkBool true ''

View file

@ -13,7 +13,7 @@ in
options.plugins.yanky = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "yanky.nvim";
package = helpers.mkPackageOption "yanky.nvim" pkgs.vimPlugins.yanky-nvim;
package = helpers.mkPluginPackageOption "yanky.nvim" pkgs.vimPlugins.yanky-nvim;
ring = {
historyLength = helpers.defaultNullOpts.mkUnsignedInt 100 ''

View file

@ -10,7 +10,7 @@ with lib;
options.plugins.zk = {
enable = mkEnableOption "zk.nvim, a plugin to integrate with zk";
package = helpers.mkPackageOption "zk.nvim" pkgs.vimPlugins.zk-nvim;
package = helpers.mkPluginPackageOption "zk.nvim" pkgs.vimPlugins.zk-nvim;
picker =
helpers.defaultNullOpts.mkEnumFirstDefault