Merge branch 'main' into feat/llm-chat-tab

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/CMakeLists.txt

@@ -1,6 +1,5 @@
 qml_module(ZShell
 	URI ZShell
-	INCLUDE_PREFIX core
 	SOURCES
 		writefile.hpp writefile.cpp
 		appdb.hpp appdb.cpp

Plugins/ZShell/Components/CMakeLists.txt

@@ -6,7 +6,6 @@ qml_module(ZShell-components
 		wavyline.hpp wavyline.cpp
 		buttonrow.hpp buttonrow.cpp
 		carouselview.hpp carouselview.cpp
-		wheelinverter.hpp
 		sparklinecontent.hpp sparklinecontent.cpp
 		sparklineitem.hpp sparklineitem.cpp
 		sparklinesceneitem.hpp sparklinesceneitem.cpp

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
@@ -32,6 +28,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
 )