ma vbox-guest: remove from vhosts, prepare for working upstream

This commit is contained in:
makefu 2018-02-16 20:48:56 +01:00
parent 1ccef680d2
commit cdf69ce258
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
3 changed files with 4 additions and 4 deletions

View File

@ -6,7 +6,7 @@
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
<stockholm/makefu> <stockholm/makefu>
<stockholm/makefu/2configs/hw/vbox-guest.nix> # <stockholm/makefu/2configs/hw/vbox-guest.nix>
{ # until virtualbox-image is fixed { # until virtualbox-image is fixed
imports = [ imports = [
<stockholm/makefu/2configs/fs/single-partition-ext4.nix> <stockholm/makefu/2configs/fs/single-partition-ext4.nix>

View File

@ -9,7 +9,7 @@
imports = [<stockholm/makefu/2configs/fs/single-partition-ext4.nix> ]; imports = [<stockholm/makefu/2configs/fs/single-partition-ext4.nix> ];
boot.loader.grub.device = "/dev/sda"; boot.loader.grub.device = "/dev/sda";
} }
<stockholm/makefu/2configs/hw/vbox-guest.nix> # <stockholm/makefu/2configs/hw/vbox-guest.nix>
# <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix> # <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>
# base gui # base gui

View File

@ -2,9 +2,9 @@
{ {
## Guest Extensions are currently broken ## Guest Extensions are currently broken
imports = [ imports = [
# (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>) (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
]; ];
# virtualisation.virtualbox.guest.enable = true; virtualisation.virtualbox.guest.enable = true;
services.xserver.videoDrivers = lib.mkOverride 45 [ "virtualbox" "modesetting" ]; services.xserver.videoDrivers = lib.mkOverride 45 [ "virtualbox" "modesetting" ];
fileSystems."/media/share" = { fileSystems."/media/share" = {