treewide: use config in literalExpressions (#1517)

Link: https://github.com/nix-community/stylix/pull/1517

Reviewed-by: Matt Sturgeon <matt@sturgeon.me.uk>
Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
This commit is contained in:
awwpotato 2025-06-19 12:51:33 -07:00 committed by GitHub
parent 82323751bc
commit 2b231cdc9b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 5 deletions

View file

@ -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 = [
(

View file

@ -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;

View file

@ -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;
@ -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;
};