diff --git a/home/desktop.nix b/home/desktop.nix
index d2b9dea..c7af8bf 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -3,14 +3,10 @@
   lib,
   ...
 }: {
-  imports =
-    [
-      ../modules/terminal.nix
-      ../modules/desktop.nix
-    ]
-    ++ lib.optionals (myConfig.linux.gaming == true) [
-      ../modules/gaming.nix
-    ];
+  imports = [
+    ../modules/terminal.nix
+    ../modules/desktop.nix
+  ];
 
   programs.home-manager.enable = true;
 
diff --git a/modules/de.nix b/modules/de.nix
index b891220..ab3614e 100644
--- a/modules/de.nix
+++ b/modules/de.nix
@@ -3,9 +3,13 @@
   myConfig,
   ...
 }: {
-  imports = [
-    ../system/font.nix
-    ../system/browser.nix
-    ../system/wayland.nix
-  ];
+  imports =
+    [
+      ../system/font.nix
+      ../system/browser.nix
+      ../system/wayland.nix
+    ]
+    ++ lib.optionals (myConfig.linux.gaming == true) [
+      ../system/graphics.nix
+    ];
 }
diff --git a/packages/mangohud/default.nix b/packages/mangohud/default.nix
index 39f40ab..9033349 100644
--- a/packages/mangohud/default.nix
+++ b/packages/mangohud/default.nix
@@ -2,5 +2,80 @@
   programs.mangohud = {
     enable = true;
     enableSessionWide = true;
+    settings = {
+      toggle_hud = "Shift_R+F12";
+      legacyLayout = false;
+
+      backgroundAlpha = 0.6;
+      roundCorners = 10;
+      backgroundColor = "000000";
+
+      fontSize = 24;
+      textColor = "FFFFFF";
+      position = "top-left";
+
+      tableColumns = 3;
+
+      gpuText = "GPU";
+      gpuStats = true;
+      gpuLoadChange = true;
+      gpuLoadValue = "50,90";
+      gpuLoadColor = "FFFFFF,FFAA7F,CC0000";
+      gpuCoreClock = true;
+      gpuMemClock = true;
+      gpuTemp = true;
+      gpuPower = true;
+      gpuColor = "2E9762";
+
+      cpuText = "CPU";
+      cpuStats = true; # Assuming this implies cpu_stats is enabled
+      cpuLoadChange = true;
+      cpuLoadValue = "50,90";
+      cpuLoadColor = "FFFFFF,FFAA7F,CC0000";
+      cpuMhz = true;
+      cpuTemp = true;
+      cpuPower = true;
+      cpuColor = "2E97CB";
+
+      vram = true;
+      vramColor = "AD64C1"; # Note: you had this twice, keeping one
+
+      ram = true;
+      ramColor = "C26693";
+
+      battery = true;
+      batteryColor = "00FF00";
+
+      fps = true;
+      fpsMetrics = "avg,0.01";
+      engineVersion = true;
+      engineColor = "EB5B5B";
+      frameTiming = true;
+      frametimeColor = "FFFFFF";
+      fpsLimitMethod = "late";
+      toggleFpsLimit = "Shift_L+F1";
+      fpsLimit = 0;
+      fpsColorChange = true;
+      fpsColor = "B22222,FDFD09,39F900";
+      fpsValue = "30,60";
+
+      # The 'offset' setting was commented out in your original file,
+      # so it's omitted here.
+
+      outputFolder = "/home/kenji";
+      logDuration = 30;
+      autostartLog = 0;
+      logInterval = 100;
+      toggleLogging = "Shift_L+F2";
+
+      blacklist = [
+        "pamac-manager"
+        "lact"
+        "ghb"
+        "bitwig-studio"
+        "ptyxis"
+        "yumex"
+      ];
+    };
   };
 }
diff --git a/system/graphics.nix b/system/graphics.nix
new file mode 100644
index 0000000..93689f0
--- /dev/null
+++ b/system/graphics.nix
@@ -0,0 +1,6 @@
+{...}: {
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true; # Crucial for 32-bit games
+  };
+}
diff --git a/system/hardware.nix b/system/hardware.nix
index 1b10cc7..3764428 100644
--- a/system/hardware.nix
+++ b/system/hardware.nix
@@ -1,4 +1,8 @@
-{myConfig, ...}: {
+{
+  myConfig,
+  pkgs,
+  ...
+}: {
   hardware = {
     logitech.wireless.enable = myConfig.linux.logitech-hardware.enable;
     bluetooth = {