diff options
author | Peter Hoeg <peter@hoeg.com> | 2019-02-20 14:34:25 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-20 14:34:25 +0800 |
commit | ecb3c507f5e9f6c0c19a9e1ecb2b3a25d39b08a7 (patch) | |
tree | 5b1b30ecb1d03749c4b5dcd6fcec7d70a2cc7270 /nixos/modules | |
parent | 55757a0d44d11c051648ce03ecfb8881ff4e4dc5 (diff) | |
parent | d5d3184e24655ec500a7b06c029934308219be12 (diff) |
Merge pull request #54917 from peterhoeg/f/vmware
vmware: move from services to virtualisation and add support for paravirtual controller
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/rename.nix | 1 | ||||
-rw-r--r-- | nixos/modules/virtualisation/vmware-guest.nix | 18 |
2 files changed, 10 insertions, 9 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 24ab963f718a1..7bcdfdb52309c 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -59,6 +59,7 @@ with lib; (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ]) (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ]) (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ]) + (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ]) (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ]) (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ]) diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index 15c78f14c524d..d18778f81588f 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -3,19 +3,17 @@ with lib; let - cfg = config.services.vmwareGuest; + cfg = config.virtualisation.vmware.guest; open-vm-tools = if cfg.headless then pkgs.open-vm-tools-headless else pkgs.open-vm-tools; xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse; in { - options = { - services.vmwareGuest = { - enable = mkEnableOption "VMWare Guest Support"; - headless = mkOption { - type = types.bool; - default = false; - description = "Whether to disable X11-related features."; - }; + options.virtualisation.vmware.guest = { + enable = mkEnableOption "VMWare Guest Support"; + headless = mkOption { + type = types.bool; + default = false; + description = "Whether to disable X11-related features."; }; }; @@ -25,6 +23,8 @@ in message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}"; } ]; + boot.initrd.kernelModules = [ "vmw_pvscsi" ]; + environment.systemPackages = [ open-vm-tools ]; systemd.services.vmware = |