diff options
| author | makefu <github@syntax-fehler.de> | 2017-07-23 21:11:11 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-07-23 21:11:11 +0200 |
| commit | 1e3931d983127bb2cf5fc93471bacfc9770e5b08 (patch) | |
| tree | 9308da0abd27ad72547bc765e9a4100ccc71630b /krebs/1systems/puyak/config.nix | |
| parent | fd7d1531acd5345136dad71bdcd1050176d88cd6 (diff) | |
| parent | 1bf9e1e1eea95ea9efeb72a48e19a6df11881a7f (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/1systems/puyak/config.nix')
| -rw-r--r-- | krebs/1systems/puyak/config.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index 835d717b8..19ee2343d 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -5,6 +5,7 @@ <stockholm/krebs> <stockholm/krebs/2configs> <stockholm/krebs/2configs/secret-passwords.nix> + <stockholm/krebs/2configs/hw/x220.nix> <stockholm/krebs/2configs/repo-sync.nix> <stockholm/krebs/2configs/shared-buildbot.nix> @@ -48,10 +49,6 @@ }; }; - hardware.enableAllFirmware = true; - networking.wireless.enable = true; - nixpkgs.config.allowUnfree = true; - services.logind.extraConfig = '' HandleLidSwitch=ignore ''; |