Merge remote-tracking branch 'origin/master' into pr-4320

# Conflicts:
#	include/modules/hyprland/workspaces.hpp
#	man/waybar-hyprland-workspaces.5.scd
#	src/modules/hyprland/workspace.cpp
#	src/modules/hyprland/workspaces.cpp
This commit is contained in:
Alex
2026-07-04 00:51:21 +02:00
302 changed files with 14350 additions and 5052 deletions
+5
View File
@@ -0,0 +1,5 @@
{
"include": ["modules/*.jsonc"],
"position": "top",
"nullOption": null
}
+5
View File
@@ -0,0 +1,5 @@
{
"include": ["test/config/modules/*.jsonc"],
"position": "top",
"nullOption": null
}
+6
View File
@@ -0,0 +1,6 @@
{
"cpu": {
"interval": 2,
"format": "goo"
}
}
+6
View File
@@ -0,0 +1,6 @@
{
"memory": {
"interval": 2,
"format": "foo",
}
}