Skip to content

treewide: use config in literalExpressions #1517

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

Merged
trueNAHO merged 1 commit into from
Jun 19, 2025
Merged

treewide: use config in literalExpressions #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion modules/hyprland/hm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ mkTarget {
extraOptions.hyprpaper.enable = config.lib.stylix.mkEnableTargetWith {
name = "Hyprpaper";
autoEnable = config.stylix.image != null;
autoEnableExpr = "stylix.image != null";
autoEnableExpr = "config.stylix.image != null";
};
configElements = [
(
Expand Down
2 changes: 1 addition & 1 deletion modules/swaylock/hm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ mkTarget {
&& pkgs.stdenv.hostPlatform.isLinux;

autoEnableExpr = ''
lib.versionAtLeast home.stateVersion "23.05" && pkgs.stdenv.hostPlatform.isLinux
lib.versionAtLeast config.home.stateVersion "23.05" && pkgs.stdenv.hostPlatform.isLinux
'';

extraOptions.useWallpaper = config.lib.stylix.mkEnableWallpaper "Swaylock" true;
Expand Down
9 changes: 6 additions & 3 deletions stylix/target.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
default = cfg.autoEnable && autoEnable;
defaultText =
if args ? autoEnableExpr then
lib.literalExpression "stylix.autoEnable && ${wrapExpr autoEnableExpr}"
lib.literalExpression "config.stylix.autoEnable && ${wrapExpr autoEnableExpr}"
else if autoEnable then
lib.literalExpression "stylix.autoEnable"
lib.literalExpression "config.stylix.autoEnable"
else
false;
inherit example;
Expand All @@ -109,7 +109,10 @@
description = "Whether to set the wallpaper for ${humanName}.";
default = config.stylix.image != null && autoEnable;
defaultText =
if autoEnable then lib.literalExpression "stylix.image != null" else false;
if autoEnable then
lib.literalExpression "config.stylix.image != null"
else
false;
example = config.stylix.image == null;
};

Expand Down