From 93b1aba78d775d6da7b12cde74725ccb8efaabff Mon Sep 17 00:00:00 2001
From: Menno van Leeuwen <menno@vleeuwen.me>
Date: Mon, 18 Nov 2024 21:28:34 +0100
Subject: [PATCH] adds nvtop for all hosts

---
 config/nixos/hardware/mennos-gamingpc.nix | 3 ++-
 config/nixos/hardware/mennos-laptop.nix   | 6 ++++++
 config/nixos/hardware/mennos-server.nix   | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config/nixos/hardware/mennos-gamingpc.nix b/config/nixos/hardware/mennos-gamingpc.nix
index 3cf93c9..a731fe3 100644
--- a/config/nixos/hardware/mennos-gamingpc.nix
+++ b/config/nixos/hardware/mennos-gamingpc.nix
@@ -33,12 +33,13 @@
     ];
   };
 
-  # Add ROCm packages
+  # Add ROCm packages and nvtop
   environment.systemPackages = with pkgs; [
     rocmPackages.rocm-smi
     rocmPackages.clr
     rocmPackages.rocm-core
     rocmPackages.hipcc
     rocmPackages.rocm-device-libs
+    nvtopPackages.amd
   ];
 }
diff --git a/config/nixos/hardware/mennos-laptop.nix b/config/nixos/hardware/mennos-laptop.nix
index 0e21653..3f4deee 100644
--- a/config/nixos/hardware/mennos-laptop.nix
+++ b/config/nixos/hardware/mennos-laptop.nix
@@ -19,6 +19,12 @@
   # Load nvidia driver for Xorg and Wayland
   services.xserver.videoDrivers = [ "nvidia" ];
 
+  # nvtop, a system monitor for GPUs
+  environment.systemPackages = with pkgs; [
+    nvtopPackages.nvidia
+    nvtopPackages.amd
+  ];
+
   hardware.nvidia = {
     # Modesetting is required.
     modesetting.enable = true;
diff --git a/config/nixos/hardware/mennos-server.nix b/config/nixos/hardware/mennos-server.nix
index bdbdb2d..c875854 100644
--- a/config/nixos/hardware/mennos-server.nix
+++ b/config/nixos/hardware/mennos-server.nix
@@ -27,6 +27,9 @@
     driSupport32Bit = true;
   };
 
+  # nvtop, a system monitor for GPUs
+  environment.systemPackages = with pkgs; [ nvtopPackages.nvidia ];
+
   # Enable NVIDIA Docker support
   # test with: $ docker run --rm -it --device=nvidia.com/gpu=all ubuntu:latest nvidia-smi
   hardware.nvidia-container-toolkit.enable = true;