diff --git a/modules/monitoring/powertop/default.nix b/modules/monitoring/powertop/default.nix
deleted file mode 100644
index c713a0e..0000000
--- a/modules/monitoring/powertop/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  options,
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.aa.monitoring.powertop;
-in {
-  options.aa.monitoring.powertop = with types; {
-    enable = mkEnableOption "powertop";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [powertop];
-
-    powerManagement.powertop.enable = true;
-  };
-}
diff --git a/modules/system/monitoring/default.nix b/modules/system/monitoring/default.nix
new file mode 100644
index 0000000..132bed0
--- /dev/null
+++ b/modules/system/monitoring/default.nix
@@ -0,0 +1,25 @@
+{
+  options,
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.aa.system.monitoring;
+in {
+  options.aa.system.monitoring = with types; {
+    enable = mkEnableOption "monitoring";
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      htop
+      lm_sensors
+      powertop
+      zenith
+    ];
+
+    powerManagement.powertop.enable = true;
+  };
+}
diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix
index d7d03c2..2591718 100644
--- a/systems/x86_64-linux/gospel/default.nix
+++ b/systems/x86_64-linux/gospel/default.nix
@@ -43,8 +43,7 @@
     hardware.audio.enable = true;
 
     system.zfs.enable = true;
-
-    monitoring.powertop.enable = true;
+    system.monitoring.enable = true;
   };
 
   boot.binfmt.emulatedSystems = ["aarch64-linux" "armv6l-linux"];