Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions apple/imac/14-2/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,30 @@
../../../common/gpu/nvidia
../../../common/gpu/nvidia/kepler
../../../common/hidpi.nix
../../../common/broadcom-wifi.nix
];

boot = {
initrd.kernelModules = [
"applesmc"
"applespi"
"intel_lpss_pci"
"spi_pxa2xx_platform"
"kvm-intel"
];
blacklistedKernelModules = [
"b43"
"ssb"
"brcmfmac"
"brcmsmac"
"bcma"
];
kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.0") pkgs.linuxPackages_latest;
};
config = {
boot = {
initrd.kernelModules = [
"applesmc"
"applespi"
"intel_lpss_pci"
"spi_pxa2xx_platform"
"kvm-intel"
];
blacklistedKernelModules = [
"b43"
"ssb"
"brcmfmac"
"brcmsmac"
"bcma"
];
kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.0") pkgs.linuxPackages_latest;
};

hardware = {
bluetooth.enable = lib.mkDefault true;
hardware = {
bluetooth.enable = lib.mkDefault true;
};
};
}
23 changes: 14 additions & 9 deletions apple/macbook-air/6/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
{ config, lib, ... }:

{
imports = [ ../. ];
imports = [
../.
../../../common/broadcom-wifi.nix
];

boot.blacklistedKernelModules = [ "bcma" ];
config = {
boot = {
# Divides power consumption by two.
kernelParams = [ "acpi_osi=" ];

boot = {
# Divides power consumption by two.
kernelParams = [ "acpi_osi=" ];
};
blacklistedKernelModules = [ "bcma" ];
};

services.xserver.deviceSection = lib.mkDefault ''
Option "TearFree" "true"
'';
services.xserver.deviceSection = lib.mkDefault ''
Option "TearFree" "true"
'';
};
}
5 changes: 4 additions & 1 deletion apple/macbook-pro/11-1/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
../.
../../../common/pc/ssd
../../../common/cpu/intel/haswell
../../../common/broadcom-wifi.nix
];

hardware.enableRedistributableFirmware = lib.mkDefault true;
config = {
hardware.enableRedistributableFirmware = lib.mkDefault true; # broadcom-wl
};
}
38 changes: 38 additions & 0 deletions common/broadcom-wifi.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
config,
lib,
pkgs,
...
}:

{
options = {
hardware.broadcom.wifi.enableLegacyDriverWithKnownVulnerabilities = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Enable the legacy Broadcom WiFi driver (wl) with known security vulnerabilities.
This driver is vulnerable to heap buffer overflows:
- CVE-2019-9501 (https://github.com/advisories/GHSA-vjw8-c937-7hwp)
- CVE-2019-9502 (https://github.com/advisories/GHSA-4rfg-8q34-prmp)
Attackers within WiFi range can exploit this vulnerability by sending crafted
WiFi packets, even without being connected to the same network. Simply having
WiFi enabled makes the system vulnerable to arbitrary code execution or denial-of-service.
Only enable if no alternative WiFi solution is available.
'';
};
};

config = lib.mkIf config.hardware.broadcom.wifi.enableLegacyDriverWithKnownVulnerabilities {
boot.kernelModules = [ "wl" ];
boot.extraModulePackages = [
(config.boot.kernelPackages.broadcom_sta.overrideAttrs (oldAttrs: {
meta = oldAttrs.meta // {
knownVulnerabilities = [ ];
};
}))
];
};
}
9 changes: 6 additions & 3 deletions dell/inspiron/3442/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
imports = [
../../../common/cpu/intel/haswell
../../../common/pc/laptop
../../../common/broadcom-wifi.nix
];

services = {
fwupd.enable = lib.mkDefault true;
thermald.enable = lib.mkDefault true;
config = {
services = {
fwupd.enable = lib.mkDefault true;
thermald.enable = lib.mkDefault true;
};
};
}
15 changes: 8 additions & 7 deletions dell/xps/13-9343/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/ssd
../../../common/broadcom-wifi.nix
];

services = {
fwupd.enable = lib.mkDefault true;
thermald.enable = lib.mkDefault true;
};

boot = {
kernelModules = [
config = {
boot.kernelModules = [
"kvm-intel"
];

services = {
fwupd.enable = lib.mkDefault true;
thermald.enable = lib.mkDefault true;
};
};
}