diff options
| author | makefu <github@syntax-fehler.de> | 2016-02-04 11:16:17 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-02-04 11:16:17 +0100 |
| commit | a6bfdbdf6d0d29955589de57e99127c4ac8ede5e (patch) | |
| tree | 7af0effd583903bdd5d82804aa57afad1f17e2cd /tv/2configs/hw | |
| parent | db2a1da01749e876e7881641220aef56d93580ff (diff) | |
| parent | 1c6213b4cc7c0029c3ec78f03ff2ccc37c1f0278 (diff) | |
Merge 'cd/master' - update krebs.build.source
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 acd9ee3..72a4081 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 8549311..7cec670 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; |