diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-01-22 20:29:41 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-01-22 20:32:24 +0100 |
| commit | df0301f59bd0f7749541c50538c5b1aeaf444900 (patch) | |
| tree | b44e10fb41df319e59aeb81526fa2185ade512bf | |
| parent | fc8233a64f49207bcb7a1774eba4e1384dfce200 (diff) | |
| download | nixlib-df0301f59bd0f7749541c50538c5b1aeaf444900.tar nixlib-df0301f59bd0f7749541c50538c5b1aeaf444900.tar.gz nixlib-df0301f59bd0f7749541c50538c5b1aeaf444900.tar.bz2 nixlib-df0301f59bd0f7749541c50538c5b1aeaf444900.tar.lz nixlib-df0301f59bd0f7749541c50538c5b1aeaf444900.tar.xz nixlib-df0301f59bd0f7749541c50538c5b1aeaf444900.tar.zst nixlib-df0301f59bd0f7749541c50538c5b1aeaf444900.zip | |
nixos/networkmanager: trigger assertion instead of error
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 8f353979d3fc..c11d4434c206 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -174,7 +174,7 @@ in { assertions = [{ assertion = config.networking.wireless.enable == false; - message = "You can not use networking.networkmanager with services.networking.wireless"; + message = "You can not use networking.networkmanager with networking.wireless"; }]; boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections. @@ -239,7 +239,8 @@ in { # Turn off NixOS' network management networking = { useDHCP = false; - wireless.enable = false; + # use mkDefault to trigger the assertion about the conflict above + wireless.enable = lib.mkDefault false; }; powerManagement.resumeCommands = '' |