Merge branch 'main' into feat/task-runner-ci

.gitea/workflows/cpp.yml

@@ -40,7 +40,5 @@ jobs:
               run: |
                   sed -i 's/-mno-direct-extern-access //g' build/compile_commands.json
                   set -o pipefail
-                  run-clang-tidy -p build -j "$(nproc)" \
-                      -source-filter="^$(pwd)/Plugins/" \
-                      -header-filter=".*Plugins/.*" \
-                      -removed-arg=-mno-direct-extern-access
+                  run-clang-tidy -p build -j $(nproc) -header-filter="Plugins/.*" 2>&1 | \
+                    grep -v 'Suppressed\|non-user\|non-system\|unknown argument.*mno-direct\|Found compiler error\|warnings generated\.\|^Use -header-filter'

.gitignore

@@ -1,35 +1,23 @@
+**/__pycache__/
 ./result/
 .pyre/
+.cache/
+.venv/
+.qmlls.ini
+build/
+compile_commands.json
+testpython
 pkg/
 *.tar.*
+uv.lock
+.qtcreator/
 dist/
 **/target/
 **/test-plugins/
 **/Charts/
 network-dev/
-**/zshell.dist/
-
-# Qml
-.qtcreator/
-.qmlls.ini
-
-# CMake compile artifacts
-.cache/
-compile_commands.json
-build/
-
-# Python
-uv.lock
-testpython
-.venv/
-**/__pycache__/
-
-# Nuitka compile
-**/zshell.pyi
-**/zshell.cpython-*
 **/zshell.build/
-
-# Agents stuff
+**/zshell.dist/
 .opencode/
 run-agent.sh
 AGENTS.md

CMakeLists.txt

@@ -50,7 +50,6 @@ 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(QT_NO_PRIVATE_MODULE_WARNING ON)
 set(ENABLE_MODULES "plugin;shell;cli;m3shapes" CACHE STRING "Modules to build/install")
 
 set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/ZShell" CACHE STRING "Library install dir")

Drawers/Exclusions.qml

@@ -43,6 +43,13 @@ Scope {
 		hasBar: root.geometry.barOnBottom
 	}
 
+	Timer {
+		interval: 5000
+		running: true
+
+		onTriggered: console.log("top height:", top.exclusiveZone, "left width:", left.exclusiveZone, "right width:", right.exclusiveZone, "bottom height:", bottom.exclusiveZone)
+	}
+
 	component ExclusionZone: CustomWindow {
 		property bool hasBar
 

Modules/Bar/Components/Tray/TrayItem.qml

@@ -79,7 +79,6 @@ Item {
 
 		anchors.centerIn: parent
 		antialiasing: true
-		backer.retainWhileLoading: true
 		color: root.current && !Config.bar.tray.showOnHover ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 		implicitSize: Config.bar.tray.trayIconSize * root.dpr
 		layer.enabled: Config.bar.tray.recolorIcons

Modules/Notifications/Content.qml

@@ -28,10 +28,7 @@ Item {
 		for (let i = 0; i < count; i++)
 			height += (list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0;
 
-		if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x)
-			return 0;
-
-		if (screenState.dashboard && (panels.dashboard.x + panels.dashboard.width >= panels.notifications.x))
+		if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x || screenState.dashboard)
 			return 0;
 
 		if (screenState.osd) {

Modules/Settings/Pages.qml

@@ -38,6 +38,7 @@ Item {
 		id: container
 
 		anchors.fill: parent
+		layer.enabled: opacity < 1
 		objectName: "PageContainer"
 
 		Component.onCompleted: root.loadPage(root.sState.currentPageIdx)

ci/Dockerfile

@@ -3,9 +3,9 @@ FROM archlinux:latest
 RUN pacman -Syu --noconfirm \
  && pacman -S --needed --noconfirm \
       base-devel cmake ninja clang lld nodejs tree-sitter \
-      jkqtplotter cmark-gfm git wayland-protocols ffmpeg mpv \
+      jkqtplotter cmark-gfm git wayland-protocols \
       qt6-base qt6-declarative qt6-shadertools qt6-5compat \
-      qt6-canvaspainter qt6-wayland qt5-wayland \
+      qt6-canvaspainter qt6-wayland qt5-wayland\
       libqalculate pipewire aubio cava lm_sensors glib2 \
  && pacman -Scc --noconfirm
 

cli/src/zshell/subcommands/shell.py

@@ -1,4 +1,3 @@
-import os
 import subprocess
 import sys
 import time
@@ -9,15 +8,6 @@ args = ["qs", "-c", "zshell"]
 
 app = typer.Typer()
 
-qt_logging_rules = (
-	"qt.qml.warning=false;"
-	"qt.qpa.wayland.*=false;"
-	"scene=false;"
-	"quickshell.service.sni.watcher=false;"
-	"default.warning=false;"
-	"default.info=false"
-)
-
 
 @app.command()
 def kill():
@@ -29,13 +19,8 @@ def kill():
 
 
 def start_instance(no_daemon: bool = False) -> None:
-	env = os.environ.copy()
-	env["QT_LOGGING_RULES"] = qt_logging_rules
-
 	result = subprocess.run(
-		args + ["-n"] + ([] if no_daemon else ["-d"]),
-		capture_output=True,
-		env=env,
+		args + ["-n"] + ([] if no_daemon else ["-d"]), capture_output=True
 	)
 	stdout = result.stdout.decode().strip()
 	if stdout and "already running" in stdout.lower():

makefile

@@ -1,11 +1,9 @@
 BUILD		?=		cmake -B build -G Ninja
-NONUITKA ?=	cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_MODULES="plugin;shell;m3shapes"
 NINJA		?=		ninja -C build
 COMPILE		?=		$(BUILD) && $(NINJA)
 INSTALL		?=		$(BUILD) && $(NINJA) && sudo ninja -C build install
 
 CPPFMT ?=		find . \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) -not -path './build/*' -exec clang-format -i --style=file {} +
-CPPLINT ?=		run-clang-tidy -p build -j "$$(nproc)" -source-filter="^$$(pwd)/Plugins/" -header-filter=".*Plugins/.*" -removed-arg=-mno-direct-extern-access
 
 NUITKA ?=		nuitka --module --include-package=zshell cli/src/zshell/ --output-dir=cli/
 
@@ -18,7 +16,7 @@ help:
 	@echo "compile			cmake builds and compiles C++ code"
 	@echo "cpp-fmt			format C++ code with clang-format"
 	@echo "cpp-lint		lint check C++ code with clang-tidy"
-	@echo "cpp-compile		similar to make compile, but excludes Nuitka from compiling python"
+	@echo "cpp-compile		alias to make compile"
 	@echo "py-fmt			format Python code with ruff"
 	@echo "py-lint			lint check Python code with ruff"
 	@echo "py-check		lsp and typecheck all Python code using Basedpyright"
@@ -42,15 +40,16 @@ install:
 compile:
 	$(COMPILE)
 
+# TODO: Anything below is not ready
+
 # C++
 cpp-fmt:
 	$(CPPFMT)
 
-cpp-lint:
-	$(CPPLINT)
+# cpp-lint needs adjustments in ci and here
 
 cpp-compile:
-	$(NONUITKA)
+	$(COMPILE)
 
 # Python
 py-fmt: