diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-06 18:45:38 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-06 18:45:38 +0100 |
| commit | fe586d704eed42421ad3fe0d140c0caa64764a68 (patch) | |
| tree | a07d0c4d09ef780f703ae03435d51ac60019c956 /tv/2configs/hw | |
| parent | 138bdc6bf6a18a59cf47d2d2db7c4e7640f50641 (diff) | |
| parent | c784d271c5dc8783e5e6308baf4f6dd26430bfca (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/2configs/hw')
| -rw-r--r-- | tv/2configs/hw/AO753.nix | 9 | ||||
| -rw-r--r-- | tv/2configs/hw/x220.nix | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix index acd9ee32b..72a40819f 100644 --- a/tv/2configs/hw/AO753.nix +++ b/tv/2configs/hw/AO753.nix @@ -1,4 +1,6 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: + +with lib; { imports = [ @@ -39,8 +41,5 @@ HandleSuspendKey=ignore ''; - nixpkgs.config = { - allowUnfree = false; - allowUnfreePredicate = (x: pkgs.lib.hasPrefix "broadcom-sta-" x.name); - }; + nixpkgs.config.allowUnfreePredicate = pkg: hasPrefix "broadcom-sta-" pkg.name; } diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix index 8549311e7..7cec670fa 100644 --- a/tv/2configs/hw/x220.nix +++ b/tv/2configs/hw/x220.nix @@ -14,7 +14,6 @@ networking.wireless.enable = true; #hardware.enableAllFirmware = true; - #nixpkgs.config.allowUnfree = true; #zramSwap.enable = true; #zramSwap.numDevices = 2; |