diff --git a/hosts/FredOS-Macbook.nix b/hosts/FredOS-Macbook.nix index 0758a05..b768732 100644 --- a/hosts/FredOS-Macbook.nix +++ b/hosts/FredOS-Macbook.nix @@ -1,37 +1,26 @@ { config, pkgs, lib, ... }: { - # Use mkMerge to allow the insecure package rule to sit alongside the mkIf block config = lib.mkMerge [ - # 1. This part always applies if this file is imported { - nixpkgs.config.permittedInsecurePackages = [ - # Reconstructs the name: broadcom-sta- + driver-version + - + kernel-version - # The driver version for Broadcom STA is currently "6.30.223.271" - "broadcom-sta-6.30.223.271-${config.boot.kernelPackages.kernel.version}" - ]; + nixpkgs.config.allowInsecurePredicate = pkg: + (lib.hasPrefix "broadcom-sta" (lib.getName pkg)); } - # 2. This part only applies if the hostname matches (lib.mkIf (config.networking.hostName == "FredOS-Macbook") { - environment.systemPackages = with pkgs; [ - tlp - ]; - + # ... all your other settings (tlp, boot, firmware) ... + environment.systemPackages = with pkgs; [ tlp ]; services.tlp.enable = true; services.power-profiles-daemon.enable = false; - + boot = { loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; - extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; - blacklistedKernelModules = [ "b43" "bcma" "ssb" ]; }; - hardware.enableRedistributableFirmware = true; }) ];