diff options
| author | nin <nineinchnade@gmail.com> | 2017-07-06 20:36:05 +0200 |
|---|---|---|
| committer | nin <nineinchnade@gmail.com> | 2017-07-06 20:36:05 +0200 |
| commit | de8baa21bf122242c4ad6a4c17405259037149c8 (patch) | |
| tree | 85e34f8040799313fa73a23eddb41ab5eec1d9e9 /makefu/1systems/vbob.nix | |
| parent | 060ae725c32e6490d47bc3153de076ace26b59fd (diff) | |
| parent | 438fdd2bd8e363567f544966e49d00f728921301 (diff) | |
Merge branch 'master' of prism:stockholm
Diffstat (limited to 'makefu/1systems/vbob.nix')
| -rw-r--r-- | makefu/1systems/vbob.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index 7421125e4..d8e275bf6 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -8,14 +8,23 @@ (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>) (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>) ../2configs/main-laptop.nix #< base-gui + ../2configs/sshd-totp.nix + + # 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" = { |