diff options
author | makefu <makefu@tsp> | 2015-08-11 19:00:22 +0000 |
---|---|---|
committer | makefu <makefu@tsp> | 2015-08-11 19:00:22 +0000 |
commit | 62325d01d38a262ad6c1912e38661e1392a9fe24 (patch) | |
tree | 26594b01fed99e9051d28497785b4ffdc5caee99 | |
parent | 9f56789a7d9186a868c71a9528eee63712e2a9d8 (diff) |
makefu: move more stuff into base.nix
-rw-r--r-- | 1systems/pnp.nix | 7 | ||||
-rw-r--r-- | 1systems/tsp.nix | 14 | ||||
-rw-r--r-- | 2configs/base.nix | 4 |
3 files changed, 7 insertions, 18 deletions
diff --git a/1systems/pnp.nix b/1systems/pnp.nix index bc4c679b7..6693dc066 100644 --- a/1systems/pnp.nix +++ b/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/1systems/tsp.nix b/1systems/tsp.nix index da7466d75..f19dbfea6 100644 --- a/1systems/tsp.nix +++ b/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/2configs/base.nix b/2configs/base.nix index 25d92d63d..906c74f7d 100644 --- a/2configs/base.nix +++ b/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 - -" ]; |