2 files changed, 2 insertions, 58 deletions
diff --git a/hosts/common/system/default.nix b/hosts/common/system/default.nix
index fda467f..2b48e4e 100644
--- a/hosts/common/system/default.nix
+++ b/hosts/common/system/default.nix
@@ -1,15 +1,6 @@
 { pkgs, ... }:
 
 {
-  imports = [
-    ./boot.nix
-    ./hardware.nix
-    ./network.nix
-    ./security.nix
-    ./software.nix
-    ./users.nix
-  ];
-
-  # It's always useful to have bash around
-  environment.shells = [ pkgs.bashInteractive pkgs.zsh pkgs.fish ];
+  imports =
+    [ ./boot.nix ./hardware.nix ./network.nix ./security.nix ./users.nix ];
 }
diff --git a/hosts/common/system/software.nix b/hosts/common/system/software.nix
deleted file mode 100644
index e872679..0000000
--- a/hosts/common/system/software.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-with lib;
-
-let linuxpkgs = config.boot.kernelPackages;
-in {
-  environment.systemPackages = with pkgs; [
-    binutils
-    cacert
-    curl
-    dmidecode
-    ethtool
-    flameGraph
-    git
-    htop
-    hwdata
-    iftop
-    iptraf-ng
-    linuxpkgs.perf
-    lm_sensors
-    lsb-release
-    lsof
-    man-pages
-    mg
-    mtr
-    openssl
-    openssl
-    parted
-    pciutils
-    perf-tools
-    powertop
-    rsync
-    sqlite
-    strace
-    tcpdump
-    tmux
-    traceroute
-    unzip
-    usbutils
-    vim
-    wget
-    wireguard
-    zsh
-  ];
-
-  programs.bcc.enable = true;
-}