Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: update option deprecations #514

Merged
merged 2 commits into from
Sep 26, 2024
Merged

treewide: update option deprecations #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dba4bd2
treewide: declare end-of-life for deprecated options
trueNAHO Aug 20, 2024
4b15fdc
stylix: remove deprecated 'stylix.palette.<BASE>' options at end-of-life
trueNAHO Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions modules/nixvim/nixvim.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) (
Expand Down
51 changes: 0 additions & 51 deletions stylix/palette.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ];
Expand Down