core: use qt libraries and follow qml module conventions

Uses a qml module instead of a context property.
Replaces usages of std and hyprutils with qtbase where applicable.
Removes dependencies: hyprutils, wl-copy, whoami, uname.
Rolls c++ version back to 20, as 23 isn't currently required for anything.

CMakeLists.txt

@@ -9,39 +9,16 @@ project(hsi VERSION ${VER} LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Qt6 6.5 REQUIRED COMPONENTS Widgets Quick QuickControls2)
-find_package(PkgConfig REQUIRED)
-set(CMAKE_CXX_STANDARD 23)
-
-pkg_check_modules(
-  deps
-  REQUIRED
-  IMPORTED_TARGET
-  hyprutils)
+set(CMAKE_CXX_STANDARD 20)
 
 qt_standard_project_setup(REQUIRES 6.5)
 
-qt_add_executable(hyprsysteminfo
-    src/main.cpp src/util/Utils.cpp src/util/Utils.hpp
-)
-
-qt_add_qml_module(hyprsysteminfo
-    URI hsi
-    VERSION 1.0
-    QML_FILES
-        qml/main.qml
-    SOURCES
-        qmlSources/SystemInternals.hpp qmlSources/SystemInternals.cpp qmlSources/SystemIconProvider.hpp
-)
+add_subdirectory(src)
 
 qt_add_resources(hyprsysteminfo "resource"
     PREFIX "/"
     FILES
         resource/hyprlandlogo.svg
-        resource/hyprlandlogo.png
-)
-
-target_link_libraries(hyprsysteminfo
-    PRIVATE Qt6::Widgets Qt6::Quick Qt6::Gui Qt6::QuickControls2 PkgConfig::deps
 )
 
 include(GNUInstallDirs)

flake.nix

@@ -4,12 +4,6 @@
   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 = {

nix/default.nix

@@ -2,8 +2,6 @@
   lib,
   stdenv,
   cmake,
-  pkg-config,
-  hyprutils,
   kdePackages,
   pciutils,
   qt6,
@@ -26,12 +24,10 @@ in
 
     nativeBuildInputs = [
       cmake
-      pkg-config
       qt6.wrapQtAppsHook
     ];
 
     buildInputs = [
-      hyprutils
       kdePackages.kirigami-addons
       qt6.qtbase
       qt6.qtsvg

nix/overlays.nix

@@ -14,7 +14,6 @@ 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"}";

src/CMakeLists.txt

@@ -0,0 +1,14 @@
+qt_add_executable(hyprsysteminfo
+    main.cpp
+    util/Utils.cpp
+    SystemInfo.cpp
+    SystemIconProvider.cpp
+)
+
+qt_add_qml_module(hyprsysteminfo
+    URI org.hyprland.systeminfo
+    VERSION 1.0
+    QML_FILES main.qml
+)
+
+target_link_libraries(hyprsysteminfo PRIVATE Qt6::Widgets Qt6::QuickControls2)

src/SystemIconProvider.cpp

@@ -0,0 +1,25 @@
+#include "SystemIconProvider.hpp"
+#include <qicon.h>
+#include <qlogging.h>
+#include <qpixmap.h>
+
+QPixmap CSystemIconProvider::requestPixmap(const QString& id, QSize* size, const QSize& requestedSize) {
+    auto icon = QIcon::fromTheme(id);
+
+    if (!requestedSize.isValid()) {
+        qCritical() << "Icon requests without an explicit size are not allowed.";
+        return QPixmap();
+    }
+
+    auto pixmap = icon.pixmap(requestedSize.width(), requestedSize.height());
+
+    if (pixmap.isNull()) {
+        qWarning() << "Could not load icon" << id;
+        return QPixmap();
+    }
+
+    if (size != nullptr)
+        *size = pixmap.size();
+
+    return pixmap;
+}

qmlSources/SystemIconProvider.hpp → src/SystemIconProvider.hpp

@@ -1,20 +1,14 @@
-#ifndef SYSTEMICONPROVIDER_H
-#define SYSTEMICONPROVIDER_H
+#pragma once
 
 #include <QIcon>
 #include <QObject>
 #include <QPixmap>
 #include <QQmlApplicationEngine>
 #include <QQuickImageProvider>
-#include <iostream>
 
 class CSystemIconProvider : public QQuickImageProvider {
   public:
     CSystemIconProvider() : QQuickImageProvider(QQuickImageProvider::Pixmap) {}
 
-    QPixmap requestPixmap(const QString& id, QSize* size, const QSize& requestedSize) override {
-        return QIcon::fromTheme(id).pixmap({512, 512});
-    }
+    QPixmap requestPixmap(const QString& id, QSize* size, const QSize& requestedSize) override;
 };
-
-#endif // SYSTEMICONPROVIDER_H