diff options
| author | tv <tv@krebsco.de> | 2017-06-29 22:04:58 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-06-29 22:04:58 +0200 |
| commit | 077a6a699129416cdeb0a9da3aba30d156e46b7a (patch) | |
| tree | d5588c0024a942fef6f4d597aedac5708dd7fa45 /makefu/1systems/vbob.nix | |
| parent | 10adb2d27e3005c7239585eb38dbbe3b5b01a400 (diff) | |
| parent | 51e091c7c3fb52579bc9ed59d1c7db633cd24e5b (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/vbob.nix')
| -rw-r--r-- | makefu/1systems/vbob.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index 7421125e4..b79ec64c0 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -9,13 +9,21 @@ (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>) ../2configs/main-laptop.nix #< base-gui + # Tools + ../2configs/tools/core.nix + ../2configs/tools/core-gui.nix + ../2configs/tools/dev.nix + ../2configs/tools/extra-gui.nix + ../2configs/tools/sec.nix + # environment ../2configs/tinc/retiolum.nix + ../2configs/audio/jack-on-pulse.nix + ../2configs/audio/realtime-audio.nix + ]; networking.extraHosts = import (toString <secrets/extra-hosts.nix>); - # workaround for https://github.com/NixOS/nixpkgs/issues/16641 - services.xserver.videoDrivers = lib.mkOverride 45 [ "virtualbox" "modesetting" ]; nixpkgs.config.allowUnfree = true; fileSystems."/nix" = { |