diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index 8da8b41..5f63e1c 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -512,10 +512,23 @@ in
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    wget vim git file lm_sensors acpi pciutils psmisc nixops_unstable_minimal
-    irssi tmux usbutils imagemagick jq zip unzip
+    lm_sensors
+    acpi
+    usbutils
+    pciutils
     iw
     nvme-cli
+    smartmontools
+    psmisc
+
+    wget
+    vim
+    git
+    file
+    imagemagick
+    jq
+
+    nixops_unstable_minimal
     borgbackup
     bind
     waypipe
@@ -545,6 +558,7 @@ in
   services.openssh.settings.X11Forwarding = true;
   services.openssh.authorizedKeysInHomedir = false;
   programs.mosh.enable = true;
+  programs.tmux.enable = true;
 
   programs.fish.enable = true;
   programs.zsh.enable = true;