diff options
| author | makefu <github@syntax-fehler.de> | 2016-07-15 08:35:27 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-07-15 08:35:27 +0200 |
| commit | d0e0cde0d0b07b6932b8b591de73a62e41b4abfb (patch) | |
| tree | 8d3a765a5a0eb8b8af1aac6a60fb96f44196fdc8 /makefu | |
| parent | 447ead94a3ad13ac2691b5e5e996efa1cfcbdddd (diff) | |
m 1 vbob: cleanup, add workaround for virtualbox
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/vbob.nix | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index 8b71b1393..3fcb173ce 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -5,23 +5,23 @@ imports = [ # Include the results of the hardware scan. ../. - <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix> + (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>) + (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>) ../2configs/main-laptop.nix #< base-gui + # (toString <secrets>)/extra-hosts.nix # environment ]; - nixpkgs.config.allowUnfree = true; + # workaround for https://github.com/NixOS/nixpkgs/issues/16641 + services.xserver.videoDrivers = lib.mkOverride 45 [ "virtualbox" "modesetting" ]; + nixpkgs.config.allowUnfree = true; fileSystems."/nix" = { device ="/dev/disk/by-label/nixstore"; fsType = "ext4"; }; - fileSystems."/var/lib/docker" = { - device ="/dev/disk/by-label/nix-docker"; - fsType = "ext4"; - }; - #makefu.buildbot.master.enable = true; + # allow vbob to deploy self users.extraUsers = { root = { @@ -52,11 +52,7 @@ "gum" ]; }; - - networking.extraHosts = '' - 172.17.20.190 gitlab - 172.17.62.27 svbittool01 tool - ''; + virtualisation.docker.enable = false; fileSystems."/media/share" = { fsType = "vboxsf"; |