diff --git a/environment.nix b/environment.nix
new file mode 100644
index 0000000..458dccf
--- /dev/null
+++ b/environment.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    htop
+    nload
+    tmux
+  ];
+}
diff --git a/flake.nix b/flake.nix
index 84c656f..780bfd6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,7 @@
         modules = [
           ./hardware/hcloud.nix
           ./modules/openssh.nix
+          ./environment.nix
         ];
       };
     in
@@ -27,9 +28,6 @@
           modules = common.modules ++ [
             ./modules/postgresql.nix
             ({
-              environment.systemPackages = with pkgs; [
-                htop
-              ];
               networking.hostName = "db1";
               networking.domain = "banditlair.com";
               networking.firewall.interfaces."enp7s0".allowedTCPPorts = [ 5432 ];