misc: remove deprecated/renamed options warnings

This commit is contained in:
Gaetan Lepage 2023-05-19 12:38:24 +02:00 committed by Gaétan Lepage
parent a10b6f02cd
commit 2da04fa4ad
8 changed files with 5 additions and 327 deletions

View file

@ -7,7 +7,6 @@
with lib; let
cfg = config.plugins.barbar;
helpers = import ../helpers.nix {inherit lib;};
basePluginPath = ["plugins" "barbar"];
bufferOptions = {
bufferIndex = helpers.mkNullOrOption types.bool ''
@ -82,53 +81,6 @@ with lib; let
orderByWindowNumber = "OrderByWindowNumber";
};
in {
# All the following renames/removes are from 2023-04-05.
# TODO: Remove them in 1-2 months.
imports = [
(mkRemovedOptionModule (basePluginPath ++ ["closable"]) "")
(
mkRenamedOptionModule
(basePluginPath ++ ["animations"])
(basePluginPath ++ ["animation"])
)
(
mkRenamedOptionModule
(basePluginPath ++ ["diagnostics"])
(basePluginPath ++ ["icons" "diagnostics"])
)
(mkRemovedOptionModule (basePluginPath ++ ["icons" "enable"]) "")
(
mkRenamedOptionModule
(basePluginPath ++ ["icons" "customColors"])
(basePluginPath ++ ["icons" "filetype" "customColors"])
)
(
mkRenamedOptionModule
(basePluginPath ++ ["icons" "separatorActive"])
(basePluginPath ++ ["icons" "separator" "left"])
)
(
mkRenamedOptionModule
(basePluginPath ++ ["icons" "separatorInactive"])
(basePluginPath ++ ["icons" "inactive" "separator" "left"])
)
(
mkRenamedOptionModule
(basePluginPath ++ ["icons" "separatorVisible"])
(basePluginPath ++ ["icons" "visible" "separator" "left"])
)
(
mkRenamedOptionModule
(basePluginPath ++ ["icons" "closeTab"])
(basePluginPath ++ ["icons" "button"])
)
(
mkRenamedOptionModule
(basePluginPath ++ ["icons" "closeTabModified"])
(basePluginPath ++ ["icons" "modified" "button"])
)
];
options.plugins.barbar =
helpers.extraOptionsOptions
// {

View file

@ -8,8 +8,6 @@ with lib; let
cfg = config.plugins.bufferline;
helpers = import ../helpers.nix args;
basePluginPath = ["plugins" "bufferline"];
highlightOption = {
fg = helpers.mkNullOrOption types.str "foreground color";
@ -83,38 +81,6 @@ with lib; let
pick_selected = "pickSelected";
};
in {
# Those renamed are from 2023-04-04.
# TODO: remove them in 1-2 months
imports =
[
(
mkRenamedOptionModule
(basePluginPath ++ ["indicatorIcon"])
(basePluginPath ++ ["indicator" "icon"])
)
]
++ (
lists.flatten (
map (
highlightOptionName: let
prefix = basePluginPath ++ ["highlights" highlightOptionName];
in [
(
mkRenamedOptionModule
(prefix ++ ["guifg"])
(prefix ++ ["fg"])
)
(
mkRenamedOptionModule
(prefix ++ ["guibg"])
(prefix ++ ["bg"])
)
]
)
(attrValues highlightOptions)
)
);
options = {
plugins.bufferline =
helpers.extraOptionsOptions