summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-02-16 20:48:56 +0100
committermakefu <github@syntax-fehler.de>2018-02-16 20:48:56 +0100
commitcdf69ce25896caf40932c0389b33b2fa9c3ab77a (patch)
tree079d358a9eb3e61f77c5ee85e79d3ce244471d52 /makefu
parent1ccef680d2497903a988663e4114487315a99f39 (diff)
ma vbox-guest: remove from vhosts, prepare for working upstream
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/sdev/config.nix2
-rw-r--r--makefu/1systems/vbob/config.nix2
-rw-r--r--makefu/2configs/hw/vbox-guest.nix4
3 files changed, 4 insertions, 4 deletions
diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index 7a87362d8..d209a0781 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -6,7 +6,7 @@
[ # Include the results of the hardware scan.
<stockholm/makefu>
- <stockholm/makefu/2configs/hw/vbox-guest.nix>
+ # <stockholm/makefu/2configs/hw/vbox-guest.nix>
{ # until virtualbox-image is fixed
imports = [
<stockholm/makefu/2configs/fs/single-partition-ext4.nix>
diff --git a/makefu/1systems/vbob/config.nix b/makefu/1systems/vbob/config.nix
index 1f68ad9c2..64709de3c 100644
--- a/makefu/1systems/vbob/config.nix
+++ b/makefu/1systems/vbob/config.nix
@@ -9,7 +9,7 @@
imports = [<stockholm/makefu/2configs/fs/single-partition-ext4.nix> ];
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>
# base gui
diff --git a/makefu/2configs/hw/vbox-guest.nix b/makefu/2configs/hw/vbox-guest.nix
index 3ba8ef902..65f915a2f 100644
--- a/makefu/2configs/hw/vbox-guest.nix
+++ b/makefu/2configs/hw/vbox-guest.nix
@@ -2,9 +2,9 @@
{
## Guest Extensions are currently broken
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" ];
fileSystems."/media/share" = {