Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m 1 vbob: cleanup, add workaround for virtualbox

Browse Source
This commit is contained in:
makefu 2016-07-15 08:35:27 +02:00
parent 447ead94a3
commit d0e0cde0d0
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
makefu/1systems/vbob.nix
View File

@ -5,23 +5,23 @@
imports = imports =
[ # Include the results of the hardware scan. [ # 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 ../2configs/main-laptop.nix #< base-gui
# (toString <secrets>)/extra-hosts.nix
# environment # 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" = { fileSystems."/nix" = {
device ="/dev/disk/by-label/nixstore"; device ="/dev/disk/by-label/nixstore";
fsType = "ext4"; 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 # allow vbob to deploy self
users.extraUsers = { users.extraUsers = {
root = { root = {
@ -52,11 +52,7 @@
"gum" "gum"
]; ];
}; };
virtualisation.docker.enable = false;
networking.extraHosts = ''
172.17.20.190 gitlab
172.17.62.27 svbittool01 tool
'';
fileSystems."/media/share" = { fileSystems."/media/share" = {
fsType = "vboxsf"; fsType = "vboxsf";