Merge remote-tracking branch 'gum/master'

1 files changed, 2 insertions, 4 deletions

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index 8791ad1d..4b8d39c8 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
   ];
 
 }