...

1 files changed, 21 insertions, 1 deletions

diff --git a/accounts/gkleen@sif/shell/default.nix b/accounts/gkleen@sif/shell/default.nix
index 84140072..85e034d6 100644
--- a/accounts/gkleen@sif/shell/default.nix
+++ b/accounts/gkleen@sif/shell/default.nix
@@ -4,6 +4,18 @@
   config = {
     programs.quickshell = {
       enable = true;
+      package = pkgs.symlinkJoin {
+        pname = pkgs.quickshell.pname + "-wrapped";
+        inherit (pkgs.quickshell) version meta;
+        paths = [ pkgs.quickshell ];
+        buildInputs = [ pkgs.makeWrapper ];
+        postBuild = ''
+          for binary in quickshell qs; do
+            wrapProgram $out/bin/$binary \
+              --prefix QML_IMPORT_PATH : ${pkgs.qt6Packages.callPackage ./quickshell-plugins {}}/${pkgs.qt6.qtbase.qtQmlPrefix}
+          done
+        '';
+      };
       config = {
         src = ./quickshell;
         replacements = {
@@ -76,12 +88,20 @@
               runHook postBuild
             '';
           });
+          niri_session = builtins.toJSON [
+            (pkgs.writeShellScript "niri-session" ''
+              exec ${lib.getExe pkgs.dex} -w ${config.programs.niri.package}/share/wayland-sessions/niri.desktop &>/tmp/niri-session-$$.log
+            '')
+            # (lib.getExe pkgs.dex)
+            # "${config.programs.niri.package}/share/wayland-sessions/niri.desktop"
+          ];
+          username = builtins.toJSON config.home.username;
         };
       };
     };
     systemd.user.services.quickshell = {
       Service = {
-        Environment = "QML_IMPORT_PATH=${pkgs.qt6Packages.callPackage ./quickshell-plugins {}}/${pkgs.qt6.qtbase.qtQmlPrefix}";
+        RuntimeDirectory = "quickshell";
       };
     };
   };