diff --git a/home/bin/executable_linux-add-nonsteam-games b/home/bin/executable_linux-add-nonsteam-games
new file mode 100644
index 00000000..c065d2d2
--- /dev/null
+++ b/home/bin/executable_linux-add-nonsteam-games
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# Add non-steam games to steam
+
+steam_userid="47011563"
+shortcuts_vdf="$HOME/.steam/root/userdata/${steam_userid}/config/shortcuts.vdf"
+rm $shortcuts_vdf
+
+apps=(
+    "/run/current-system/sw/bin/dolphin-emu Dolphin Emulator"
+    "/run/current-system/sw/bin/yuzu Yuzu Emulator"
+    "/run/current-system/sw/bin/ppsspp PPSSPP Emulator"
+    "/run/current-system/sw/bin/ares Ares Emulator"
+)
+
+for app in "${apps[@]}"
+do
+    set -- $app
+    steamtinkerlaunch addnonsteamgame \
+        -ep="$1" -an="$2" \
+        --hero="$HOME/.local/share/chezmoi/resources/img/$2/hero.png" \
+        --iconpath="$HOME/.local/share/chezmoi/resources/img/$2/icons.png" \
+        --logo="$HOME/.local/share/chezmoi/resources/img/$2/logo.png" \
+        --boxart="$HOME/.local/share/chezmoi/resources/img/$2/boxart.png" \
+        --tenfoot="$HOME/.local/share/chezmoi/resources/img/$2/tenfoot.png" \
+        --tags="$3" \
+        --copy
+done
diff --git a/provision/modules/gaming/steam.nix b/provision/modules/gaming/steam.nix
index 113497fc..8e9b9016 100644
--- a/provision/modules/gaming/steam.nix
+++ b/provision/modules/gaming/steam.nix
@@ -16,6 +16,7 @@ in {
 
     environment.systemPackages = with pkgs; [ 
       steam
+      steamtinkerlaunch
       yuzu-early-access
       dolphin-emu
       ppsspp
diff --git a/provision/overlays/steamtinkerlaunch.nix b/provision/overlays/steamtinkerlaunch.nix
new file mode 100644
index 00000000..624f04d8
--- /dev/null
+++ b/provision/overlays/steamtinkerlaunch.nix
@@ -0,0 +1,10 @@
+self: super: {
+  steamtinkerlaunch = super.steamtinkerlaunch.overrideAttrs (old: { 
+    src = super.fetchFromGitHub { 
+      owner = "sonic2kk"; 
+      repo = "steamtinkerlaunch"; 
+      rev = "6ff8371e9c8f8122ab4b532e4649e76509a38666"; 
+      sha256 = "sha256-DsfUcAqSnrLvIbkIJ52OHlNfxaq+mOjimc9x/tOW1dA=";
+    }; 
+  }); 
+}