From 213db715821e7c43094bcbdd1b9f582a0c893991 Mon Sep 17 00:00:00 2001
From: twoneis <sanjay29@sapura.de>
Date: Tue, 15 Oct 2024 17:04:44 +0200
Subject: [PATCH] better xwl wrapper

---
 modules/apps/programs.nix    | 2 +-
 modules/games/default.nix    | 7 +++----
 modules/niri/xwl-wrapper.nix | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/apps/programs.nix b/modules/apps/programs.nix
index 49665ca..965e471 100644
--- a/modules/apps/programs.nix
+++ b/modules/apps/programs.nix
@@ -19,7 +19,7 @@ in mkIf conf.apps.enable {
       inkscape
       blender
       gnome-disk-utility
-    ] ++ [(mkXwlWrapper { lib = lib; pkgs = pkgs; app = "${pkgs.prusa-slicer}/bin/prusa-slicer"; name = "Prusa"; })];
+    ] ++ [(mkXwlWrapper { pkgs = pkgs; name = "Prusa"; pkg = "prusa-slicer"; })];
 
     home.file = {
       ".config/vesktop/settings.json" = {
diff --git a/modules/games/default.nix b/modules/games/default.nix
index e81bae2..0db18b6 100644
--- a/modules/games/default.nix
+++ b/modules/games/default.nix
@@ -10,15 +10,14 @@
     '';
   };
   holo = pkgs.makeDesktopItem {
-    name = "holo";
-    desktopName = "Holo";
+    name = "Steam Big Picture";
+    desktopName = "Steam Big Picture";
     exec = "${holo-script}/bin/holo-script";
   };
   steam-wrapped = mkXwlWrapper {
-    lib = lib;
     pkgs = pkgs;
-    app = "${pkgs.steam}/bin/steam";
     name = "Steam Wrapped";
+    pkg = "steam";
   };
 in mkIf conf.games.enable {
   programs.steam.enable = true;
diff --git a/modules/niri/xwl-wrapper.nix b/modules/niri/xwl-wrapper.nix
index 887e965..994bec2 100644
--- a/modules/niri/xwl-wrapper.nix
+++ b/modules/niri/xwl-wrapper.nix
@@ -1,12 +1,12 @@
-{ lib, pkgs, app, name, ... }: let 
-  inherit (lib) concatStrings;
+{ pkgs, name, pkg ? name, exe ? pkg, ... }: let 
+  inherit (pkgs.lib) concatStrings;
   config = pkgs.writeTextFile {
     name = concatStrings [ "i3-config" name ];
     text = ''
-      exec ${app}
+      exec ${pkgs.${pkg}}/bin/${exe}
     '';
   };
-in  pkgs.makeDesktopItem {
+in pkgs.makeDesktopItem {
   name = name;
   desktopName = name;
   exec = "${pkgs.xwayland-run}/bin/xwayland-run -- ${pkgs.i3}/bin/i3 -c ${config}";