From 604b6ddca4e1ad20f84afad23a932d6ec6a8f342 Mon Sep 17 00:00:00 2001
From: Chris Kruining <chris@kruining.eu>
Date: Sat, 26 Apr 2025 16:00:07 +0200
Subject: [PATCH] apply suggestions and fix focus with right registry entry

---
 modules/home/desktop/applications/studio.nix |  1 -
 packages/studio.nix                          | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/home/desktop/applications/studio.nix b/modules/home/desktop/applications/studio.nix
index 65bce2f..940c386 100644
--- a/modules/home/desktop/applications/studio.nix
+++ b/modules/home/desktop/applications/studio.nix
@@ -11,7 +11,6 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
-      wineWowPackages.full
       my.studio
     ];
   };
diff --git a/packages/studio.nix b/packages/studio.nix
index 4836175..e3061d4 100644
--- a/packages/studio.nix
+++ b/packages/studio.nix
@@ -1,7 +1,7 @@
 { pkgs, inputs }: let
   inherit (builtins) fetchurl;
-  inherit (pkgs) makeDesktopItem wineWowPackages;
-  inherit (inputs.erosanix.lib.x86_64-linux) mkWindowsAppNoCC makeDesktopIcon;
+  inherit (pkgs) makeDesktopItem copyDesktopItems wineWowPackages;
+  inherit (inputs.erosanix.lib.x86_64-linux) mkWindowsAppNoCC makeDesktopIcon copyDesktopIcons;
 
   wine = wineWowPackages.base;
 in mkWindowsAppNoCC rec {
@@ -50,11 +50,13 @@ in mkWindowsAppNoCC rec {
   graphicsDriver = "auto";
   inhibitIdle = false;
 
+  nativeBuildInputs = [ copyDesktopIcons copyDesktopItems ];
+
   winAppInstall = ''
     wine64 ${src}
 
-    wine64 reg add 'HKCU\Software\Wine\Explorer' /v Desktop /d "Default"
-    wine64 reg add 'HKCU\Software\Wine\Explorer\Desktops' /v Default /d "1920x1080"
+    wineserver -W
+    wine64 reg add 'HKEY_CURRENT_USER\Software\Wine\X11 Driver' /t REG_SZ /v UseTakeFocus /d N /f
   '';
 
   winAppPreRun = '''';