diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-08-13 12:17:32 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-08-13 12:28:24 +0200 |
commit | 6440e9bbfd22800cc5f967445fce9cc86e2ca0cd (patch) | |
tree | d258925fb7897581fc5978dfaf81410030c9d964 /nixos/modules/virtualisation | |
parent | f741d426da265c6a4e38a070b5deb7793fe22ce8 (diff) |
nixos/vbox: Move all options to virtualisation.*.
Commit 687caeb renamed services.virtualboxHost to programs.virtualbox, but according to the discussion on the commit, it's probably a better to put it into virtualisation.virtualbox instead. The discussion can be found here: https://github.com/NixOS/nixpkgs/commit/687caeb#commitcomment-12664978 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/virtualbox-guest.nix | 17 | ||||
-rw-r--r-- | nixos/modules/virtualisation/virtualbox-host.nix | 4 |
2 files changed, 6 insertions, 15 deletions
diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 6c4014fc4a1e2..642ea3154b1bb 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -6,7 +6,7 @@ with lib; let - cfg = config.services.virtualboxGuest; + cfg = config.virtualisation.virtualbox.guest; kernel = config.boot.kernelPackages; in @@ -15,20 +15,11 @@ in ###### interface - options = { - - services.virtualboxGuest = { - - enable = mkOption { - default = false; - description = "Whether to enable the VirtualBox service and other guest additions."; - }; - - }; - + options.virtualisation.virtualbox.guest.enable = mkOption { + default = false; + description = "Whether to enable the VirtualBox service and other guest additions."; }; - ###### implementation config = mkIf cfg.enable { diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index b8b3d62a03198..00486df5c4ba4 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.programs.virtualbox; + cfg = config.virtualisation.virtualbox.host; virtualbox = config.boot.kernelPackages.virtualbox.override { inherit (cfg) enableHardening; }; @@ -11,7 +11,7 @@ let in { - options.programs.virtualbox = { + options.virtualisation.virtualbox.host = { enable = mkOption { type = types.bool; default = false; |