core: use hyprutils and std again

hyprwm · Oct 15, 2024 · ff647a2 · ff647a2
1 parent 6738e7d
commit ff647a2
Show file tree

Hide file tree

Showing 10 changed files with 170 additions and 172 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,10 +6,13 @@ string(STRIP ${VER_RAW} VER)
 
 project(hsi VERSION ${VER} LANGUAGES CXX)
 
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Qt6 6.5 REQUIRED COMPONENTS Widgets Quick QuickControls2)
-set(CMAKE_CXX_STANDARD 20)
+find_package(PkgConfig REQUIRED)
+
+pkg_check_modules(hyprutils REQUIRED IMPORTED_TARGET hyprutils)
 
 qt_standard_project_setup(REQUIRES 6.5)
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,6 +4,12 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     systems.url = "github:nix-systems/default-linux";
+
+    hyprutils = {
+      url = "github:hyprwm/hyprutils";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+    };
   };
 
   outputs = {
@@ -30,14 +36,9 @@
     });
 
     devShells = eachSystem (system: {
-      default = pkgsFor.${system}.mkShell {
-        inputsFrom = [self.packages.${system}.hyprsysteminfo];
-
-        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}) hyprsysteminfo;
       };
     });
   };

diff --git a/nix/default.nix b/nix/default.nix
@@ -5,6 +5,8 @@
   kdePackages,
   pciutils,
   qt6,
+  pkg-config,
+  hyprutils,
   version ? "0",
 }: let
   inherit (lib.sources) cleanSource cleanSourceWith;
@@ -24,6 +26,7 @@ in
 
     nativeBuildInputs = [
       cmake
+      pkg-config
       qt6.wrapQtAppsHook
     ];
 
@@ -32,6 +35,7 @@ in
       qt6.qtbase
       qt6.qtsvg
       qt6.qtwayland
+      hyprutils
     ];
 
     preFixup = ''

diff --git a/nix/overlays.nix b/nix/overlays.nix
@@ -14,6 +14,7 @@ in {
   default = self.overlays.hyprsysteminfo;
 
   hyprsysteminfo = lib.composeManyExtensions [
+    inputs.hyprutils.overlays.default
     (final: prev: {
       hyprsysteminfo = final.callPackage ./. {
         version = "${version}+date=${date}_${self.shortRev or "dirty"}";

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -11,4 +11,4 @@ qt_add_qml_module(hyprsysteminfo
     QML_FILES main.qml
 )
 
-target_link_libraries(hyprsysteminfo PRIVATE Qt6::Widgets Qt6::QuickControls2)
+target_link_libraries(hyprsysteminfo PRIVATE Qt6::Widgets Qt6::QuickControls2 PkgConfig::hyprutils)