Update FredOS-Macbook.nix
This commit is contained in:
parent
f61b18ff1d
commit
884a2f34c2
1 changed files with 5 additions and 16 deletions
|
|
@ -1,37 +1,26 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Use mkMerge to allow the insecure package rule to sit alongside the mkIf block
|
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
# 1. This part always applies if this file is imported
|
|
||||||
{
|
{
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
nixpkgs.config.allowInsecurePredicate = pkg:
|
||||||
# Reconstructs the name: broadcom-sta- + driver-version + - + kernel-version
|
(lib.hasPrefix "broadcom-sta" (lib.getName pkg));
|
||||||
# The driver version for Broadcom STA is currently "6.30.223.271"
|
|
||||||
"broadcom-sta-6.30.223.271-${config.boot.kernelPackages.kernel.version}"
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# 2. This part only applies if the hostname matches
|
|
||||||
(lib.mkIf (config.networking.hostName == "FredOS-Macbook") {
|
(lib.mkIf (config.networking.hostName == "FredOS-Macbook") {
|
||||||
environment.systemPackages = with pkgs; [
|
# ... all your other settings (tlp, boot, firmware) ...
|
||||||
tlp
|
environment.systemPackages = with pkgs; [ tlp ];
|
||||||
];
|
|
||||||
|
|
||||||
services.tlp.enable = true;
|
services.tlp.enable = true;
|
||||||
services.power-profiles-daemon.enable = false;
|
services.power-profiles-daemon.enable = false;
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
loader = {
|
loader = {
|
||||||
systemd-boot.enable = true;
|
systemd-boot.enable = true;
|
||||||
efi.canTouchEfiVariables = true;
|
efi.canTouchEfiVariables = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
|
extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
|
||||||
|
|
||||||
blacklistedKernelModules = [ "b43" "bcma" "ssb" ];
|
blacklistedKernelModules = [ "b43" "bcma" "ssb" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue