summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/pnp.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-11-09 02:37:13 +0100
committerlassulus <lass@aidsballs.de>2015-11-09 02:37:13 +0100
commit3d7790601ef2b32bf6b72f829137fd18d9874fd3 (patch)
tree02b5af9d30d27c5ddac360ae1fa13e0e20d5c20c /makefu/1systems/pnp.nix
parent9ff1f770f6f3703fad34ef4ce2d24116d84a5665 (diff)
parent610a3ce59c2ba0e58205305a85e9cb86e680d481 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'makefu/1systems/pnp.nix')
-rw-r--r--makefu/1systems/pnp.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index 9c7be3b79..161bfa3e9 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -8,12 +8,12 @@
imports =
[ # Include the results of the hardware scan.
# Base
- ../2configs/base.nix
- ../2configs/base-sources.nix
../2configs/tinc-basic-retiolum.nix
../2configs/headless.nix
# HW/FS
+
+ # enables virtio kernel modules in initrd
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/fs/vm-single-partition.nix
@@ -43,8 +43,6 @@
};
krebs.build.host = config.krebs.hosts.pnp;
- krebs.build.user = config.krebs.users.makefu;
- krebs.build.target = "root@pnp";
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };