Merge pull request #143 from Mic92/xps-15-7590

xps/15-7590: don't enable unfree firmware by default
This commit is contained in:
Jörg Thalheim 2020-02-17 10:54:44 +00:00 committed by GitHub
commit 7accb4efab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 19 deletions

View file

@ -24,7 +24,9 @@ These settings are needed both for booting the final install, and installer itse
=== Wifi === === Wifi ===
~~Wifi does not work with kernels older than 5.1 (firmware not present) or newer~~ (https://bbs.archlinux.org/viewtopic.php?id=247705) ~~Wifi does not work with kernels older than 5.1 (firmware not present) or newer~~ (https://bbs.archlinux.org/viewtopic.php?id=247705)
Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46.ucode works perfectly. default.nix contains an overlay that removes the offending ucode from the linux-firmware bundle. Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46.ucode works perfectly.
default.nix contains an overlay that removes the offending ucode from the linux-firmware bundle.
To use it one also needs to enable unfree firmware in their own configuration (<code>hardware.enableRedistributableFirmware = true;</code>)
``` ```
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.

View file

@ -25,9 +25,7 @@
# The 48.ucode causes the Killer wifi card to crash. # The 48.ucode causes the Killer wifi card to crash.
# The iwlfwifi-cc-a0-46.ucode works perfectly # The iwlfwifi-cc-a0-46.ucode works perfectly
nixpkgs.pkgs = import <nixpkgs> { nixpkgs.overlays = [
config.allowUnfree = true;
overlays = [
(self: super: { (self: super: {
firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: { firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: {
src = super.fetchgit{ src = super.fetchgit{
@ -42,5 +40,4 @@
}); });
}) })
]; ];
};
} }