summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <makefu@tsp>2015-08-11 19:00:22 +0000
committermakefu <makefu@tsp>2015-08-11 19:00:22 +0000
commit7a378d230d4c75f77f04943b73ad4c883d6750b9 (patch)
tree5d4b02258c48c8dc5e090e947902ef39ae8705d6 /makefu
parent450d9e71ff0afc99511b840bed77a979795a988a (diff)
makefu: move more stuff into base.nix
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/pnp.nix7
-rw-r--r--makefu/1systems/tsp.nix14
-rw-r--r--makefu/2configs/base.nix4
3 files changed, 7 insertions, 18 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index bc4c679b7..6693dc066 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 da7466d75..f19dbfea6 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 25d92d63d..906c74f7d 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 - -"
];