From b678606690027913f3434dea3864e712b862dde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?= Date: Tue, 31 Dec 2024 12:22:58 +0700 Subject: [PATCH] =?UTF-8?q?lenovo-z13-gen2:=20networking.networkmanager.fc?= =?UTF-8?q?cUnlockScripts=20=E2=86=92=20networking.modemmanager.fccUnlockS?= =?UTF-8?q?cripts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes evaluation warning --- lenovo/thinkpad/z/gen2/z13/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/lenovo/thinkpad/z/gen2/z13/default.nix b/lenovo/thinkpad/z/gen2/z13/default.nix index 990ad6f1..2f68821d 100644 --- a/lenovo/thinkpad/z/gen2/z13/default.nix +++ b/lenovo/thinkpad/z/gen2/z13/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ...}: +{ pkgs, lib, ... }: { imports = [ @@ -7,10 +7,15 @@ environment.etc."asound.conf".source = ./asound.conf; - networking.networkmanager.fccUnlockScripts = [ - { - id = "2c7c:030a"; - path = "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/2c7c:030a"; - } - ]; + networking = + let + fcc_unlock_script = rec { + id = "2c7c:030a"; + path = "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/${id}"; + }; + in + if lib.versionOlder lib.version "25.05pre" then + { networkmanager.fccUnlockScripts = [ fcc_unlock_script ]; } + else + { modemmanager.fccUnlockScripts = [ fcc_unlock_script ]; }; }