makefu: move more stuff into base.nix

3 files changed, 7 insertions, 18 deletions

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index bc4c679b..6693dc06 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -33,11 +33,4 @@
   ];
   networking.firewall.allowedUDPPorts = [ 2003 ];
 
-  networking.firewall.rejectPackets = true;
-  networking.firewall.allowPing = true;
-
-# $ nix-env -qaP | grep wget
-  environment.systemPackages = with pkgs; [
-    jq
-  ];
 }
diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index da7466d7..f19dbfea 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -1,7 +1,6 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
+#
+#
+#
 { config, pkgs, ... }:
 
 {
@@ -28,11 +27,4 @@
     };
   };
 
-  networking.firewall.rejectPackets = true;
-  networking.firewall.allowPing = true;
-
-  environment.systemPackages = with pkgs; [
-    vim
-    jq
-  ];
 }
diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix
index 25d92d63..906c74f7 100644
--- a/makefu/2configs/base.nix
+++ b/makefu/2configs/base.nix
@@ -50,6 +50,10 @@ with lib;
   users.mutableUsers = false;
 
   boot.tmpOnTmpfs = true;
+
+  networking.firewall.rejectPackets = true;
+  networking.firewall.allowPing = true;
+
   systemd.tmpfiles.rules = [
     "d /tmp 1777 root root - -"
   ];