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

xps-9310: Remove upstreamed kernel patches with custom config

Browse source 
I've upstreamed these patches in NixOS/nixpkgs#144409, which means we no
longer have to build the kernel every time we update just to get
bluetooth working 🎉

While these changes have landed in master, they haven't been back-ported
to 21.05. They will be available via 21.11, which I'm currently testing
(along with this commit) by setting my `nixos` channel to the necessary
nixpkgs pre-release branch, e.g.

```bash
sudo nix-channel --remove nixos
sudo nix-channel --add https://github.com/NixOS/nixpkgs/archive/release-21.11.tar.gz nixos
sudo nix-channel --update nixos
```

*Note that if you use the above branch like I am, you might miss the
cache on some pkgs and spend even longer building those (looking at you
libreoffice).*

As of writing this PR, the current kernel is 5.15.4 and all seems to be
working well.
This commit is contained in:
mitchmindtree 2021-11-25 09:42:19 +10:00
parent 08cda8e3a5
commit 1794de7d78
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,21 +9,8 @@
# 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.