summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/pnp.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-03-16 00:13:58 +0100
committertv <tv@krebsco.de>2016-03-16 00:13:58 +0100
commit2452d211737e0544e9cc92ae44da69940632a750 (patch)
treeecb0e2d9932805a6b40be7e09ab5206201e7aba7 /makefu/1systems/pnp.nix
parent13df24f8f09469c32077ded463d99033042e25ee (diff)
parent03a72ef958055c958992c4fbde618c1e68bfff6e (diff)
Merge remote-tracking branch 'gum/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 8791ad1d7..4b8d39c89 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -7,7 +7,6 @@
imports =
[
../.
- ../2configs/tinc-basic-retiolum.nix
../2configs/headless.nix
../../krebs/3modules/Reaktor.nix
@@ -20,6 +19,7 @@
<nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>
];
+ krebs.retiolum.enable = true;
virtualisation.graphics = false;
# also export secrets, see Usage above
fileSystems = pkgs.lib.mkVMOverride {
@@ -43,10 +43,8 @@
krebs.build.host = config.krebs.hosts.pnp;
- nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
-
networking.firewall.allowedTCPPorts = [
- 25
+ 25
];
}