diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix
index 3a544c8..b2909ef 100644
--- a/modules/apps/gaming.nix
+++ b/modules/apps/gaming.nix
@@ -65,6 +65,14 @@ in {
       };
     };
 
+    vkbasalt = {
+      enable = lib.mkEnableOption "vkBasalt/ReShade/GShade post processing shaders";
+    };
+
+    mangohud = {
+      enable = lib.mkEnableOption "OpenGL/Vulkan overlay tool shown in games presenting FPS, CPU/GPU/memory utilization, load, etc.";
+    };
+
     lutris = {
       enable = lib.mkEnableOption "Lutris game manager and launcher";
       package = lib.mkOption {
@@ -202,7 +210,10 @@ in {
         cfg.lutris.extraPackages
       )) ++
       (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++
-      (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]);
+      (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++
+      (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkBasalt pkgs.vkbasalt-cli]) ++
+      (lib.optionals cfg.mangohud.enable [pkgs.mangohud]) ++
+      (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]);
 
     nix.settings = let 
       inherit agl;
diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix
index 74125cc..67c14aa 100644
--- a/modules/machine/cloud/configuration.nix
+++ b/modules/machine/cloud/configuration.nix
@@ -89,8 +89,10 @@ in {
         localNetworkGameTransfers = true;
       };
     };
+    vkbasalt.enable = true;
     gamemode.enable = true;
     gamescope.enable = true;
+    mangohud.enable = true;
     lutris = {
       enable = true;
       wine = {
@@ -100,10 +102,6 @@ in {
       compatibility = {
         protonSupport = true;
       };
-      extraPackages = with pkgs; [
-        gamemode
-        mangohud
-      ];
     };
 
     ffxiv.enable = true;