From ec5bed6e65bc72afc93c2a9df8d03777989fa06c Mon Sep 17 00:00:00 2001
From: Daniel Poelzleithner <git@poelzi.org>
Date: Mon, 31 May 2021 13:44:28 +0200
Subject: [PATCH] Add more packages, speedtest-cli on upstreams

---
 nix/nixos-module/container/defaults.nix |  2 +-
 nix/nixos-module/container/upstream.nix |  4 ++++
 nix/nixos-module/defaults.nix           | 23 ++++++++++++++++++-----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/nix/nixos-module/container/defaults.nix b/nix/nixos-module/container/defaults.nix
index dbbe16c..b45f118 100644
--- a/nix/nixos-module/container/defaults.nix
+++ b/nix/nixos-module/container/defaults.nix
@@ -1,4 +1,4 @@
-{ config, lib, modulesPath, ... }:
+{ config, lib, modulesPath, pkgs, ... }:
 
 {
   imports = [
diff --git a/nix/nixos-module/container/upstream.nix b/nix/nixos-module/container/upstream.nix
index fae8242..8e43e9e 100644
--- a/nix/nixos-module/container/upstream.nix
+++ b/nix/nixos-module/container/upstream.nix
@@ -52,6 +52,10 @@ in
     '';
   }) upstreamInterfaces;
 
+  environment.systemPackages = lib.optionals enabled [
+    pkgs.speedtest-cli
+  ];
+
   networking.nat = lib.optionalAttrs enabled {
     enable = true;
     internalInterfaces = [ "core" ];
diff --git a/nix/nixos-module/defaults.nix b/nix/nixos-module/defaults.nix
index 3b46ada..a6e1899 100644
--- a/nix/nixos-module/defaults.nix
+++ b/nix/nixos-module/defaults.nix
@@ -31,12 +31,25 @@
   };
 
   environment.systemPackages = with pkgs; [
-    vim screen git wget psmisc
-    ethtool tcpdump iputils
-    mtr traceroute
-    iptables bridge-utils conntrack-tools
-    bmon iftop speedtest-cli
+    bmon
+    bridge-utils
+    conntrack-tools
     dhcpcd
+    ethtool
+    git
+    iftop
+    iperf
+    iptables
+    iptraf-ng
+    iputils
+    mtr
+    psmisc
+    screen
+    speedtest-cli
+    tcpdump
+    traceroute
+    vim
+    wget
   ];
 
   networking.hostName = hostName;