Skip to content

Commit

Permalink
Merge pull request #1209 from NixOS/lib.literalExpression
Browse files Browse the repository at this point in the history
Set missing lib.literalExpression
  • Loading branch information
SuperSandro2000 authored Oct 27, 2024
2 parents e8a2f6d + 59b6e11 commit 6906ac6
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions asus/zephyrus/ga402x/shared.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ let
inherit (lib) mkDefault mkEnableOption mkIf mkMerge version versionAtLeast versionOlder;

cfg = config.hardware.asus.zephyrus.ga402x;
defaultAutosuspendEnable = versionAtLeast config.boot.kernelPackages.kernel.version "6.9";

in {

imports = [
Expand All @@ -31,7 +29,10 @@ in {
# Note: the device name is "ASUS N-KEY Device".
keyboard.autosuspend.enable = (
mkEnableOption "Enable auto-suspend on the internal USB keyboard (ASUS N-KEY Device) on Zephyrus GA402X"
) // { default = defaultAutosuspendEnable; };
) // {
default = versionAtLeast config.boot.kernelPackages.kernel.version "6.9";
defaultText = lib.literalExpression "lib.versionAtLeast config.boot.kernelPackages.kernel.version \"6.9\"";
};
# The ASUS 8295 ITE device will cause an immediate wake-up when trying to suspend the laptop.
# After the first successful hibernate, it will work as expected, however.
# NOTE: I'm not actually sure what this device, as neither the touchpad nor the M1-M4 keys cause a wake-up.
Expand Down

0 comments on commit 6906ac6

Please sign in to comment.