Merge branch 'main' into feat/reposition-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
@@ -74,15 +74,15 @@ GridLayout {
 		return ch?.entryId ?? "";
 	}
 
-	columnSpacing: Appearance.spacing.small
+	columnSpacing: Tokens.spacing.small
 	columns: horizontal ? -1 : 1
-	rowSpacing: Appearance.spacing.small
+	rowSpacing: 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 {
@@ -235,9 +235,9 @@ GridLayout {
 
 		Layout.alignment: root.horizontal ? Qt.AlignVCenter : Qt.AlignHCenter
 		Layout.bottomMargin: !root.horizontal && index === repeater.count - 1 ? root.vPadding : 0
-		Layout.leftMargin: root.horizontal && index === 0 ? root.vPadding : (entryId === "statusIcons" && root.horizontal) ? -root.rowSpacing + Appearance.spacing.extraSmall : 0
+		Layout.leftMargin: root.horizontal && index === 0 ? root.vPadding : (entryId === "statusIcons" && root.horizontal) ? -root.rowSpacing + Tokens.spacing.extraSmall : 0
 		Layout.rightMargin: root.horizontal && index === repeater.count - 1 ? root.vPadding : 0
-		Layout.topMargin: !root.horizontal && index === 0 ? root.vPadding : (entryId === "statusIcons" && !root.horizontal) ? -root.columnSpacing + Appearance.spacing.extraSmall : 0
+		Layout.topMargin: !root.horizontal && index === 0 ? root.vPadding : (entryId === "statusIcons" && !root.horizontal) ? -root.columnSpacing + Tokens.spacing.extraSmall : 0
 		children: item
 		implicitHeight: item?.implicitHeight ?? 0
 		implicitWidth: item?.implicitWidth ?? 0

Modules/Bar/BarLoader.qml

@@ -2,9 +2,13 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import QtQuick
+import ZShell.Config
 import qs.Components
 import qs.Modules
-import qs.Config
+import qs.Helpers
+import qs.Modules.SysTray
+import qs.Modules.SysTray.Widgets
+import qs.Modules.Network
 
 Item {
 	id: root
@@ -16,7 +20,7 @@ Item {
 	required property bool fullscreen
 	readonly property bool horizontal: position !== "left"
 	property bool isHovered
-	readonly property int padding: Appearance.padding.smaller
+	readonly property int padding: Math.max(Tokens.padding.smaller, Config.bar.border)
 	required property Wrapper popouts
 	required property ClipWrapper popoutsWrapper
 	required property string position
@@ -51,8 +55,6 @@ Item {
 			to: "visible"
 
 			Anim {
-				duration: MaterialEasing.expressiveEffectsTime
-				easing.bezierCurve: MaterialEasing.expressiveEffects
 				property: "extent"
 				target: root
 			}
@@ -62,8 +64,6 @@ Item {
 			to: ""
 
 			Anim {
-				duration: MaterialEasing.expressiveEffectsTime
-				easing.bezierCurve: MaterialEasing.expressiveEffects
 				property: "extent"
 				target: root
 			}

Modules/Bar/Border.qml

@@ -3,8 +3,9 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import QtQuick
 import QtQuick.Effects
-import qs.Config
+import ZShell.Config
 import qs.Components
+import qs.Services
 
 Item {
 	id: root
@@ -17,7 +18,7 @@ Item {
 	CustomRect {
 		anchors.fill: parent
 		anchors.margins: -1
-		color: DynamicColors.palette.m3surface
+		color: Colors.palette.m3surface
 		layer.enabled: true
 
 		layer.effect: MultiEffect {