lib/helpers: extraOptionsOptions -> neovim-plugin.extraOptionsOptions

2025-06-27 11:08:53 +02:00 · 2024-01-25 16:15:55 +01:00 · 2024-01-25 16:15:55 +01:00 · e2c3459d1d
commit e2c3459d1d
parent 8b91bf010a
89 changed files with 103 additions and 97 deletions
--- a/plugins/utils/auto-save.nix
+++ b/plugins/utils/auto-save.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.auto-save;
 in {
  options.plugins.auto-save =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "auto-save";

--- a/plugins/utils/auto-session.nix
+++ b/plugins/utils/auto-session.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.auto-session;
 in {
  options.plugins.auto-session =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "auto-session";

--- a/plugins/utils/better-escape.nix
+++ b/plugins/utils/better-escape.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.better-escape;
 in {
  options.plugins.better-escape =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "better-escape.nvim";

--- a/plugins/utils/clipboard-image.nix
+++ b/plugins/utils/clipboard-image.nix
@ -85,7 +85,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.clipboard-image =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "clipboard-image.nvim";

--- a/plugins/utils/coverage.nix
+++ b/plugins/utils/coverage.nix
@ -52,7 +52,7 @@ with lib; let
  };
 in {
  options.plugins.coverage =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-coverage";

--- a/plugins/utils/cursorline.nix
+++ b/plugins/utils/cursorline.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.cursorline;
 in {
  options.plugins.cursorline =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-cursorline";

--- a/plugins/utils/flash.nix
+++ b/plugins/utils/flash.nix
@ -238,7 +238,7 @@ in {
      };
    };
  in
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "flash.nvim";

--- a/plugins/utils/hardtime.nix
+++ b/plugins/utils/hardtime.nix
@ -10,7 +10,7 @@ with lib; let
 in {
  options = {
    plugins.hardtime =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "hardtime";

--- a/plugins/utils/harpoon.nix
+++ b/plugins/utils/harpoon.nix
@ -21,7 +21,7 @@ with lib; let
  };
 in {
  options.plugins.harpoon =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "harpoon";

--- a/plugins/utils/illuminate.nix
+++ b/plugins/utils/illuminate.nix
@ -67,7 +67,7 @@ with lib; let
 in {
  options.plugins.illuminate = with helpers;
  with defaultNullOpts;
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "vim-illuminate";

--- a/plugins/utils/indent-blankline.nix
+++ b/plugins/utils/indent-blankline.nix
@ -75,7 +75,7 @@ in {
    );

  options.plugins.indent-blankline =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "indent-blankline.nvim";

--- a/plugins/utils/lastplace.nix
+++ b/plugins/utils/lastplace.nix
@ -9,7 +9,7 @@
 in
  with lib; {
    options.plugins.lastplace =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "lastplace";

--- a/plugins/utils/leap.nix
+++ b/plugins/utils/leap.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.leap;
 in {
  options.plugins.leap =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "leap.nvim";

--- a/plugins/utils/mark-radar.nix
+++ b/plugins/utils/mark-radar.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.mark-radar;
 in {
  options.plugins.mark-radar =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "mark-radar";

--- a/plugins/utils/marks.nix
+++ b/plugins/utils/marks.nix
@ -11,7 +11,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.marks =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "marks.nvim";

--- a/plugins/utils/mkdnflow.nix
+++ b/plugins/utils/mkdnflow.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.mkdnflow;
 in {
  options.plugins.mkdnflow =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "mkdnflow.nvim";

--- a/plugins/utils/multicursors.nix
+++ b/plugins/utils/multicursors.nix
@ -45,7 +45,7 @@ with lib; let
 in {
  options = {
    plugins.multicursors =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "multicursors.nvim";

--- a/plugins/utils/navbuddy.nix
+++ b/plugins/utils/navbuddy.nix
@ -12,7 +12,7 @@ with lib; let
  mkPercentageOpt = default: helpers.defaultNullOpts.mkNullable percentageType (toString default);
 in {
  options.plugins.navbuddy =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-navbuddy";

--- a/plugins/utils/neogen.nix
+++ b/plugins/utils/neogen.nix
@ -43,7 +43,7 @@ with lib; let
  };
 in {
  options.plugins.neogen =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "neogen";

--- a/plugins/utils/neorg.nix
+++ b/plugins/utils/neorg.nix
@ -9,7 +9,7 @@
 in
  with lib; {
    options.plugins.neorg =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "neorg";

--- a/plugins/utils/nix-develop.nix
+++ b/plugins/utils/nix-develop.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.nix-develop;
 in {
  options.plugins.nix-develop =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nix-develop.nvim";

--- a/plugins/utils/notify.nix
+++ b/plugins/utils/notify.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.notify;
 in {
  options.plugins.notify =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-notify";

--- a/plugins/utils/nvim-autopairs.nix
+++ b/plugins/utils/nvim-autopairs.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.nvim-autopairs;
 in {
  options.plugins.nvim-autopairs =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-autopairs";

--- a/plugins/utils/nvim-bqf.nix
+++ b/plugins/utils/nvim-bqf.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.nvim-bqf;
 in {
  options.plugins.nvim-bqf =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-bqf";

--- a/plugins/utils/nvim-ufo.nix
+++ b/plugins/utils/nvim-ufo.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.nvim-ufo;
 in {
  options.plugins.nvim-ufo =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-ufo";

--- a/plugins/utils/obsidian.nix
+++ b/plugins/utils/obsidian.nix
@ -438,7 +438,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.obsidian =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "obsidian.nvim";

--- a/plugins/utils/oil.nix
+++ b/plugins/utils/oil.nix
@ -60,7 +60,7 @@ with lib; let
  };
 in {
  options.plugins.oil =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "oil";

--- a/plugins/utils/ollama.nix
+++ b/plugins/utils/ollama.nix
@ -58,7 +58,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.ollama =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "ollama.nvim";

--- a/plugins/utils/persistence.nix
+++ b/plugins/utils/persistence.nix
@ -7,7 +7,7 @@
 }:
 with lib; {
  options.plugins.persistence =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "persistence.nvim";

--- a/plugins/utils/presence-nvim.nix
+++ b/plugins/utils/presence-nvim.nix
@ -10,7 +10,7 @@ with lib; let
 in {
  options = {
    plugins.presence-nvim =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "presence-nvim";
        package = helpers.mkPackageOption "presence-nvim" pkgs.vimPlugins.presence-nvim;
--- a/plugins/utils/project-nvim.nix
+++ b/plugins/utils/project-nvim.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.project-nvim;
 in {
  options.plugins.project-nvim =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "project.nvim";

--- a/plugins/utils/refactoring.nix
+++ b/plugins/utils/refactoring.nix
@ -7,7 +7,7 @@
 }:
 with lib; {
  options.plugins.refactoring =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "refactoring.nvim";

--- a/plugins/utils/rest.nix
+++ b/plugins/utils/rest.nix
@ -11,7 +11,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.rest =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "rest.nvim";

--- a/plugins/utils/spider.nix
+++ b/plugins/utils/spider.nix
@ -10,7 +10,7 @@ with lib; let
  cfg = config.plugins.${pluginName};
 in {
  options.plugins.${pluginName} =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption pluginName;

--- a/plugins/utils/startup.nix
+++ b/plugins/utils/startup.nix
@ -11,7 +11,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.startup =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "startup.nvim";

--- a/plugins/utils/todo-comments.nix
+++ b/plugins/utils/todo-comments.nix
@ -24,7 +24,7 @@ in {
  ];
  options = {
    plugins.todo-comments =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "todo-comments";

--- a/plugins/utils/wilder.nix
+++ b/plugins/utils/wilder.nix
@ -58,7 +58,7 @@ in {
  ];

  options.plugins.wilder =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "wilder-nvim";

--- a/plugins/utils/yanky.nix
+++ b/plugins/utils/yanky.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.yanky;
 in {
  options.plugins.yanky =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "yanky.nvim";

--- a/plugins/utils/zk.nix
+++ b/plugins/utils/zk.nix
@ -17,7 +17,7 @@ with lib; {

    lsp = {
      config =
-        helpers.extraOptionsOptions
+        helpers.neovim-plugin.extraOptionsOptions
        // {
          cmd = helpers.defaultNullOpts.mkNullable (types.listOf types.str) ''["zk" "lsp"]'' "";
          name = helpers.defaultNullOpts.mkStr "zk" "";