fix: re-add lost changes

CMakeLists.txt

@@ -26,22 +26,36 @@ if(NOT DEFINED VERSION)
 	endif()
 endif()
 
+if(NOT DEFINED GIT_REVISION)
+	execute_process(COMMAND git rev-parse HEAD
+								WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+								OUTPUT_VARIABLE GIT_REVISION
+								OUTPUT_STRIP_TRAILING_WHITESPACE
+				)
+
+	if("${GIT_REVISION}" STREQUAL "")
+		message(FATAL_ERROR "GIT_REVISION is not set and failed to get from git")
+	endif()
+endif()
+
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 project(ZShell VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 message(STATUS "ZShell version: ${VERSION}")
 
+include(GNUInstallDirs)
+
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(ENABLE_MODULES "plugin;shell;m3shapes" CACHE STRING "Modules to build/install")
+set(ENABLE_MODULES "plugin;shell;cli;m3shapes" CACHE STRING "Modules to build/install")
 
-set(INSTALL_LIBDIR "usr/lib/ZShell" CACHE STRING "Library install dir")
+set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/ZShell" CACHE STRING "Library install dir")
-set(INSTALL_QMLDIR "usr/lib/qt6/qml" CACHE STRING "QML install dir")
+set(INSTALL_QMLDIR "${CMAKE_INSTALL_LIBDIR}/qt6/qml" CACHE STRING "QML install dir")
-set(INSTALL_QSCONFDIR "etc/xdg/quickshell/zshell" CACHE STRING "Quickshell config install dir")
+set(INSTALL_QSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/xdg/quickshell/zshell" CACHE STRING "Quickshell config install dir")
-set(INSTALL_GREETERCONFDIR "etc/xdg/quickshell/zshell-greeter" CACHE STRING "Quickshell greeter install dir")
+set(INSTALL_GREETERCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/xdg/quickshell/zshell-greeter" CACHE STRING "Quickshell greeter install dir")
 
 set(CMAKE_INSTALL_MESSAGE NEVER)
 
@@ -54,21 +68,7 @@ add_compile_options(
 )
 
 
-if("shell" IN_LIST ENABLE_MODULES)
+if("cli" IN_LIST ENABLE_MODULES)
-	# Build settings index
-	find_package(Python3 COMPONENTS Interpreter REQUIRED)
-	set(SETTINGS_INDEX_JSON "${CMAKE_BINARY_DIR}/settings-index.json")
-	execute_process(
-		COMMAND ${Python3_EXECUTABLE}
-			"${CMAKE_SOURCE_DIR}/scripts/build-settings-index.py"
-			"${CMAKE_SOURCE_DIR}/Modules/Settings"
-			"${SETTINGS_INDEX_JSON}"
-		RESULT_VARIABLE SETTINGS_INDEX_RESULT
-	)
-	if(NOT SETTINGS_INDEX_RESULT EQUAL 0)
-		message(FATAL_ERROR "Failed to build settings search index")
-	endif()
-
 	# Nuitka compilation
 	set(ZSHELL_CLI_BUILD_DIR "${CMAKE_BINARY_DIR}/zshell-cli")
 	set(ZSHELL_CLI_DIST "${ZSHELL_CLI_BUILD_DIR}/zshell.dist")

Plugins/CMakeLists.txt

@@ -1 +1,24 @@
+find_package(Qt6 REQUIRED COMPONENTS ShaderTools Core Qml Gui Quick QuickPrivate Concurrent Sql Network DBus CanvasPainter)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(Qalculate IMPORTED_TARGET libqalculate REQUIRED)
+pkg_check_modules(Pipewire IMPORTED_TARGET libpipewire-0.3 REQUIRED)
+pkg_check_modules(Aubio IMPORTED_TARGET aubio REQUIRED)
+pkg_check_modules(Cava IMPORTED_TARGET libcava QUIET)
+pkg_check_modules(GLIB REQUIRED glib-2.0 gobject-2.0 gio-2.0)
+
+if(NOT Cava_FOUND)
+	pkg_check_modules(Cava IMPORTED_TARGET cava REQUIRED)
+endif()
+
+include(cmake/sensorslib.cmake)
+
+set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml")
+qt_standard_project_setup(REQUIRES 6.9)
+
+include(cmake/pch.cmake)
+include(cmake/qml-module.cmake)
+
+add_library(zshell-util INTERFACE)
+target_include_directories(zshell-util INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
+
 add_subdirectory(ZShell)

Plugins/ZShell/Blobs/CMakeLists.txt

@@ -1,20 +1,20 @@
 qml_module(ZShell-blobs
 	URI ZShell.Blobs
-    SOURCES
+	SOURCES
-        blobgroup.cpp
+		blobgroup.cpp
-        blobshape.cpp
+		blobshape.cpp
-        blobrect.cpp
+		blobrect.cpp
-        blobinvertedrect.cpp
+		blobinvertedrect.cpp
-        blobmaterial.cpp
+		blobmaterial.cpp
-    LIBRARIES
+	LIBRARIES
-        Qt::Quick
+		Qt::Quick
 )
 
 qt_add_shaders(ZShell-blobs "blob_shaders"
-    BATCHABLE OPTIMIZED NOHLSL NOMSL
+	BATCHABLE OPTIMIZED NOHLSL NOMSL
 	GLSL "300es,330"
-    PREFIX "/"
+	PREFIX "/"
-    FILES
+	FILES
-        shaders/blob.frag
+		shaders/blob.frag
-        shaders/blob.vert
+		shaders/blob.vert
 )

Plugins/ZShell/Config/CMakeLists.txt

@@ -1,13 +1,9 @@
 qml_module(ZShell-config
 	URI ZShell.Config
 	INCLUDE_PREFIX config
-	DEPENDENCIES
-		ZShell.Settings
 	SOURCES
-		confignode.hpp confignode.cpp
+		rootnodes.hpp rootnodes.cpp
-		configobject.hpp configobject.cpp
+		common.hpp common.cpp
-		configlist.hpp configlist.cpp
-		config.hpp config.cpp
 		migration.hpp migration.cpp
 		anim.hpp anim.cpp
 		fontbuilder.hpp fontbuilder.cpp
@@ -31,6 +27,8 @@ qml_module(ZShell-config
 		services.hpp
 		sidebar.hpp
 		utilities.hpp
+	DEPENDENCIES
+		ZShell.Settings
 )
 
 target_link_libraries(ZShell-config PUBLIC

Plugins/ZShell/Config/rootnodes.hpp

@@ -16,7 +16,6 @@
 #include "dock.hpp"
 #include "general.hpp"
 #include "launcher.hpp"
-#include "llm.hpp"
 #include "lock.hpp"
 #include "notifs.hpp"
 #include "osd.hpp"
@@ -43,7 +42,6 @@ class ConfigRoot : public settings::RootNode {
 	CONFIG_SUBOBJECT(Dock, dock)
 	CONFIG_SUBOBJECT(General, general)
 	CONFIG_SUBOBJECT(Launcher, launcher)
-	CONFIG_SUBOBJECT(Llm, llm)
 	CONFIG_SUBOBJECT(Lock, lock)
 	CONFIG_SUBOBJECT(Notifs, notifs)
 	CONFIG_SUBOBJECT(Osd, osd)

Plugins/ZShell/Models/CMakeLists.txt

@@ -1,8 +1,8 @@
 qml_module(ZShell-models
-    URI ZShell.Models
+	URI ZShell.Models
-    SOURCES
+	SOURCES
-        filesystemmodel.hpp filesystemmodel.cpp
+		filesystemmodel.hpp filesystemmodel.cpp
-    LIBRARIES
+	LIBRARIES
-        Qt::Gui
+		Qt::Gui
-        Qt::Concurrent
+		Qt::Concurrent
 )

Plugins/ZShell/zutils.cpp

@@ -5,13 +5,17 @@
 #include <QtQuick/qquickwindow.h>
 #include <qcontainerfwd.h>
 #include <qdir.h>
+#include <qdiriterator.h>
 #include <qfileinfo.h>
 #include <qfuturewatcher.h>
 #include <qjsprimitivevalue.h>
 #include <qloggingcategory.h>
+#include <qregularexpression.h>
 #include <qqmlengine.h>
 #include <qfile.h>
 
+#include "util/metaenum.hpp"
+
 Q_LOGGING_CATEGORY(lcZUtils, "ZShell.cutils", QtInfoMsg)
 
 namespace ZShell {
@@ -171,13 +175,112 @@ qreal ZUtils::clamp(qreal value, qreal min, qreal max) {
 	return qBound(min, value, max);
 }
 
-QString ZUtils::settingsIndex() {
+QString ZUtils::enumToString(
-	QFile file(QStringLiteral(":/qt/qml/ZShell/settings-index.json"));
+	QObject* target, const QString& property, const QVariant& value) {
-	if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+	if (!target) {
-		qCWarning(lcZUtils) << "Failed to open embedded settings index";
+		qCWarning(lcZUtils) << "enumToString: a target is required";
-		return QString();
+		return {};
 	}
-	return QString::fromUtf8(file.readAll());
+
+	const auto* meta = target->metaObject();
+	const auto index = meta->indexOfProperty(property.toUtf8().constData());
+	if (index < 0) {
+		qCWarning(lcZUtils)
+			<< "enumToString:" << target << "has no property" << property;
+		return {};
+	}
+
+	const auto prop = meta->property(index);
+	const auto metaEnum = prop.isEnumType()
+							  ? prop.enumerator()
+							  : util::metaEnumFor(prop.metaType());
+	if (!metaEnum.isValid() || metaEnum.is64Bit()) {
+		qCWarning(lcZUtils) << "enumToString: property" << property << "of"
+							<< target << "is not a supported enum";
+		return {};
+	}
+
+	const auto val = value.isValid() ? value : prop.read(target);
+	const auto* key = util::enumKeyFor(metaEnum, val);
+	if (!key) {
+		qCWarning(
+			lcZUtils,
+			"enumToString: no enumerator of %s::%s has the value %lld",
+			metaEnum.scope(),
+			metaEnum.name(),
+			val.toLongLong());
+		return {};
+	}
+
+	return QString::fromUtf8(key);
+}
+
+namespace {
+
+template <typename Predicate>
+QQuickItem* findChildDfs(QQuickItem* root, Predicate&& match) {
+	const auto children = root->childItems();
+	for (QQuickItem* const child : children) {
+		if (match(child)) {
+			return child;
+		}
+		if (QQuickItem* const found = findChildDfs(child, match)) {
+			return found;
+		}
+	}
+	return nullptr;
+}
+
+template <typename Predicate>
+void findChildrenDfs(
+	QQuickItem* root, Predicate&& match, QList<QQuickItem*>& out) {
+	const auto children = root->childItems();
+	for (QQuickItem* const child : children) {
+		if (match(child)) {
+			out.append(child);
+		}
+		findChildrenDfs(child, match, out);
+	}
+}
+
+} // namespace
+
+QQuickItem* ZUtils::findChild(QQuickItem* root, const QString& name) {
+	if (!root) {
+		return nullptr;
+	}
+
+	return findChildDfs(root, [&name](const QQuickItem* item) {
+		return item->objectName() == name;
+	});
+}
+
+QList<QQuickItem*> ZUtils::findChildren(QQuickItem* root, const QString& name) {
+	QList<QQuickItem*> children;
+	if (root) {
+		findChildrenDfs(
+			root,
+			[&name](const QQuickItem* item) {
+				return item->objectName() == name;
+			},
+			children);
+	}
+	return children;
+}
+
+QList<QQuickItem*> ZUtils::findChildrenMatching(
+	QQuickItem* root, const QString& pattern) {
+	QList<QQuickItem*> children;
+	if (root) {
+		const QRegularExpression re(pattern);
+		findChildrenDfs(
+			root,
+			[&re](const QQuickItem* item) {
+				return re.match(item->objectName()).hasMatch();
+			},
+			children);
+	}
+	return children;
 }
 
 #ifndef ZSHELL_VERSION
@@ -192,4 +295,46 @@ QString ZUtils::qtVersion() const {
 	return QStringLiteral(QT_VERSION_STR);
 }
 
+QString ZUtils::gitRevision() {
+#ifdef GIT_REVISION
+	return QStringLiteral(GIT_REVISION);
+#else
+	return QString();
+#endif
+}
+
+QString ZUtils::readTextFile(const QString& path) {
+	QFile file(path);
+	if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+		return QString();
+	}
+	return QString::fromUtf8(file.readAll());
+}
+
+bool ZUtils::writeTextFile(const QString& path, const QString& text) {
+	const QFileInfo info(path);
+	if (!QDir().mkpath(info.absolutePath())) {
+		qCWarning(lcZUtils) << "Failed to create directory for" << path;
+		return false;
+	}
+	QFile file(path);
+	if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+		qCWarning(lcZUtils) << "Failed to open" << path << "for writing";
+		return false;
+	}
+	return file.write(text.toUtf8()) >= 0;
+}
+
+QStringList ZUtils::listFiles(const QString& dir, const QString& suffix) {
+	QStringList out;
+	QDirIterator it(dir, QDirIterator::Subdirectories);
+	while (it.hasNext()) {
+		const QString path = it.next();
+		if (it.fileInfo().isFile() && path.endsWith(suffix)) {
+			out.append(path);
+		}
+	}
+	return out;
+}
+
 } // namespace ZShell

Plugins/ZShell/zutils.hpp

@@ -4,6 +4,8 @@
 #include <qcontainerfwd.h>
 #include <qobject.h>
 #include <qqmlintegration.h>
+#include <qtmetamacros.h>
+#include <qvariant.h>
 
 namespace ZShell {
 
@@ -32,7 +34,24 @@ class ZUtils : public QObject {
 
 	Q_INVOKABLE static qreal clamp(qreal value, qreal min, qreal max);
 
-	Q_INVOKABLE static QString settingsIndex();
+	Q_INVOKABLE static QString enumToString(
+		QObject* target,
+		const QString& property,
+		const QVariant& value = QVariant());
+
+	Q_INVOKABLE static QString gitRevision();
+	Q_INVOKABLE static QString readTextFile(const QString& path);
+	Q_INVOKABLE static bool writeTextFile(
+		const QString& path, const QString& text);
+	Q_INVOKABLE static QStringList listFiles(
+		const QString& dir, const QString& suffix);
+
+	Q_INVOKABLE static QQuickItem* findChild(
+		QQuickItem* root, const QString& name);
+	Q_INVOKABLE static QList<QQuickItem*> findChildren(
+		QQuickItem* root, const QString& name);
+	Q_INVOKABLE static QList<QQuickItem*> findChildrenMatching(
+		QQuickItem* root, const QString& pattern);
 
 	[[nodiscard]] QString version() const;
 	[[nodiscard]] QString qtVersion() const;

Plugins/cmake/pch.cmake

@@ -0,0 +1,14 @@
+add_library(zshell-pch INTERFACE)
+target_precompile_headers(zshell-pch INTERFACE
+				<qobject.h>
+				<qqmlintegration.h>
+				<qstring.h>
+				<qqmlengine.h>
+				<qloggingcategory.h>
+				<qvariant.h>
+				<qtimer.h>
+				<qdir.h>
+				<qlist.h>
+				<qstringlist.h>
+				<qpointer.h>
+)

Plugins/cmake/sensorslib.cmake

@@ -0,0 +1,10 @@
+find_library(SENSORS_LIBRARY NAMES sensors REQUIRED)
+find_path(SENSORS_INCLUDE_DIR NAMES sensors/sensors.h REQUIRED)
+if(NOT TARGET Sensors::Sensors)
+	add_library(Sensors::Sensors UNKNOWN IMPORTED)
+	set_target_properties(Sensors::Sensors PROPERTIES
+		IMPORTED_LOCATION "${SENSORS_LIBRARY}"
+		INTERFACE_INCLUDE_DIRECTORIES "${SENSORS_INCLUDE_DIR}"
+	)
+endif()
+

Plugins/include/util/metaenum.hpp

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <qmetaobject.h>
+#include <qmetatype.h>
+#include <qvariant.h>
+
+namespace util {
+
+inline QMetaEnum metaEnumFor(const QMetaType& type) {
+	const auto* meta = type.metaObject();
+	if (!meta) return {};
+
+	auto name = QByteArray(type.name());
+	if (const auto scope = name.lastIndexOf("::"); scope >= 0)
+		name = name.mid(scope + 2);
+
+	return meta->enumerator(meta->indexOfEnumerator(name.constData()));
+}
+
+inline bool isSupportedEnum(const QMetaType& type) {
+	if (!type.flags().testFlag(QMetaType::IsEnumeration)) return false;
+
+	const auto metaEnum = metaEnumFor(type);
+	return metaEnum.isValid() && !metaEnum.is64Bit();
+}
+
+inline const char* enumKeyFor(const QMetaEnum& metaEnum, const QVariant& value) {
+	return metaEnum.valueToKey(static_cast<quint64>(value.toLongLong()));
+}
+
+} // namespace util