summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/sdev
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-02-15 13:37:14 +0100
committerlassulus <lassulus@lassul.us>2018-02-15 13:37:14 +0100
commitc74106cbc87a06bb90e5a499e82c4106bda98bf0 (patch)
tree5982d462653a62442400fe6c81296ecaabd4389a /makefu/1systems/sdev
parent11a7d704e22f56c83c1af3c8ca0bfcbb510316f2 (diff)
parent372d965133cfe224d4cd47f63ec1fd2c8475c1ae (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/sdev')
-rw-r--r--makefu/1systems/sdev/config.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index 38c044be4..a60a8db66 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -5,8 +5,11 @@
imports =
[ # Include the results of the hardware scan.
<stockholm/makefu>
+
(toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
- (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
+ { ## Guest Extensions are currently broken
+ virtualisation.virtualbox.guest.enable = lib.mkForce true;
+ }
<stockholm/makefu/2configs/main-laptop.nix>
# <secrets/extra-hosts.nix>
@@ -50,7 +53,7 @@
fileSystems."/media/share" = {
fsType = "vboxsf";
device = "share";
- options = [ "rw" "uid=9001" "gid=9001" ];
+ options = [ "rw" "uid=9001" "gid=9001" "nofail" ];
};
}