diff --git a/modules/nixvim/nixvim.nix b/modules/nixvim/nixvim.nix index dbc1da6..2c7c8a0 100644 --- a/modules/nixvim/nixvim.nix +++ b/modules/nixvim/nixvim.nix @@ -14,15 +14,28 @@ }; imports = [ - # Added: 2024-08-06 - (lib.mkRenamedOptionModule - [ "stylix" "targets" "nixvim" "transparent_bg" "main" ] - [ "stylix" "targets" "nixvim" "transparentBackground" "main" ]) + ( + lib.mkRenamedOptionModuleWith { + from = [ "stylix" "targets" "nixvim" "transparent_bg" "main" ]; + sinceRelease = 2411; + to = [ "stylix" "targets" "nixvim" "transparentBackground" "main" ]; + } + ) - # Added: 2024-08-06 - (lib.mkRenamedOptionModule - [ "stylix" "targets" "nixvim" "transparent_bg" "sign_column" ] - [ "stylix" "targets" "nixvim" "transparentBackground" "signColumn" ]) + ( + lib.mkRenamedOptionModuleWith { + from = [ "stylix" "targets" "nixvim" "transparent_bg" "sign_column" ]; + sinceRelease = 2411; + + to = [ + "stylix" + "targets" + "nixvim" + "transparentBackground" + "signColumn" + ]; + } + ) ]; config = lib.mkIf (config.stylix.enable && config.stylix.targets.nixvim.enable && (config.programs ? nixvim)) ( diff --git a/stylix/palette.nix b/stylix/palette.nix index a6ae3da..7fe9600 100644 --- a/stylix/palette.nix +++ b/stylix/palette.nix @@ -21,57 +21,6 @@ let generatedScheme = lib.importJSON paletteJSON; in { - # TODO link to doc on how to do instead - imports = [ - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base00" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base01" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base02" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base03" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base04" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base05" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base06" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base07" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base08" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base09" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0A" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0B" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0C" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0D" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0E" ] "Using stylix.palette to override scheme is not supported anymore") - - # Added: 2023-02-02 - (lib.mkRemovedOptionModule [ "stylix" "palette" "base0F" ] "Using stylix.palette to override scheme is not supported anymore") - ]; - options.stylix = { polarity = lib.mkOption { type = lib.types.enum [ "either" "light" "dark" ];