Merge branch 'main' into feat/fullscreen-reveal-bar

Modules/Bar/Bar.qml

@@ -4,7 +4,7 @@ import Quickshell
 import QtQuick
 import QtQuick.Layouts
 import qs.Modules
-import qs.Config
+import ZShell.Config
 import qs.Modules.SysTray
 import qs.Modules.Network
 import qs.Modules.Updates
@@ -69,13 +69,13 @@ RowLayout {
 		}
 	}
 
-	spacing: Appearance.spacing.small
+	spacing: Tokens.spacing.small
 
 	Repeater {
 		id: repeater
 
 		model: ScriptModel {
-			values: Config.bar.entries.filter(e => e.enabled)
+			values: Config.bar.entries.values.filter(e => e.enabled)
 		}
 
 		DelegateChooser {
@@ -216,7 +216,7 @@ RowLayout {
 		required property var modelData
 
 		Layout.alignment: Qt.AlignVCenter
-		Layout.leftMargin: index === 0 ? root.vPadding : (entryId === "statusIcons") ? -root.spacing + Appearance.spacing.extraSmall : 0
+		Layout.leftMargin: index === 0 ? root.vPadding : (entryId === "statusIcons") ? -root.spacing + Tokens.spacing.extraSmall : 0
 		Layout.rightMargin: index === repeater.count - 1 ? root.vPadding : 0
 		children: item
 		implicitHeight: item?.implicitHeight ?? 0