summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorKira Bruneau <kira.bruneau@pm.me>2022-08-09 18:54:37 -0400
committerGitHub <noreply@github.com>2022-08-09 18:54:37 -0400
commitb739495304e423388c3c1a4edb32f3e999985a7c (patch)
treedd32d199c6cfc1826f22dcc3132643278f0e615a /nixos
parent5d45fca2586a718a585ce7d4ef3924079aa0948b (diff)
parentbda6036d2e7d6f9bd475727f861b3bede3c342ae (diff)
Merge pull request #185068 from kira-bruneau/linuxPackages.xpadneo
nixos/xpadneo: don't disable ertm on kernel 5.12 or later
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/hardware/xpadneo.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/hardware/xpadneo.nix b/nixos/modules/hardware/xpadneo.nix
index dbc4ba2125604..092f36729b310 100644
--- a/nixos/modules/hardware/xpadneo.nix
+++ b/nixos/modules/hardware/xpadneo.nix
@@ -15,7 +15,8 @@ in
       # https://wiki.archlinux.org/index.php/Gamepad#Connect_Xbox_Wireless_Controller_with_Bluetooth
       extraModprobeConfig =
         mkIf
-          config.hardware.bluetooth.enable
+          (config.hardware.bluetooth.enable &&
+           (lib.versionOlder config.boot.kernelPackages.kernel.version "5.12"))
           "options bluetooth disable_ertm=1";
 
       extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];