summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/sdev
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-02-14 09:41:59 +0100
committermakefu <github@syntax-fehler.de>2018-02-14 09:41:59 +0100
commit931e25894dc43f7c7e37026f3cc29427aa07ba80 (patch)
tree2d52d792e1f3d96c2e9e832f227c87640117840b /makefu/1systems/sdev
parent372d965133cfe224d4cd47f63ec1fd2c8475c1ae (diff)
ma vbox-guest: init
Diffstat (limited to 'makefu/1systems/sdev')
-rw-r--r--makefu/1systems/sdev/config.nix19
1 files changed, 6 insertions, 13 deletions
diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index a60a8db66..81e8cd4d1 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -6,9 +6,12 @@
[ # Include the results of the hardware scan.
<stockholm/makefu>
- (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
- { ## Guest Extensions are currently broken
- virtualisation.virtualbox.guest.enable = lib.mkForce true;
+ <stockholm/makefu/2configs/hw/vbox-guest.nix>
+ { # until virtualbox-image is fixed
+ imports = [
+ <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
+ ];
+ boot.loader.grub.device = "/dev/sda";
}
<stockholm/makefu/2configs/main-laptop.nix>
# <secrets/extra-hosts.nix>
@@ -17,11 +20,6 @@
<stockholm/makefu/2configs/tinc/retiolum.nix>
];
- # workaround for https://github.com/NixOS/nixpkgs/issues/16641
- services.xserver.videoDrivers = lib.mkOverride 45 [ "virtualbox" "modesetting" ];
-
- nixpkgs.config.allowUnfree = true;
-
# allow sdev to deploy self
users.extraUsers = {
root = {
@@ -50,10 +48,5 @@
8010
];
- fileSystems."/media/share" = {
- fsType = "vboxsf";
- device = "share";
- options = [ "rw" "uid=9001" "gid=9001" "nofail" ];
- };
}