diff options
author | Christian Kauhaus <kc@flyingcircus.io> | 2019-11-24 12:56:44 +0100 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-24 16:23:32 -0500 |
commit | edbf94d2ee8b4ba0d50f18752641c1d92a7d645b (patch) | |
tree | d31f7ea77f50d3c9df46b4a42aa8ebaed08290cd /nixos | |
parent | b1e98203069edff196e77ca6cd3da5f7d70343ef (diff) | |
download | nixpkgs-edbf94d2ee8b4ba0d50f18752641c1d92a7d645b.tar nixpkgs-edbf94d2ee8b4ba0d50f18752641c1d92a7d645b.tar.gz nixpkgs-edbf94d2ee8b4ba0d50f18752641c1d92a7d645b.tar.bz2 nixpkgs-edbf94d2ee8b4ba0d50f18752641c1d92a7d645b.tar.lz nixpkgs-edbf94d2ee8b4ba0d50f18752641c1d92a7d645b.tar.xz nixpkgs-edbf94d2ee8b4ba0d50f18752641c1d92a7d645b.tar.zst nixpkgs-edbf94d2ee8b4ba0d50f18752641c1d92a7d645b.zip |
connman: move options to services
As part of the networking.* name space cleanup, connman should be moved to services.connman. The same will happen for example with networkmanager in a separate PR.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/rename.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/networking/connman.nix | 10 | ||||
-rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 7d8cf55b827..a4c1c79f3c4 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -10,6 +10,7 @@ with lib; (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ]) + (mkRenamedOptionModule [ "networking" "connman" ] [ "services" "connman" ]) (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ] (config: let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config; diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index 31127f79049..cac517f410e 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -4,7 +4,7 @@ with pkgs; with lib; let - cfg = config.networking.connman; + cfg = config.services.connman; configFile = pkgs.writeText "connman.conf" '' [General] NetworkInterfaceBlacklist=${concatStringsSep "," cfg.networkInterfaceBlacklist} @@ -17,7 +17,7 @@ in { options = { - networking.connman = { + services.connman = { enable = mkOption { type = types.bool; @@ -71,13 +71,13 @@ in { assertions = [{ assertion = !config.networking.useDHCP; - message = "You can not use services.networking.connman with services.networking.useDHCP"; + message = "You can not use services.connman with networking.useDHCP"; }{ assertion = config.networking.wireless.enable; - message = "You must use services.networking.connman with services.networking.wireless"; + message = "You must use services.connman with networking.wireless"; }{ assertion = !config.networking.networkmanager.enable; - message = "You can not use services.networking.connman with services.networking.networkmanager"; + message = "You can not use services.connman with networking.networkmanager"; }]; environment.systemPackages = [ connman ]; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index e313d2b411b..31d332e9f07 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -620,7 +620,7 @@ in # Wireless won't work in the VM. networking.wireless.enable = mkVMOverride false; - networking.connman.enable = mkVMOverride false; + services.connman.enable = mkVMOverride false; # Speed up booting by not waiting for ARP. networking.dhcpcd.extraConfig = "noarp"; |