From 1be5deba6f6bf6a30cfb4f523931fe4af1cb55f2 Mon Sep 17 00:00:00 2001 From: Cassie Cheung Date: Sat, 2 Nov 2024 21:54:08 +0800 Subject: [PATCH] apple/t2: deprecate enableTinyDfr option and conflict with `hardware.apple.touchBar` * Adds a deprecation warning to hardware.apple-t2.enableTinyDfr as it has been upstreamed to nixpkgs already. The package and option can be removed at the next release cycle to hopefully not break people's setup. * Adds an assertion to conflict hardware.apple-t2.enableTinyDfr with hardware.apple.touchBar. Having both enabled causes both tiny-dfr to fight for the same display device. --- apple/t2/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apple/t2/default.nix b/apple/t2/default.nix index 7d69c1b4a..d9b20955f 100644 --- a/apple/t2/default.nix +++ b/apple/t2/default.nix @@ -109,6 +109,16 @@ in ''; }) (lib.mkIf t2Cfg.enableTinyDfr { + warnings = [ + '' + hardware.apple-t2.enableTinyDfr is deprecated since the module has been upstreamed as hardware.apple.touchBar. + This option will be removed from the apple/t2 profile when NixOS 24.11 is released. + '' + ]; + assertions = lib.optionals (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") [{ + assertion = !config.hardware.apple.touchBar.enable; + message = "hardware.apple-t2.enableTinyDfr conflicts with hardware.apple.touchBar.enable. Please disable one of them."; + }]; services.udev.packages = [ tiny-dfrPackage ]; systemd.services.tiny-dfr = {