summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-12 19:11:29 +0200
committerlassulus <lassulus@lassul.us>2017-07-12 19:11:29 +0200
commitb19ebc2abd8f383d477d35040e833cd9c05319ab (patch)
tree778a882e0faebc82360c06165b4b00726468b8aa /tv/2configs
parent5efedd139a20d71268af2afd069dbd595414650f (diff)
parentcd47613a4d8daf185f4ac0f8ef43af11985a2f65 (diff)
Merge branch 'staging/source'
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/default.nix18
-rw-r--r--tv/2configs/hw/x220.nix2
2 files changed, 2 insertions, 18 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 3d95d6dee..07496fd1f 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -6,23 +6,7 @@ with import <stockholm/lib>;
in {
krebs.enable = true;
- krebs.build = {
- user = config.krebs.users.tv;
- source = let inherit (config.krebs.build) host; in {
- nixos-config.symlink = "stockholm/tv/1systems/${host.name}.nix";
- secrets.file = getAttr builder {
- buildbot = toString <stockholm/tv/dummy_secrets>;
- tv = "/home/tv/secrets/${host.name}";
- };
- secrets-common.file = "/home/tv/secrets/common";
- nixpkgs.git = {
- url = https://github.com/NixOS/nixpkgs;
- ref = "057f89b9344e5341796046f25ae4f269be6d4529"; # nixos-17.03
- };
- } // optionalAttrs host.secure {
- secrets-master.file = "/home/tv/secrets/master";
- };
- };
+ krebs.build.user = config.krebs.users.tv;
networking.hostName = config.krebs.build.host.name;
diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index 6cc295dc5..e0a04e214 100644
--- a/tv/2configs/hw/x220.nix
+++ b/tv/2configs/hw/x220.nix
@@ -11,7 +11,7 @@
networking.wireless.enable = true;
# Required for Centrino.
- hardware.enableAllFirmware = true;
+ hardware.enableRedistributableFirmware = true;
hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];