about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-06-16 18:04:09 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-06-16 18:04:09 +0200
commit0c5c44f94e69dee747395fb8ae3b5e4b4ead1f10 (patch)
treec3db0a91683516db7f3cb6d178202c1aeb0b7b68 /machines
parentaa5a91cb998359d2bdb316135a8d1b0494f9aa92 (diff)
Fix conflicting definitions for wireless.enable.
Since NixOS/nixpkgs@e212e07, boolean options don't default to true
anymore if they're defined multiple times. So we need to explicitly
override the value for networking.wireless.enable, because we have set
it to false in the base profile.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines')
-rw-r--r--machines/aszlig/arilou.nix2
-rw-r--r--machines/aszlig/tishtushi.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/machines/aszlig/arilou.nix b/machines/aszlig/arilou.nix
index 882893d8..b9a1c87d 100644
--- a/machines/aszlig/arilou.nix
+++ b/machines/aszlig/arilou.nix
@@ -20,7 +20,7 @@ in {
   };
 
   networking.hostName = "arilou";
-  networking.wireless.enable = true;
+  networking.wireless.enable = mkForce true;
   networking.enableB43Firmware = true;
 
   fileSystems."/".device = "/dev/disk/by-uuid/${rootUUID}";
diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix
index 2d6833f3..3ae2909d 100644
--- a/machines/aszlig/tishtushi.nix
+++ b/machines/aszlig/tishtushi.nix
@@ -35,7 +35,7 @@ in {
   };
 
   networking.hostName = "tishtushi";
-  networking.wireless.enable = true;
+  networking.wireless.enable = mkForce true;
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/${rootUUID}";