aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #341 from mitchmindtree/xps-9310-rm-kernel-patches

Browse source 
xps-9310: Remove upstreamed kernel patches with custom config
This commit is contained in:
Jörg Thalheim 2021-12-02 10:22:10 +00:00 committed by GitHub
parent 6b3f79de09 1794de7d78
commit 4c9f07277b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dell/xps/13-9310/default.nix
View file

@ -4,26 +4,13 @@
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/ssd ../../../common/pc/ssd
]; ];
# Includes the Wi-Fi and Bluetooth firmware for the QCA6390. # Includes the Wi-Fi and Bluetooth firmware for the QCA6390.
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
# Requires at least 5.12 for working wi-fi and bluetooth.
boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.12") (lib.mkDefault pkgs.linuxPackages_latest); boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.12") (lib.mkDefault pkgs.linuxPackages_latest);
# TODO: upstream this to NixOS
boot.kernelPatches = [{
name = "enable-qca6390-bluetooth";
patch = null;
extraConfig = ''
BT_QCA m
BT_HCIUART m
BT_HCIUART_QCA y
BT_HCIUART_SERDEV y
SERIAL_DEV_BUS y
SERIAL_DEV_CTRL_TTYPORT y
'';
}];
boot.kernelModules = [ "btqca" "hci_qca" "hci_uart" ];
# Touchpad goes over i2c. # Touchpad goes over i2c.
# Without this we get errors in dmesg on boot and hangs when shutting down. # Without this we get errors in dmesg on boot and hangs when shutting down.