nix: move to hyprland-qt-support (#25)

Author: outfoxxed

flake.lock

@@ -10,6 +10,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.systems.follows = "systems";
     };
+
+    hyprland-qt-support = {
+      url = "github:hyprwm/hyprland-qt-support";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+    };
   };
 
   outputs = {
@@ -36,14 +42,9 @@
     });
 
     devShells = eachSystem (system: {
-      default = pkgsFor.${system}.mkShell {
-        inputsFrom = [self.packages.${system}.hyprpolkitagent];
-
-        shellHook = ''
-          # Generate compile_commands.json
-          CMAKE_EXPORT_COMPILE_COMMANDS=1 cmake -S . -B ./build
-          ln -s build/compile_commands.json .
-        '';
+      default = import ./nix/shell.nix {
+        pkgs = pkgsFor.${system};
+        inherit (pkgsFor.${system}) hyprpolkitagent;
       };
     });
   };

flake.nix

@@ -4,6 +4,7 @@
   cmake,
   pkg-config,
   hyprutils,
+  hyprland-qt-support,
   kdePackages,
   polkit,
   qt6,
@@ -32,9 +33,9 @@ in
 
     buildInputs = [
       hyprutils
-      kdePackages.kirigami-addons
-      kdePackages.polkit-qt-1
+      hyprland-qt-support
       polkit
+      kdePackages.polkit-qt-1
       qt6.qtbase
       qt6.qtsvg
       qt6.qtwayland

nix/default.nix

@@ -15,6 +15,7 @@ in {
 
   hyprpolkitagent = lib.composeManyExtensions [
     inputs.hyprutils.overlays.default
+    inputs.hyprland-qt-support.overlays.default
     (final: prev: {
       hyprpolkitagent = final.callPackage ./. {
         stdenv = final.gcc14Stdenv;

nix/overlays.nix

@@ -0,0 +1,26 @@
+{
+  pkgs ? import <nixpkgs> {},
+  hyprpolkitagent ? pkgs.callPackage ./default.nix {},
+  ...
+}: pkgs.mkShell {
+  inputsFrom = [ hyprpolkitagent ];
+  nativeBuildInputs = [ pkgs.clang-tools ];
+
+  shellHook = let
+    inherit (pkgs.lib.strings) concatMapStringsSep;
+    qtLibPath = f: concatMapStringsSep ":" f (with pkgs.qt6; [
+      qtbase
+      qtdeclarative
+      qtwayland
+      pkgs.hyprland-qt-support
+    ]);
+  in ''
+    # Add Qt-related environment variables.
+    export QT_PLUGIN_PATH=${qtLibPath (p: "${p}/lib/qt-6/plugins")}
+    export QML2_IMPORT_PATH=${qtLibPath (p: "${p}/lib/qt-6/qml")}
+
+    # Generate compile_commands.json
+    CMAKE_EXPORT_COMPILE_COMMANDS=1 cmake -S . -B ./build
+    ln -s build/compile_commands.json .
+  '';
+}