plugins/*: use new mkSettingsRenamedOptionModules

plugins/by-name/auto-save/default.nix

@@ -28,19 +28,14 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
     "triggerEvents"
     "writeAllBuffers"
     "debounceDelay"
+    {
+      old = "enableAutoSave";
+      new = "enabled";
+    }
   ];
 
-  imports =
+  imports = [
-    let
+    (lib.mkRemovedOptionModule [ "plugins" "auto-save" "keymaps" ] ''
-      basePluginPath = [
-        "plugins"
-        "auto-save"
-      ];
-      settingsPath = basePluginPath ++ [ "settings" ];
-    in
-    [
-      (lib.mkRenamedOptionModule (basePluginPath ++ [ "enableAutoSave" ]) (settingsPath ++ [ "enabled" ]))
-      (lib.mkRemovedOptionModule (basePluginPath ++ [ "keymaps" ]) ''
       Use the top-level `keymaps` option to create a keymap that runs :ASToggle
 
       keymaps = [

plugins/by-name/auto-session/default.nix

@@ -14,79 +14,9 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
 
   # TODO: added 204-10-05 remove after 24.11
   deprecateExtraOptions = true;
-  optionsRenamedToSettings = [
+  optionsRenamedToSettings = import ./renamed-options.nix;
-    "logLevel"
+  imports = [
-    [
+    (lib.mkRemovedOptionModule [ "plugins" "auto-session" "cwdChangeHandling" ] ''
-      "sessionLens"
-      "loadOnSetup"
-    ]
-    [
-      "sessionLens"
-      "themeConf"
-    ]
-    [
-      "sessionLens"
-      "previewer"
-    ]
-    [
-      "sessionControl"
-      "controlDir"
-    ]
-    [
-      "sessionControl"
-      "controlFilename"
-    ]
-  ];
-  # NOTE: rename the old settings to use the correct variables
-  imports =
-    let
-      basePluginPath = [
-        "plugins"
-        "auto-session"
-      ];
-      settingsPath = basePluginPath ++ [ "settings" ];
-      nestedAutoSessionPluginPath = basePluginPath ++ [ "autoSession" ];
-    in
-    [
-      (lib.mkRenamedOptionModule (
-        basePluginPath
-        ++ [
-          "autoSave"
-          "enabled"
-        ]
-      ) (settingsPath ++ [ "auto_save" ]))
-      (lib.mkRenamedOptionModule (
-        basePluginPath
-        ++ [
-          "autoRestore"
-          "enabled"
-        ]
-      ) (settingsPath ++ [ "auto_restore" ]))
-      (lib.mkRenamedOptionModule (basePluginPath ++ [ "bypassSessionSaveFileTypes" ]) (
-        settingsPath ++ [ "bypass_save_filetypes" ]
-      ))
-      (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "enableLastSession" ]) (
-        settingsPath ++ [ "auto_restore_last_session" ]
-      ))
-      (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "rootDir" ]) (
-        settingsPath ++ [ "root_dir" ]
-      ))
-      (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "enabled" ]) (
-        settingsPath ++ [ "enabled" ]
-      ))
-      (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "createEnabled" ]) (
-        settingsPath ++ [ "auto_create" ]
-      ))
-      (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "suppressDirs" ]) (
-        settingsPath ++ [ "suppressed_dirs" ]
-      ))
-      (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "allowedDirs" ]) (
-        settingsPath ++ [ "allowed_dirs" ]
-      ))
-      (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "useGitBranch" ]) (
-        settingsPath ++ [ "use_git_branch" ]
-      ))
-      (lib.mkRemovedOptionModule (basePluginPath ++ [ "cwdChangeHandling" ]) ''
       Please switch to `cwd_change_handling` with just a boolean value.
     '')
   ];

plugins/by-name/auto-session/renamed-options.nix

@@ -0,0 +1,90 @@
+[
+  "logLevel"
+  [
+    "sessionLens"
+    "loadOnSetup"
+  ]
+  [
+    "sessionLens"
+    "themeConf"
+  ]
+  [
+    "sessionLens"
+    "previewer"
+  ]
+  [
+    "sessionControl"
+    "controlDir"
+  ]
+  [
+    "sessionControl"
+    "controlFilename"
+  ]
+  {
+    old = [
+      "autoSave"
+      "enabled"
+    ];
+    new = "auto_save";
+  }
+  {
+    old = [
+      "autoRestore"
+      "enabled"
+    ];
+    new = "auto_auto_restore";
+  }
+  {
+    old = "bypassSessionSaveFileTypes";
+    new = "bypass_save_filetypes";
+  }
+  {
+    old = [
+      "autoSession"
+      "enableLastSession"
+    ];
+    new = "auto_restore_last_session";
+  }
+  {
+    old = [
+      "autoSession"
+      "rootDir"
+    ];
+    new = "root_dir";
+  }
+  {
+    old = [
+      "autoSession"
+      "enabled"
+    ];
+    new = "enabled";
+  }
+  {
+    old = [
+      "autoSession"
+      "createEnabled"
+    ];
+    new = "auto_create";
+  }
+  {
+    old = [
+      "autoSession"
+      "suppressDirs"
+    ];
+    new = "suppressed_dirs";
+  }
+  {
+    old = [
+      "autoSession"
+      "allowedDirs"
+    ];
+    new = "allowed_dirs";
+  }
+  {
+    old = [
+      "autoSession"
+      "useGitBranch"
+    ];
+    new = "use_git_branch";
+  }
+]

plugins/by-name/barbar/default.nix

@@ -125,6 +125,26 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
     "sidebarFiletypes"
     "noNameTitle"
     "tabpages"
+    {
+      old = "excludeFileTypes";
+      new = "exclude_ft";
+    }
+    {
+      old = "excludeFileNames";
+      new = "exclude_name";
+    }
+    {
+      old = [
+        "icons"
+        "filetype"
+        "enable"
+      ];
+      new = [
+        "icons"
+        "filetype"
+        "enabled"
+      ];
+    }
   ];
   imports =
     let
@@ -132,7 +152,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
         "plugins"
         "barbar"
       ];
-      settingsPath = basePluginPath ++ [ "settings" ];
     in
     [
       (mkRemovedOptionModule (
@@ -142,12 +161,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
           "silent"
         ]
       ) "Keymaps will be silent anyways. This option has always been useless.")
-      (mkRenamedOptionModule (basePluginPath ++ [ "excludeFileTypes" ]) (
-        settingsPath ++ [ "exclude_ft" ]
-      ))
-      (mkRenamedOptionModule (basePluginPath ++ [ "excludeFileNames" ]) (
-        settingsPath ++ [ "exclude_name" ]
-      ))
       (mkRemovedOptionModule (
         basePluginPath
         ++ [
@@ -155,26 +168,9 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
           "diagnostics"
         ]
       ) "Use `settings.icons.diagnostics` instead, but pay attention as the keys have changed.")
-      (mkRenamedOptionModule
-        (
-          basePluginPath
-          ++ [
-            "icons"
-            "filetype"
-            "enable"
     ]
-        )
+    ++
-        (
+      map
-          settingsPath
-          ++ [
-            "icons"
-            "filetype"
-            "enabled"
-          ]
-        )
-      )
-    ]
-    ++ (map
         (
           name:
           mkRemovedOptionModule (
@@ -192,8 +188,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
           "modified"
           "pinned"
           "visible"
-      ]
+        ];
-    );
 
   extraOptions = {
     keymaps = mapAttrs (

plugins/by-name/bufferline/default.nix

@@ -82,6 +82,13 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
           "logging"
         ]
         "customFilter"
+        {
+          old = "diagnosticsUpdateInInsert";
+          new = [
+            "diagnostics"
+            "update_in_insert"
+          ];
+        }
       ];
 
       oldHighlightOptions = [
@@ -142,6 +149,10 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
         "pickVisible"
         "pickSelected"
         "offsetSeparator"
+        {
+          old = "trunkMarker";
+          new = "trunc_marker";
+        }
       ];
 
       basePluginPath = [
@@ -155,13 +166,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
     in
     [
       (lib.mkRenamedOptionModule (basePluginPath ++ [ "extraOptions" ]) optionsPath)
-      (lib.mkRenamedOptionModule (basePluginPath ++ [ "diagnosticsUpdateInInsert" ]) [
-        "diagnostics"
-        "update_in_insert"
-      ])
-      (lib.mkRenamedOptionModule (oldHighlightsPath ++ [ "trunkMarker" ]) (
-        newHighlightsPath ++ [ "trunc_marker" ]
-      ))
     ]
     ++ mkSettingsRenamedOptionModules basePluginPath optionsPath oldOptions
     ++ mkSettingsRenamedOptionModules oldHighlightsPath newHighlightsPath oldHighlightOptions;

plugins/by-name/colorizer/default.nix

@@ -25,7 +25,24 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
         "colorizer"
       ];
 
-      optionsToRename = [
+      # {
+      #   old = ["userDefaultOptions" "RGB"]; }
+      #   new = ["settings" "user_default_options" "RGB"];
+      # }
+      userOptsRenames =
+        map
+          (name: {
+            old = [
+              "userDefaultOptions"
+              name
+            ];
+            new = [
+              "settings"
+              "user_default_options"
+              name
+            ];
+          })
+          [
             "RGB"
             "RRGGBB"
             "names"
@@ -41,44 +58,28 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
             "always_update"
           ];
 
-      renameOption =
-        optionName:
-        lib.mkRenamedOptionModule
-          (
-            oldPluginPath
-            ++ [
-              "userDefaultOptions"
-              optionName
-            ]
-          )
-          (
-            newPluginPath
-            ++ [
-              "settings"
-              "user_default_options"
-              optionName
-            ]
-          );
     in
-    map renameOption optionsToRename
+    lib.nixvim.mkSettingsRenamedOptionModules oldPluginPath newPluginPath (
-    ++
+      [
-      lib.mapAttrsToList
+        "enable"
-        (
+        "package"
-          oldOptionName: newPath:
-          lib.mkRenamedOptionModule (oldPluginPath ++ [ oldOptionName ]) (newPluginPath ++ newPath)
-        )
         {
-          enable = [ "enable" ];
+          old = "fileTypes";
-          package = [ "package" ];
+          new = [
-          fileTypes = [
             "settings"
             "filetypes"
           ];
-          bufTypes = [
+        }
+        {
+          old = "bufTypes";
+          new = [
             "settings"
-            "bufTypes"
+            "buftypes"
           ];
-        };
+        }
+      ]
+      ++ userOptsRenames
+    );
 
   settingsOptions =
     let

plugins/by-name/comment/default.nix

@@ -24,109 +24,12 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
         "comment"
       ];
       settingsPath = newPluginPath ++ [ "settings" ];
+
+      optionsRenamedToSettings = import ./renamed-options.nix;
     in
     [
       (mkRenamedOptionModule (oldPluginPath ++ [ "enable" ]) (newPluginPath ++ [ "enable" ]))
       (mkRenamedOptionModule (oldPluginPath ++ [ "package" ]) (newPluginPath ++ [ "package" ]))
-      (mkRenamedOptionModule (oldPluginPath ++ [ "padding" ]) (settingsPath ++ [ "padding" ]))
-      (mkRenamedOptionModule (oldPluginPath ++ [ "sticky" ]) (settingsPath ++ [ "sticky" ]))
-      (mkRenamedOptionModule (oldPluginPath ++ [ "ignore" ]) (settingsPath ++ [ "ignore" ]))
-      (mkRenamedOptionModule
-        (
-          oldPluginPath
-          ++ [
-            "toggler"
-            "line"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "toggler"
-            "line"
-          ]
-        )
-      )
-      (mkRenamedOptionModule
-        (
-          oldPluginPath
-          ++ [
-            "toggler"
-            "block"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "toggler"
-            "block"
-          ]
-        )
-      )
-      (mkRenamedOptionModule
-        (
-          oldPluginPath
-          ++ [
-            "opleader"
-            "line"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "opleader"
-            "line"
-          ]
-        )
-      )
-      (mkRenamedOptionModule
-        (
-          oldPluginPath
-          ++ [
-            "opleader"
-            "block"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "opleader"
-            "block"
-          ]
-        )
-      )
-      (mkRenamedOptionModule
-        (
-          oldPluginPath
-          ++ [
-            "mappings"
-            "basic"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "mappings"
-            "basic"
-          ]
-        )
-      )
-      (mkRenamedOptionModule
-        (
-          oldPluginPath
-          ++ [
-            "mappings"
-            "extra"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "mappings"
-            "extra"
-          ]
-        )
-      )
       (mkRemovedOptionModule (
         oldPluginPath
         ++ [
@@ -134,9 +37,8 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
           "extended"
         ]
       ) "This option has been removed upstream.")
-      (mkRenamedOptionModule (oldPluginPath ++ [ "preHook" ]) (settingsPath ++ [ "pre_hook" ]))
+    ]
-      (mkRenamedOptionModule (oldPluginPath ++ [ "postHook" ]) (settingsPath ++ [ "post_hook" ]))
+    ++ (lib.nixvim.mkSettingsRenamedOptionModules oldPluginPath settingsPath optionsRenamedToSettings);
-    ];
 
   settingsOptions = {
     padding = helpers.defaultNullOpts.mkBool true ''

plugins/by-name/comment/renamed-options.nix

@@ -0,0 +1,31 @@
+[
+  "padding"
+  "sticky"
+  "ignore"
+  [
+    "toggler"
+    "line"
+  ]
+  [
+    "toggler"
+    "block"
+  ]
+  [
+    "opleader"
+    "line"
+  ]
+  [
+    "opleader"
+    "block"
+  ]
+  [
+    "mappings"
+    "basic"
+  ]
+  [
+    "mappings"
+    "extra"
+  ]
+  "preHook"
+  "postHook"
+]

plugins/by-name/coq-nvim/default.nix

@@ -33,31 +33,20 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   optionsRenamedToSettings = [
     "xdg"
     "autoStart"
-  ];
+    {
-  imports =
+      old = "recommendedKeymaps";
-    let
+      new = [
-      basePath = [
-        "plugins"
-        "coq-nvim"
-      ];
-      settingsPath = basePath ++ [ "settings" ];
-    in
-    [
-      (lib.mkRenamedOptionModule (basePath ++ [ "recommendedKeymaps" ]) (
-        settingsPath
-        ++ [
         "keymap"
         "recommended"
-        ]
+      ];
-      ))
+    }
-
+    {
-      (lib.mkRenamedOptionModule (basePath ++ [ "alwaysComplete" ]) (
+      old = "alwaysComplete";
-        settingsPath
+      new = [
-        ++ [
         "completion"
         "always"
-        ]
+      ];
-      ))
+    }
   ];
 
   callSetup = false;

plugins/by-name/dashboard/default.nix

@@ -12,73 +12,84 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   maintainers = [ maintainers.MattSturgeon ];
 
   # TODO introduced 2024-05-30: remove 2024-09-01
-  imports =
+  optionsRenamedToSettings = [
-    let
-      basePluginPath = [
-        "plugins"
-        "dashboard"
-      ];
-    in
-    [
-      (mkRemovedOptionModule (
-        basePluginPath ++ [ "sessionDirectory" ]
-      ) "This plugin no longer has session support.")
-    ]
-    ++ (mapAttrsToList
-      (
-        old: new:
-        mkRenamedOptionModule (basePluginPath ++ [ old ]) (basePluginPath ++ [ "settings" ] ++ new)
-      )
     {
-        header = [
+      old = "header";
+      new = [
         "config"
         "header"
       ];
-        footer = [
+    }
+    {
+      old = "footer";
+      new = [
         "config"
         "footer"
       ];
-        center = [
+    }
+    {
+      old = "center";
+      new = [
         "config"
         "shortcut"
       ];
-        hideStatusline = [
+    }
+    {
+      old = "hideStatusline";
+      new = [
         "hide"
         "statusline"
       ];
-        hideTabline = [
+    }
+    {
+      old = "hideTabline";
+      new = [
         "hide"
         "tabline"
       ];
     }
-    )
+    [
-    ++ (mapAttrsToList
-      (
-        old: new:
-        mkRenamedOptionModule
-          (
-            basePluginPath
-            ++ [
       "preview"
-              old
+      "command"
     ]
-          )
-          (
-            basePluginPath
-            ++ [
-              "settings"
-              "preview"
-              new
-            ]
-          )
-      )
     {
-        command = "command";
+      old = [
-        file = "file_path";
+        "preview"
-        height = "file_height";
+        "file"
-        width = "file_width";
+      ];
+      new = [
+        "preview"
+        "file_path"
+      ];
     }
-    );
+    {
+      old = [
+        "preview"
+        "height"
+      ];
+      new = [
+        "preview"
+        "file_height"
+      ];
+    }
+    {
+      old = [
+        "preview"
+        "width"
+      ];
+      new = [
+        "preview"
+        "file_width"
+      ];
+    }
+  ];
+  imports = [
+    (mkRemovedOptionModule [
+      "plugins"
+      "dashboard"
+      "sessionDirectory"
+    ] "This plugin no longer has session support.")
+  ];
 
   settingsExample = {
     theme = "hyper";

plugins/by-name/emmet/default.nix

@@ -15,21 +15,12 @@ mkVimPlugin {
 
   # TODO introduced 2024-03-01: remove 2024-05-01
   deprecateExtraConfig = true;
-  optionsRenamedToSettings = [ "mode" ];
+  optionsRenamedToSettings = [
-  imports = [
+    "mode"
-    (mkRenamedOptionModule
+    {
-      [
+      old = "leader";
-        "plugins"
+      new = "leader_key";
-        "emmet"
+    }
-        "leader"
-      ]
-      [
-        "plugins"
-        "emmet"
-        "settings"
-        "leader_key"
-      ]
-    )
   ];
 
   settingsOptions = {

plugins/by-name/gitsigns/default.nix

@@ -15,114 +15,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
 
   # TODO: introduced 2024-03-12, remove on 2024-05-12
   deprecateExtraOptions = true;
-  optionsRenamedToSettings = [
+  optionsRenamedToSettings = import ./renamed-options.nix;
-    [
-      "signs"
-      "add"
-      "text"
-    ]
-    [
-      "signs"
-      "add"
-      "showCount"
-    ]
-    [
-      "signs"
-      "change"
-      "text"
-    ]
-    [
-      "signs"
-      "change"
-      "showCount"
-    ]
-    [
-      "signs"
-      "topdelete"
-      "text"
-    ]
-    [
-      "signs"
-      "topdelete"
-      "showCount"
-    ]
-    [
-      "signs"
-      "changedelete"
-      "text"
-    ]
-    [
-      "signs"
-      "changedelete"
-      "showCount"
-    ]
-    [
-      "signs"
-      "untracked"
-      "text"
-    ]
-    [
-      "signs"
-      "untracked"
-      "showCount"
-    ]
-    "worktrees"
-    "signPriority"
-    "signcolumn"
-    "numhl"
-    "linehl"
-    "showDeleted"
-    [
-      "diffOpts"
-      "algorithm"
-    ]
-    [
-      "diffOpts"
-      "internal"
-    ]
-    [
-      "diffOpts"
-      "indentHeuristic"
-    ]
-    [
-      "diffOpts"
-      "vertical"
-    ]
-    [
-      "diffOpts"
-      "linematch"
-    ]
-    "base"
-    "countChars"
-    "maxFileLength"
-    "previewConfig"
-    "attachToUntracked"
-    "updateDebounce"
-    "currentLineBlame"
-    [
-      "currentLineBlameOpts"
-      "virtText"
-    ]
-    [
-      "currentLineBlameOpts"
-      "virtTextPos"
-    ]
-    [
-      "currentLineBlameOpts"
-      "delay"
-    ]
-    [
-      "currentLineBlameOpts"
-      "ignoreWhitespace"
-    ]
-    [
-      "currentLineBlameOpts"
-      "virtTextPriority"
-    ]
-    "trouble"
-    "wordDiff"
-    "debugMode"
-  ];
   imports =
     let
       basePluginPaths = [
@@ -165,29 +58,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
       helpers.mkDeprecatedSubOptionModule optionPath "Please define the `${hlg}` highlight group instead."
     ) highlightRemovals)
     ++ [
-      (mkRenamedOptionModule (
-        basePluginPaths
-        ++ [
-          "onAttach"
-          "function"
-        ]
-      ) (settingsPath ++ [ "on_attach" ]))
-      (mkRenamedOptionModule
-        (
-          basePluginPaths
-          ++ [
-            "watchGitDir"
-            "enable"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "watch_gitdir"
-            "enable"
-          ]
-        )
-      )
       (mkRemovedOptionModule (
         basePluginPaths
         ++ [
@@ -195,43 +65,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
           "interval"
         ]
       ) "The option has been removed from upstream.")
-      (mkRenamedOptionModule
-        (
-          basePluginPaths
-          ++ [
-            "watchGitDir"
-            "followFiles"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "watch_gitdir"
-            "follow_files"
-          ]
-        )
-      )
-      (mkRenamedOptionModule (
-        basePluginPaths
-        ++ [
-          "statusFormatter"
-          "function"
-        ]
-      ) (settingsPath ++ [ "status_formatter" ]))
-      (mkRenamedOptionModule (
-        basePluginPaths
-        ++ [
-          "currentLineBlameFormatter"
-          "normal"
-        ]
-      ) (settingsPath ++ [ "current_line_blame_formatter" ]))
-      (mkRenamedOptionModule (
-        basePluginPaths
-        ++ [
-          "currentLineBlameFormatter"
-          "nonCommitted"
-        ]
-      ) (settingsPath ++ [ "current_line_blame_formatter_nc" ]))
       (helpers.mkDeprecatedSubOptionModule (
         settingsPath
         ++ [

plugins/by-name/gitsigns/renamed-options.nix

@@ -0,0 +1,156 @@
+[
+  [
+    "signs"
+    "add"
+    "text"
+  ]
+  [
+    "signs"
+    "add"
+    "showCount"
+  ]
+  [
+    "signs"
+    "change"
+    "text"
+  ]
+  [
+    "signs"
+    "change"
+    "showCount"
+  ]
+  [
+    "signs"
+    "topdelete"
+    "text"
+  ]
+  [
+    "signs"
+    "topdelete"
+    "showCount"
+  ]
+  [
+    "signs"
+    "changedelete"
+    "text"
+  ]
+  [
+    "signs"
+    "changedelete"
+    "showCount"
+  ]
+  [
+    "signs"
+    "untracked"
+    "text"
+  ]
+  [
+    "signs"
+    "untracked"
+    "showCount"
+  ]
+  "worktrees"
+  "signPriority"
+  "signcolumn"
+  "numhl"
+  "linehl"
+  "showDeleted"
+  [
+    "diffOpts"
+    "algorithm"
+  ]
+  [
+    "diffOpts"
+    "internal"
+  ]
+  [
+    "diffOpts"
+    "indentHeuristic"
+  ]
+  [
+    "diffOpts"
+    "vertical"
+  ]
+  [
+    "diffOpts"
+    "linematch"
+  ]
+  "base"
+  "countChars"
+  "maxFileLength"
+  "previewConfig"
+  "attachToUntracked"
+  "updateDebounce"
+  "currentLineBlame"
+  [
+    "currentLineBlameOpts"
+    "virtText"
+  ]
+  [
+    "currentLineBlameOpts"
+    "virtTextPos"
+  ]
+  [
+    "currentLineBlameOpts"
+    "delay"
+  ]
+  [
+    "currentLineBlameOpts"
+    "ignoreWhitespace"
+  ]
+  [
+    "currentLineBlameOpts"
+    "virtTextPriority"
+  ]
+  "trouble"
+  "wordDiff"
+  "debugMode"
+  {
+    old = [
+      "onAttach"
+      "function"
+    ];
+    new = "on_attach";
+  }
+  {
+    old = [
+      "watchGitDir"
+      "enable"
+    ];
+    new = [
+      "watch_gitdir"
+      "enable"
+    ];
+  }
+  {
+    old = [
+      "watchGitDir"
+      "followFiles"
+    ];
+    new = [
+      "watch_gitdir"
+      "follow_files"
+    ];
+  }
+  {
+    old = [
+      "statusFormatter"
+      "function"
+    ];
+    new = "status_formatter";
+  }
+  {
+    old = [
+      "currentLineBlameFormatter"
+      "normal"
+    ];
+    new = "current_line_blame_formatter";
+  }
+  {
+    old = [
+      "currentLineBlameFormatter"
+      "nonCommitted"
+    ];
+    new = "current_line_blame_formatter_nc";
+  }
+]

plugins/by-name/goyo/default.nix

@@ -18,21 +18,10 @@ mkVimPlugin {
   optionsRenamedToSettings = [
     "width"
     "height"
-  ];
+    {
-  imports = [
+      old = "showLineNumbers";
-    (mkRenamedOptionModule
+      new = "linenr";
-      [
+    }
-        "plugins"
-        "goyo"
-        "showLineNumbers"
-      ]
-      [
-        "plugins"
-        "goyo"
-        "settings"
-        "linenr"
-      ]
-    )
   ];
 
   settingsOptions = {

plugins/by-name/ledger/default.nix

@@ -19,29 +19,14 @@ mkVimPlugin {
   optionsRenamedToSettings = [
     "detailedFirst"
     "foldBlanks"
-  ];
+    {
-  imports =
+      old = "maxWidth";
-    let
+      new = "maxwidth";
-      basePluginPath = [
+    }
-        "plugins"
+    {
-        "ledger"
+      old = "fillString";
-      ];
+      new = "fillstring";
-    in
+    }
-    [
-      (mkRenamedOptionModule (basePluginPath ++ [ "maxWidth" ]) (
-        basePluginPath
-        ++ [
-          "settings"
-          "maxwidth"
-        ]
-      ))
-      (mkRenamedOptionModule (basePluginPath ++ [ "fillString" ]) (
-        basePluginPath
-        ++ [
-          "settings"
-          "fillstring"
-        ]
-      ))
   ];
 
   extraOptions = {

plugins/by-name/markdown-preview/default.nix

@@ -30,16 +30,14 @@ mkVimPlugin {
     "port"
     "pageTitle"
     "theme"
-  ];
+    {
-  imports = [
+      old = "fileTypes";
-    (mkRenamedOptionModule
+      new = "filetypes";
-      [ "plugins" "markdown-preview" "fileTypes" ]
+    }
-      [ "plugins" "markdown-preview" "settings" "filetypes" ]
+    {
-    )
+      old = "browserFunc";
-    (mkRenamedOptionModule
+      new = "browserfunc";
-      [ "plugins" "markdown-preview" "browserFunc" ]
+    }
-      [ "plugins" "markdown-preview" "settings" "browserfunc" ]
-    )
   ];
 
   settingsOptions = {

plugins/by-name/neorg/default.nix

@@ -46,6 +46,10 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
       "logger"
       "floatPrecision"
     ]
+    {
+      old = "modules";
+      new = "load";
+    }
   ];
   imports = [
     ./deprecations.nix

plugins/by-name/neorg/deprecations.nix

@@ -7,13 +7,6 @@ let
 in
 {
   imports = [
-    (lib.mkRenamedOptionModule (basePluginPath ++ [ "modules" ]) (
-      basePluginPath
-      ++ [
-        "settings"
-        "load"
-      ]
-    ))
     (lib.mkRemovedOptionModule (
       basePluginPath
       ++ [

plugins/by-name/none-ls/default.nix

@@ -32,6 +32,10 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
     "shouldAttach"
     "tempDir"
     "updateInInsert"
+    {
+      old = "sourcesItems";
+      new = "sources";
+    }
   ];
 
   imports =
@@ -45,12 +49,10 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
         namespace
         "none-ls"
       ];
-      settingsPath = basePluginPath ++ [ "settings" ];
     in
     [
       ./sources.nix
       (lib.mkRenamedOptionModule oldPluginPath basePluginPath)
-      (lib.mkRenamedOptionModule (basePluginPath ++ [ "sourcesItems" ]) (settingsPath ++ [ "sources" ]))
     ];
 
   settingsExample = {

plugins/by-name/nvim-autopairs/default.nix

@@ -28,23 +28,17 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
     "mapBs"
     "mapCH"
     "mapCW"
+    {
+      old = "disabledFiletypes";
+      new = "disable_filetype";
+    }
+    {
+      old = "enableAfterQuote";
+      new = "enable_afterquote";
+    }
   ];
-  imports =
+  imports = [
-    let
+    (mkRemovedOptionModule [ "plugins" "nvim-autopairs" "pairs" ] ''
-      basePluginPaths = [
-        "plugins"
-        "nvim-autopairs"
-      ];
-      settingsPath = basePluginPaths ++ [ "settings" ];
-    in
-    [
-      (mkRenamedOptionModule (basePluginPaths ++ [ "disabledFiletypes" ]) (
-        settingsPath ++ [ "disable_filetype" ]
-      ))
-      (mkRenamedOptionModule (basePluginPaths ++ [ "enableAfterQuote" ]) (
-        settingsPath ++ [ "enable_afterquote" ]
-      ))
-      (mkRemovedOptionModule (basePluginPaths ++ [ "pairs" ]) ''
       This option was having no effect.
       If you want to customize pairs, please use `luaConfig` to define them as described in the plugin documentation.
     '')

plugins/by-name/obsidian/default.nix

@@ -116,6 +116,22 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
       "imgTextFunc"
     ]
     "yamlParser"
+    {
+      old = "finder";
+      new = [
+        "settings"
+        "picker"
+        "name"
+      ];
+    }
+    # https://github.com/epwalsh/obsidian.nvim/blob/656d9c2c64528839db8b2d9a091843b3c90155a2/CHANGELOG.md?plain=1#L184
+    {
+      old = [
+        "completion"
+        "newNotesLocation"
+      ];
+      new = "new_notes_location";
+    }
   ];
   imports =
     let
@@ -131,32 +147,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
           basePluginPath ++ [ "workspaces" ]
         ) "Please use `plugins.obsidian.settings.workspaces` instead."
       )
-      (mkRenamedOptionModule (basePluginPath ++ [ "finder" ]) (
-        basePluginPath
-        ++ [
-          "settings"
-          "picker"
-          "name"
-        ]
-      ))
-      (
-        # https://github.com/epwalsh/obsidian.nvim/blob/656d9c2c64528839db8b2d9a091843b3c90155a2/CHANGELOG.md?plain=1#L184
-        mkRenamedOptionModule
-          (
-            basePluginPath
-            ++ [
-              "completion"
-              "newNotesLocation"
-            ]
-          )
-          (
-            basePluginPath
-            ++ [
-              "settings"
-              "new_notes_location"
-            ]
-          )
-      )
       (
         # We have to remove the option here because the user could set old-style camelCase options in each checkbox element.
         mkRemovedOptionModule (

plugins/by-name/oil/default.nix

@@ -164,6 +164,13 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
       "progress"
       "minimizedBorder"
     ]
+    {
+      old = "lspRenameAutosave";
+      new = [
+        "lsp_file_method"
+        "autosave_changes"
+      ];
+    }
   ];
   imports =
     let
@@ -171,19 +178,11 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
         "plugins"
         "oil"
       ];
-      settingsPath = basePluginPath ++ [ "settings" ];
     in
     [
       (mkRemovedOptionModule (
         basePluginPath ++ [ "columns" ]
       ) "Use `plugins.oil.settings.columns` instead but beware, the format has changed.")
-      (mkRenamedOptionModule (basePluginPath ++ [ "lspRenameAutosave" ]) (
-        settingsPath
-        ++ [
-          "lsp_file_method"
-          "autosave_changes"
-        ]
-      ))
       (mkRemovedOptionModule (
         basePluginPath ++ [ "trashCommand" ]
       ) "This option has been deprecated by upstream.")

plugins/by-name/rest/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 let
-  inherit (lib) mkRemovedOptionModule mkRenamedOptionModule types;
+  inherit (lib) mkRemovedOptionModule types;
   inherit (lib.nixvim) defaultNullOpts;
 in
 lib.nixvim.neovim-plugin.mkNeovimPlugin {
@@ -18,121 +18,15 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
 
   # TODO introduced 2024-04-07: remove 2024-06-07
   deprecateExtraOptions = true;
-  optionsRenamedToSettings = [
+  optionsRenamedToSettings = import ./renamed-options.nix;
-    "envFile"
-    "encodeUrl"
-    "skipSslVerification"
-    "customDynamicVariables"
-    [
-      "highlight"
-      "timeout"
-    ]
-  ];
   imports =
     let
       basePluginPath = [
         "plugins"
         "rest"
       ];
-      settingsPath = basePluginPath ++ [ "settings" ];
     in
     [
-      (mkRenamedOptionModule (basePluginPath ++ [ "resultSplitHorizontal" ]) (
-        settingsPath
-        ++ [
-          "result"
-          "split"
-          "horizontal"
-        ]
-      ))
-      (mkRenamedOptionModule (basePluginPath ++ [ "resultSplitInPlace" ]) (
-        settingsPath
-        ++ [
-          "result"
-          "split"
-          "in_place"
-        ]
-      ))
-      (mkRenamedOptionModule (basePluginPath ++ [ "stayInCurrentWindowAfterSplit" ]) (
-        settingsPath
-        ++ [
-          "result"
-          "split"
-          "stay_in_current_window_after_split"
-        ]
-      ))
-      (mkRenamedOptionModule
-        (
-          basePluginPath
-          ++ [
-            "result"
-            "showUrl"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "result"
-            "behavior"
-            "show_info"
-            "url"
-          ]
-        )
-      )
-      (mkRenamedOptionModule
-        (
-          basePluginPath
-          ++ [
-            "result"
-            "showHeaders"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "result"
-            "behavior"
-            "show_info"
-            "headers"
-          ]
-        )
-      )
-      (mkRenamedOptionModule
-        (
-          basePluginPath
-          ++ [
-            "result"
-            "showHttpInfo"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "result"
-            "behavior"
-            "show_info"
-            "http_info"
-          ]
-        )
-      )
-      (mkRenamedOptionModule
-        (
-          basePluginPath
-          ++ [
-            "result"
-            "showCurlCommand"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "result"
-            "behavior"
-            "show_info"
-            "curl_command"
-          ]
-        )
-      )
       (mkRemovedOptionModule
         (
           basePluginPath
@@ -146,48 +40,19 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
           Refer to the documentation for more information.
         ''
       )
-      (mkRenamedOptionModule
-        (
-          basePluginPath
-          ++ [
-            "result"
-            "formatters"
     ]
-        )
+    ++
+      map
         (
-          settingsPath
+          option:
-          ++ [
+          mkRemovedOptionModule (basePluginPath ++ [ option ]) ''
-            "result"
-            "behavior"
-            "formatters"
-          ]
-        )
-      )
-      (mkRenamedOptionModule
-        (
-          basePluginPath
-          ++ [
-            "highlight"
-            "enabled"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "highlight"
-            "enable"
-          ]
-        )
-      )
-      (mkRemovedOptionModule (basePluginPath ++ [ "jumpToRequest" ]) ''
             This option has been deprecated upstream.
-      '')
+          ''
-      (mkRemovedOptionModule (basePluginPath ++ [ "yankDryRun" ]) ''
+        )
-        This option has been deprecated upstream.
+        [
-      '')
+          "jumpToRequest"
-      (mkRemovedOptionModule (basePluginPath ++ [ "searchBack" ]) ''
+          "yankDryRun"
-        This option has been deprecated upstream.
+          "searchBack"
-      '')
         ];
 
   settingsOptions = {

plugins/by-name/rest/renamed-options.nix

@@ -0,0 +1,105 @@
+[
+  "envFile"
+  "encodeUrl"
+  "skipSslVerification"
+  "customDynamicVariables"
+  [
+    "highlight"
+    "timeout"
+  ]
+  {
+    old = "resultSplitHorizontal";
+    new = [
+      "result"
+      "split"
+      "horizontal"
+    ];
+  }
+  {
+    old = "resultSplitInPlace";
+    new = [
+      "result"
+      "split"
+      "in_place"
+    ];
+  }
+  {
+    old = "stayInCurrentWindowAfterSplit";
+    new = [
+      "result"
+      "split"
+      "stay_in_current_window_after_split"
+    ];
+  }
+  {
+    old = [
+      "result"
+      "showUrl"
+    ];
+    new = [
+
+      "result"
+      "behavior"
+      "show_info"
+      "url"
+    ];
+  }
+  {
+    old = [
+      "result"
+      "showHeaders"
+    ];
+    new = [
+
+      "result"
+      "behavior"
+      "show_info"
+      "headers"
+    ];
+  }
+  {
+    old = [
+      "result"
+      "showHttpInfo"
+    ];
+    new = [
+      "result"
+      "behavior"
+      "show_info"
+      "http_info"
+    ];
+  }
+  {
+    old = [
+      "result"
+      "showCurlCommand"
+    ];
+    new = [
+      "result"
+      "behavior"
+      "show_info"
+      "curl_command"
+    ];
+  }
+  {
+    old = [
+      "result"
+      "formatters"
+    ];
+    new = [
+      "result"
+      "behavior"
+      "formatters"
+    ];
+  }
+  {
+    old = [
+      "highlight"
+      "enabled"
+    ];
+    new = [
+      "highlight"
+      "enable"
+    ];
+  }
+]

plugins/by-name/specs/default.nix

@@ -15,45 +15,44 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   optionsRenamedToSettings = [
     "show_jumps"
     "min_jump"
+    {
+      old = "delay";
+      new = [
+        "popup"
+        "delay_ms"
+      ];
+    }
+    {
+      old = "increment";
+      new = [
+        "popup"
+        "inc_ms"
+      ];
+    }
+    {
+      old = "blend";
+      new = [
+        "popup"
+        "blend"
+      ];
+    }
+    {
+      old = "width";
+      new = [
+        "popup"
+        "width"
+      ];
+    }
   ];
   imports =
-    let
+    lib.mapAttrsToList (old: message: mkRemovedOptionModule [ "plugins" "specs" old ] message)
-      basePluginPath = [
+      {
-        "plugins"
+        color = "Please, use `settings.popup.winhl` directly.";
-        "specs"
+        fader = "Please, use `settings.popup.fader` directly.";
-      ];
+        resizer = "Please, use `settings.popup.resizer` directly.";
-      settingsPath = basePluginPath ++ [ "settings" ];
+        ignored_filetypes = "Please, use `settings.ignore_filetypes` instead.";
-      renameToPopup =
+        ignored_buffertypes = "Please, use `settings.ignore_buftypes` instead.";
-        old: new:
+      };
-        mkRenamedOptionModule (basePluginPath ++ [ old ]) (
-          settingsPath
-          ++ [
-            "popup"
-            new
-          ]
-        );
-    in
-    [
-      (renameToPopup "delay" "delay_ms")
-      (renameToPopup "increment" "inc_ms")
-      (renameToPopup "blend" "blend")
-      (renameToPopup "width" "width")
-      (mkRemovedOptionModule (
-        basePluginPath ++ [ "color" ]
-      ) "Please, use `settings.popup.winhl` directly.")
-      (mkRemovedOptionModule (
-        basePluginPath ++ [ "fader" ]
-      ) "Please, use `settings.popup.fader` directly.")
-      (mkRemovedOptionModule (
-        basePluginPath ++ [ "resizer" ]
-      ) "Please, use `settings.popup.resizer` directly.")
-      (mkRemovedOptionModule (
-        basePluginPath ++ [ "ignored_filetypes" ]
-      ) "Please, use `settings.ignore_filetypes` instead.")
-      (mkRemovedOptionModule (
-        basePluginPath ++ [ "ignored_buffertypes" ]
-      ) "Please, use `settings.ignore_buftypes` instead.")
-    ];
 
   settingsOptions = {
     show_jumps = helpers.defaultNullOpts.mkBool true ''

plugins/by-name/startify/default.nix

@@ -39,25 +39,6 @@ mkVimPlugin {
     "customFooter"
     "relativePath"
     "useEnv"
-  ];
-  imports =
-    map
-      (
-        option:
-        mkRenamedOptionModule
-          [
-            "plugins"
-            "startify"
-            option.old
-          ]
-          [
-            "plugins"
-            "startify"
-            "settings"
-            option.new
-          ]
-      )
-      [
     {
       old = "updateOldFiles";
       new = "update_oldfiles";

plugins/by-name/telescope/extensions/_mk-extension.nix

@@ -26,14 +26,7 @@ let
           ];
           settingsPath = basePluginPath ++ [ "settings" ];
         in
-        builtins.map (
+        lib.nixvim.mkSettingsRenamedOptionModules basePluginPath settingsPath optionsRenamedToSettings;
-          option:
-          let
-            optionPath = lib.toList option;
-            optionPathSnakeCase = map lib.nixvim.toSnakeCase optionPath;
-          in
-          lib.mkRenamedOptionModule (basePluginPath ++ optionPath) (settingsPath ++ optionPathSnakeCase)
-        ) optionsRenamedToSettings;
     };
 
   module =

plugins/by-name/telescope/extensions/media-files.nix

@@ -21,30 +21,27 @@ mkExtension {
         "telescope"
         "extensions"
       ];
+      oldPath = telescopeExtensionsPath ++ [ "media_files" ];
+      newPath = telescopeExtensionsPath ++ [ "media-files" ];
     in
-    mapAttrsToList
+    lib.nixvim.mkSettingsRenamedOptionModules oldPath newPath [
-      (
+      "enable"
-        oldOptionName: newOptionPath:
+      "package"
-        mkRenamedOptionModule (
-          telescopeExtensionsPath
-          ++ [
-            "media_files"
-            oldOptionName
-          ]
-        ) (telescopeExtensionsPath ++ [ "media-files" ] ++ newOptionPath)
-      )
       {
-        enable = [ "enable" ];
+        old = "filetypes";
-        package = [ "package" ];
+        new = [
-        filetypes = [
           "settings"
           "filetypes"
         ];
-        find_cmd = [
+      }
+      {
+        old = "find_cmd";
+        new = [
           "settings"
           "find_cmd"
         ];
-      };
+      }
+    ];
 
   extraOptions = {
     dependencies =

plugins/by-name/treesitter/default.nix

@@ -193,6 +193,27 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
       "initSelection"
       "scopeIncremental"
     ]
+    {
+      old = "customCaptures";
+      new = [
+        "highlight"
+        "custom_captures"
+      ];
+    }
+    {
+      old = "disabledLanguages";
+      new = [
+        "highlight"
+        "disable"
+      ];
+    }
+    {
+      old = "indent";
+      new = [
+        "indent"
+        "enable"
+      ];
+    }
   ];
 
   imports =
@@ -201,30 +222,10 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
         "plugins"
         "treesitter"
       ];
-      settingsPath = basePluginPath ++ [ "settings" ];
     in
     [
-      (lib.mkRenamedOptionModule (basePluginPath ++ [ "moduleConfig" ]) settingsPath)
+      (lib.mkRenamedOptionModule (basePluginPath ++ [ "moduleConfig" ]) (
-      (lib.mkRenamedOptionModule (basePluginPath ++ [ "customCaptures" ]) (
+        basePluginPath ++ [ "settings" ]
-        settingsPath
-        ++ [
-          "highlight"
-          "custom_captures"
-        ]
-      ))
-      (lib.mkRenamedOptionModule (basePluginPath ++ [ "disabledLanguages" ]) (
-        settingsPath
-        ++ [
-          "highlight"
-          "disable"
-        ]
-      ))
-      (lib.mkRenamedOptionModule (basePluginPath ++ [ "indent" ]) (
-        settingsPath
-        ++ [
-          "indent"
-          "enable"
-        ]
       ))
     ];
 

plugins/by-name/undotree/default.nix

@@ -13,42 +13,72 @@ mkVimPlugin {
 
   # TODO introduced 2024-02-22: remove 2024-04-22
   deprecateExtraConfig = true;
-  imports =
+  optionsRenamedToSettings = [
-    let
-      basePluginPath = [
-        "plugins"
-        "undotree"
-      ];
-    in
-    mapAttrsToList
-      (
-        old: new:
-        mkRenamedOptionModule (basePluginPath ++ [ old ]) (
-          basePluginPath
-          ++ [
-            "settings"
-            new
-          ]
-        )
-      )
     {
-        windowLayout = "WindowLayout";
+      old = "windowLayout";
-        shortIndicators = "ShortIndicators";
+      new = "WindowLayout";
-        windowWidth = "WindowWidth";
+    }
-        diffHeight = "DiffHeight";
+    {
-        autoOpenDiff = "AutoOpenDiff";
+      old = "shortIndicators";
-        focusOnToggle = "FocusOnToggle";
+      new = "ShortIndicators";
-        treeNodeShape = "TreeNodeShape";
+    }
-        diffCommand = "DiffCommand";
+    {
-        relativeTimestamp = "RelativeTimestamp";
+      old = "windowWidth";
-        highlightChangedText = "HighlightChangedText";
+      new = "WindowWidth";
-        highlightChangesWithSign = "HighlightChangesWithSign";
+    }
-        highlightSyntaxAdd = "HighlightSyntaxAdd";
+    {
-        highlightSyntaxChange = "HighlightSyntaxChange";
+      old = "diffHeight";
-        highlightSyntaxDel = "HighlightSyntaxDel";
+      new = "DiffHeight";
-        showHelpLine = "ShowHelpLine";
+    }
-        showCursorLine = "ShowCursorLine";
+    {
-      };
+      old = "autoOpenDiff";
+      new = "AutoOpenDiff";
+    }
+    {
+      old = "focusOnToggle";
+      new = "FocusOnToggle";
+    }
+    {
+      old = "treeNodeShape";
+      new = "TreeNodeShape";
+    }
+    {
+      old = "diffCommand";
+      new = "DiffCommand";
+    }
+    {
+      old = "relativeTimestamp";
+      new = "RelativeTimestamp";
+    }
+    {
+      old = "highlightChangedText";
+      new = "HighlightChangedText";
+    }
+    {
+      old = "highlightChangesWithSign";
+      new = "HighlightChangesWithSign";
+    }
+    {
+      old = "highlightSyntaxAdd";
+      new = "HighlightSyntaxAdd";
+    }
+    {
+      old = "highlightSyntaxChange";
+      new = "HighlightSyntaxChange";
+    }
+    {
+      old = "highlightSyntaxDel";
+      new = "HighlightSyntaxDel";
+    }
+    {
+      old = "showHelpLine";
+      new = "ShowHelpLine";
+    }
+    {
+      old = "showCursorLine";
+      new = "ShowCursorLine";
+    }
+  ];
 
   settingsExample = {
     WindowLayout = 4;

plugins/by-name/which-key/default.nix

@@ -77,142 +77,15 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   maintainers = [ lib.maintainers.khaneliman ];
 
   # TODO: introduced 2024-08-05: remove after 24.11
-  optionsRenamedToSettings = [
+  optionsRenamedToSettings = import ./renamed-options.nix;
-    "hidden"
-    "icons"
-    "ignoreMissing"
-    "keyLabels"
-    "layout"
-    "motions"
-    "operators"
-    [
-      "plugins"
-      "mark"
-    ]
-    [
-      "plugins"
-      "registers"
-    ]
-    [
-      "plugins"
-      "spelling"
-    ]
-    [
-      "plugins"
-      "presets"
-      "textObjects"
-    ]
-    [
-      "plugins"
-      "presets"
-      "operators"
-    ]
-    [
-      "plugins"
-      "presets"
-      "motions"
-    ]
-    [
-      "plugins"
-      "presets"
-      "windows"
-    ]
-    [
-      "plugins"
-      "presets"
-      "nav"
-    ]
-    [
-      "plugins"
-      "presets"
-      "z"
-    ]
-    [
-      "plugins"
-      "presets"
-      "g"
-    ]
-    "popupMappings"
-    "showHelp"
-    "showKeys"
-    "triggersBlackList"
-    "triggersNoWait"
-  ];
-
   imports =
     let
       basePluginPath = [
         "plugins"
         "which-key"
       ];
-      settingsPath = basePluginPath ++ [ "settings" ];
     in
     [
-      (lib.mkRenamedOptionModule
-        (
-          basePluginPath
-          ++ [
-            "disable"
-            "buftypes"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "disable"
-            "bt"
-          ]
-        )
-      )
-      (lib.mkRenamedOptionModule
-        (
-          basePluginPath
-          ++ [
-            "disable"
-            "filetypes"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "disable"
-            "ft"
-          ]
-        )
-      )
-      (lib.mkRenamedOptionModule
-        (
-          basePluginPath
-          ++ [
-            "window"
-            "winblend"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "win"
-            "wo"
-            "winblend"
-          ]
-        )
-      )
-      (lib.mkRenamedOptionModule
-        (
-          basePluginPath
-          ++ [
-            "window"
-            "border"
-          ]
-        )
-        (
-          settingsPath
-          ++ [
-            "win"
-            "border"
-          ]
-        )
-      )
       (lib.mkRemovedOptionModule (basePluginPath ++ [ "triggers" ]) ''
         Please use `plugins.which-key.settings.triggers` instead.
 

plugins/by-name/which-key/renamed-options.nix

@@ -0,0 +1,102 @@
+[
+  "hidden"
+  "icons"
+  "ignoreMissing"
+  "keyLabels"
+  "layout"
+  "motions"
+  "operators"
+  [
+    "plugins"
+    "mark"
+  ]
+  [
+    "plugins"
+    "registers"
+  ]
+  [
+    "plugins"
+    "spelling"
+  ]
+  [
+    "plugins"
+    "presets"
+    "textObjects"
+  ]
+  [
+    "plugins"
+    "presets"
+    "operators"
+  ]
+  [
+    "plugins"
+    "presets"
+    "motions"
+  ]
+  [
+    "plugins"
+    "presets"
+    "windows"
+  ]
+  [
+    "plugins"
+    "presets"
+    "nav"
+  ]
+  [
+    "plugins"
+    "presets"
+    "z"
+  ]
+  [
+    "plugins"
+    "presets"
+    "g"
+  ]
+  "popupMappings"
+  "showHelp"
+  "showKeys"
+  "triggersBlackList"
+  "triggersNoWait"
+  {
+    old = [
+      "disable"
+      "buftypes"
+    ];
+    new = [
+      "disable"
+      "bt"
+    ];
+  }
+  {
+    old = [
+      "disable"
+      "filetypes"
+    ];
+    new = [
+      "disable"
+      "ft"
+    ];
+  }
+  {
+    old = [
+      "window"
+      "winblend"
+    ];
+    new = [
+      "win"
+      "wo"
+      "winblend"
+    ];
+  }
+  {
+    old = [
+      "window"
+      "border"
+    ];
+    new = [
+      "win"
+      "border"
+    ];
+  }
+]

plugins/by-name/zig/default.nix

@@ -15,20 +15,11 @@ mkVimPlugin {
 
   # TODO introduced 2024-03-02: remove 2024-05-02
   deprecateExtraConfig = true;
-  imports = [
+  optionsRenamedToSettings = [
-    (mkRenamedOptionModule
+    {
-      [
+      old = "formatOnSave";
-        "plugins"
+      new = "fmt_autosave";
-        "zig"
+    }
-        "formatOnSave"
-      ]
-      [
-        "plugins"
-        "zig"
-        "settings"
-        "fmt_autosave"
-      ]
-    )
   ];
 
   settingsOptions = {

plugins/cmp/deprecations.nix

@@ -13,302 +13,158 @@ let
   settingsPath = newPluginBasePath ++ [ "settings" ];
 
   renamedOptions = [
-    {
+    [
-      old = [
       "performance"
       "debounce"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "performance"
       "throttle"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "performance"
       "fetchingTimeout"
-      ];
+    ]
-      new = [
+    [
-        "performance"
-        "fetching_timeout"
-      ];
-    }
-    {
-      old = [
       "performance"
       "asyncBudget"
-      ];
+    ]
-      new = [
+    [
-        "performance"
-        "async_budget"
-      ];
-    }
-    {
-      old = [
       "performance"
       "maxViewEntries"
-      ];
+    ]
-      new = [
+    "mapping"
-        "performance"
+    [
-        "max_view_entries"
-      ];
-    }
-    { old = [ "mapping" ]; }
-    {
-      old = [
       "completion"
       "keywordLength"
-      ];
+    ]
-      new = [
+    [
-        "completion"
-        "keyword_length"
-      ];
-    }
-    {
-      old = [
       "completion"
       "keywordPattern"
-      ];
+    ]
-      new = [
+    [
-        "completion"
-        "keyword_pattern"
-      ];
-    }
-    {
-      old = [
       "completion"
       "autocomplete"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "completion"
       "completeopt"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "confirmation"
       "getCommitCharacters"
-      ];
+    ]
-      new = [
+    [
-        "confirmation"
-        "get_commit_characters"
-      ];
-    }
-    {
-      old = [
       "formatting"
       "expandableIndicator"
-      ];
+    ]
-      new = [
+    [
-        "formatting"
-        "expandable_indicator"
-      ];
-    }
-    {
-      old = [
       "formatting"
       "fields"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "formatting"
       "format"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "matching"
       "disallowFuzzyMatching"
-      ];
+    ]
-      new = [
+    [
-        "matching"
-        "disallow_fuzzy_matching"
-      ];
-    }
-    {
-      old = [
       "matching"
       "disallowFullfuzzyMatching"
-      ];
+    ]
-      new = [
+    [
-        "matching"
-        "disallow_fullfuzzy_matching"
-      ];
-    }
-    {
-      old = [
       "matching"
       "disallowPartialFuzzyMatching"
-      ];
+    ]
-      new = [
+    [
-        "matching"
-        "disallow_partial_fuzzy_matching"
-      ];
-    }
-    {
-      old = [
       "matching"
       "disallowPartialMatching"
-      ];
+    ]
-      new = [
+    [
-        "matching"
-        "disallow_partial_matching"
-      ];
-    }
-    {
-      old = [
       "matching"
       "disallowPrefixUnmatching"
-      ];
+    ]
-      new = [
+    [
-        "matching"
-        "disallow_prefix_unmatching"
-      ];
-    }
-    {
-      old = [
       "sorting"
       "priorityWeight"
-      ];
+    ]
-      new = [
+    [
-        "sorting"
-        "priority_weight"
-      ];
-    }
-    {
-      old = [
       "view"
       "entries"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "view"
       "docs"
       "autoOpen"
-      ];
+    ]
-      new = [
+    [
-        "view"
-        "docs"
-        "auto_open"
-      ];
-    }
-    {
-      old = [
       "window"
       "completion"
       "border"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "window"
       "completion"
       "winhighlight"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "window"
       "completion"
       "zindex"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "window"
       "completion"
       "scrolloff"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "window"
       "completion"
       "colOffset"
-      ];
+    ]
-      new = [
+    [
-        "window"
-        "completion"
-        "col_offset"
-      ];
-    }
-    {
-      old = [
       "window"
       "completion"
       "sidePadding"
-      ];
+    ]
-      new = [
+    [
-        "window"
-        "completion"
-        "side_padding"
-      ];
-    }
-    {
-      old = [
       "window"
       "completion"
       "scrollbar"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "window"
       "documentation"
       "border"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "window"
       "documentation"
       "winhighlight"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "window"
       "documentation"
       "zindex"
-      ];
+    ]
-    }
+    [
-    {
-      old = [
       "window"
       "documentation"
       "maxWidth"
-      ];
+    ]
-      new = [
+    [
-        "window"
-        "documentation"
-        "max_width"
-      ];
-    }
-    {
-      old = [
       "window"
       "documentation"
       "maxHeight"
-      ];
+    ]
-      new = [
+    "experimental"
-        "window"
-        "documentation"
-        "max_height"
-      ];
-    }
-    { old = [ "experimental" ]; }
   ];
 
-  renameWarnings = map (
+  renameWarnings =
-    rename:
+    lib.nixvim.mkSettingsRenamedOptionModules oldPluginBasePath settingsPath
-    mkRenamedOptionModule (oldPluginBasePath ++ rename.old) (settingsPath ++ (rename.new or rename.old))
+      renamedOptions;
-  ) renamedOptions;
 in
 {
   imports = renameWarnings ++ [

plugins/colorschemes/catppuccin.nix

@@ -89,22 +89,27 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
     "colorOverrides"
     "customHighlights"
     "integrations"
-  ];
-  imports =
-    lib.mapAttrsToList
-      (
-        old: new:
-        lib.mkRenamedOptionModule
-          [ "colorschemes" "catppuccin" old ]
-          [ "colorschemes" "catppuccin" "settings" new ]
-      )
     {
-        showBufferEnd = "show_end_of_buffer";
+      old = "showBufferEnd";
-        terminalColors = "term_colors";
+      new = "show_end_of_buffer";
-        disableItalic = "no_italic";
+    }
-        disableBold = "no_bold";
+    {
-        disableUnderline = "no_underline";
+      old = "terminalColors";
-      };
+      new = "term_colors";
+    }
+    {
+      old = "disableItalic";
+      new = "no_italic";
+    }
+    {
+      old = "disableBold";
+      new = "no_bold";
+    }
+    {
+      old = "disableUnderline";
+      new = "no_underline";
+    }
+  ];
 
   settingsOptions =
     let

plugins/colorschemes/kanagawa.nix

@@ -22,31 +22,17 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
 
   # TODO introduced 2024-03-15: remove 2024-05-15
   deprecateExtraOptions = true;
-  imports =
+  optionsRenamedToSettings = [
-    let
+    "compile"
-      basePluginPath = [
+    "undercurl"
-        "colorschemes"
+    "commentStyle"
-        "kanagawa"
+    "functionStyle"
-      ];
+    "keywordStyle"
-    in
+    "statementStyle"
-    (map
+    "typeStyle"
-      (
+    "transparent"
-        optionPath:
+    "dimInactive"
-        lib.mkRenamedOptionModule (basePluginPath ++ optionPath) (
+    "terminalColors"
-          basePluginPath ++ [ "settings" ] ++ optionPath
-        )
-      )
-      [
-        [ "compile" ]
-        [ "undercurl" ]
-        [ "commentStyle" ]
-        [ "functionStyle" ]
-        [ "keywordStyle" ]
-        [ "statementStyle" ]
-        [ "typeStyle" ]
-        [ "transparent" ]
-        [ "dimInactive" ]
-        [ "terminalColors" ]
     [
       "colors"
       "palette"
@@ -55,7 +41,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
       "colors"
       "theme"
     ]
-        [ "theme" ]
+    "theme"
     [
       "background"
       "dark"
@@ -64,17 +50,24 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
       "background"
       "light"
     ]
+
+  ];
+  imports = [
+    (lib.mkRemovedOptionModule
+      [
+        "colorschemes"
+        "kanagawa"
+        "overrides"
       ]
-    )
+      ''
-    ++ [
-      (lib.mkRemovedOptionModule (basePluginPath ++ [ "overrides" ]) ''
         Use `colorschemes.kanagawa.settings.overrides` but you now have to add the full function definition:
         ```
           function(colors)
             ...
           end
         ```
-      '')
+      ''
+    )
   ];
 
   settingsOptions = {

plugins/colorschemes/rose-pine.nix

@@ -15,6 +15,21 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   optionsRenamedToSettings = [
     "groups"
     "highlightGroups"
+    {
+      old = "style";
+      new = "dark_variant";
+    }
+    {
+      old = "dimInactive";
+      new = "dim_inactive_windows";
+    }
+    {
+      old = "transparentBackground";
+      new = [
+        "enable"
+        "transparency"
+      ];
+    }
   ];
   imports =
     let
@@ -24,20 +39,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
       ];
     in
     [
-      (lib.mkRenamedOptionModule (basePluginPath ++ [ "style" ]) (
-        basePluginPath
-        ++ [
-          "settings"
-          "dark_variant"
-        ]
-      ))
-      (lib.mkRenamedOptionModule (basePluginPath ++ [ "dimInactive" ]) (
-        basePluginPath
-        ++ [
-          "settings"
-          "dim_inactive_windows"
-        ]
-      ))
       (lib.mkRemovedOptionModule (
         basePluginPath ++ [ "disableItalics" ]
       ) "Use `colorschemes.rose-pine.settings.enable.italics` instead.")
@@ -47,14 +48,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
       (lib.mkRemovedOptionModule (
         basePluginPath ++ [ "transparentFloat" ]
       ) "Use `colorschemes.rose-pine.settings.highlight_groups.NormalFloat` instead.")
-      (lib.mkRenamedOptionModule (basePluginPath ++ [ "transparentBackground" ]) (
-        basePluginPath
-        ++ [
-          "settings"
-          "enable"
-          "transparency"
-        ]
-      ))
     ];
 
   settingsOptions = {