diff --git a/modules/hosts/sirius/config.nix b/modules/hosts/sirius/config.nix
index b592439..cd2d13c 100644
--- a/modules/hosts/sirius/config.nix
+++ b/modules/hosts/sirius/config.nix
@@ -63,21 +63,14 @@
 
       # --- Hardware / GPU ---
       hardware = {
-        graphics = {
-          enable = true;
-          enable32Bit = true;
-        };
         nvidia = {
           modesetting.enable = true;
           open = false;
           nvidiaSettings = true;
         };
-
-        enableAllFirmware = true;
-        usb-modeswitch.enable = true;
       };
-
       services.xserver.videoDrivers = [ "nvidia" ];
+      environment.systemPackages = with pkgs; [ nvtopPackages.full ];
 
       # --- Programs ---
       programs.firefox.enable = true;
diff --git a/modules/nixos/desktop/graphics.nix b/modules/nixos/desktop/graphics.nix
new file mode 100644
index 0000000..b2887f2
--- /dev/null
+++ b/modules/nixos/desktop/graphics.nix
@@ -0,0 +1,13 @@
+{
+  flake.modules.nixos.desktop = {
+    hardware = {
+      graphics = {
+        enable = true;
+        enable32Bit = true;
+      };
+
+      enableAllFirmware = true;
+      usb-modeswitch.enable = true;
+    };
+  };
+}