From e24630b9be089063e88a02ddb18d470a87f1d004 Mon Sep 17 00:00:00 2001
From: clsty <celestial.y@outlook.com>
Date: Wed, 5 Nov 2025 08:40:05 +0800
Subject: [PATCH] Use qt6 and NixGL wrapper for quickshell

---
 sdata/dist-nix/home-manager/home.nix       |  3 +-
 sdata/dist-nix/home-manager/quickshell.nix | 40 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 sdata/dist-nix/home-manager/quickshell.nix

diff --git a/sdata/dist-nix/home-manager/home.nix b/sdata/dist-nix/home-manager/home.nix
index b0af38bf5..236b2f39f 100644
--- a/sdata/dist-nix/home-manager/home.nix
+++ b/sdata/dist-nix/home-manager/home.nix
@@ -207,7 +207,8 @@
     ]
     ++ [
     #(config.lib.nixGL.wrap pkgs.hyprland)
-    (config.lib.nixGL.wrap quickshell.packages.x86_64-linux.default)
+    #(config.lib.nixGL.wrap quickshell.packages.x86_64-linux.default)
+    (import ./quickshell.nix { inherit pkgs quickshell; nixGLWrap = config.lib.nixGL.wrap; })
     ];
   }//home_attrs;
 }
diff --git a/sdata/dist-nix/home-manager/quickshell.nix b/sdata/dist-nix/home-manager/quickshell.nix
new file mode 100644
index 000000000..7b4fbee20
--- /dev/null
+++ b/sdata/dist-nix/home-manager/quickshell.nix
@@ -0,0 +1,40 @@
+{ pkgs, quickshell, nixGLWrap, ... }:
+let
+  qs = nixGLWrap quickshell.packages.x86_64-linux.default;
+in pkgs.stdenv.mkDerivation {
+  name = "illogical-impulse-quickshell-wrapper";
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  nativeBuildInputs = [
+    pkgs.makeWrapper
+    pkgs.qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = with pkgs; [
+    qs
+    qt6.qtbase
+    kdePackages.qt5compat
+    kdePackages.qtdeclarative
+    kdePackages.kdialog
+    kdePackages.qtwayland
+    kdePackages.qtpositioning
+    kdePackages.qtlocation
+    kdePackages.syntax-highlighting
+    gsettings-desktop-schemas
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    ls -l ${qs}/bin || true
+    makeWrapper ${qs}/bin/qs $out/bin/qs \
+      --prefix XDG_DATA_DIRS : ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}
+    chmod +x $out/bin/qs
+  '';
+
+  meta = with pkgs.lib; {
+    description = "Quickshell wrapped with NixGL + bundled Qt deps for home-manager usage";
+    license = licenses.mit;
+  };
+}