diff --git a/hosts/merlon/configuration.nix b/hosts/merlon/configuration.nix
index a197c6c..7641824 100644
--- a/hosts/merlon/configuration.nix
+++ b/hosts/merlon/configuration.nix
@@ -61,6 +61,17 @@ in
         clientId = "1487976264265498655";
       };
       home.packages = with pkgs; [ quickemu ];
+
+      # Steam's CEF UI crashes on NVIDIA Wayland without -cef-disable-gpu
+      xdg.desktopEntries.steam = {
+        name = "Steam";
+        exec = "steam -cef-disable-gpu %U";
+        icon = "steam";
+        terminal = false;
+        categories = [ "Network" "FileTransfer" "Game" ];
+        mimeType = [ "x-scheme-handler/steam" "x-scheme-handler/steamlink" ];
+      };
+
       programs.ssh.enable = true;
       programs.ssh.matchBlocks.merlon-windows = {
         hostname = "localhost";
diff --git a/modules/home/niri/default.nix b/modules/home/niri/default.nix
index 5332ded..9eb0d2c 100644
--- a/modules/home/niri/default.nix
+++ b/modules/home/niri/default.nix
@@ -1,12 +1,13 @@
 {
   config,
+  osConfig ? null,
   lib,
   pkgs,
   inputs,
   ...
 }:
 let
-  isNixOS = "system" ? config;
+  isNixOS = osConfig != null;
 in
 {
   imports = [