config: fix overwrite on startup

9 files changed, 16 insertions, 19 deletions

diff --git a/config/BorderConfig.qml b/config/BorderConfig.qml
index 7e95054..b15811f 100644
--- a/config/BorderConfig.qml
+++ b/config/BorderConfig.qml
@@ -1,9 +1,6 @@
-import "root:/services"
 import Quickshell.Io
-import QtQuick
 
 JsonObject {
-    property color colour: Colours.palette.m3surface
     property int thickness: Appearance.padding.normal
     property int rounding: Appearance.rounding.large
 }
diff --git a/modules/bar/popouts/Background.qml b/modules/bar/popouts/Background.qml
index d626ec1..6aeb205 100644
--- a/modules/bar/popouts/Background.qml
+++ b/modules/bar/popouts/Background.qml
@@ -16,7 +16,7 @@ ShapePath {
     property real sideRounding: startX > 0 ? -1 : 1
 
     strokeWidth: -1
-    fillColor: Config.border.colour
+    fillColor: Colours.palette.m3surface
 
     PathArc {
         relativeX: root.roundingX
diff --git a/modules/dashboard/Background.qml b/modules/dashboard/Background.qml
index 876311e..41aaddd 100644
--- a/modules/dashboard/Background.qml
+++ b/modules/dashboard/Background.qml
@@ -1,7 +1,7 @@
+import "root:/services"
+import "root:/config"
 import QtQuick
 import QtQuick.Shapes
-import "root:/config"
-import "root:/services"
 
 ShapePath {
     id: root
@@ -12,7 +12,7 @@ ShapePath {
     readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
 
     strokeWidth: -1
-    fillColor: Config.border.colour
+    fillColor: Colours.palette.m3surface
 
     PathArc {
         relativeX: root.rounding
diff --git a/modules/drawers/Border.qml b/modules/drawers/Border.qml
index 62dc277..3dada1f 100644
--- a/modules/drawers/Border.qml
+++ b/modules/drawers/Border.qml
@@ -16,7 +16,7 @@ Item {
         id: rect
 
         anchors.fill: parent
-        color: Colours.alpha(Config.border.colour, false)
+        color: Colours.alpha(Colours.palette.m3surface, false)
         visible: false
     }
 
diff --git a/modules/launcher/Background.qml b/modules/launcher/Background.qml
index 82c5f4a..56733f7 100644
--- a/modules/launcher/Background.qml
+++ b/modules/launcher/Background.qml
@@ -12,7 +12,7 @@ ShapePath {
     readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
 
     strokeWidth: -1
-    fillColor: Config.border.colour
+    fillColor: Colours.palette.m3surface
 
     PathArc {
         relativeX: root.rounding
diff --git a/modules/lock/Backgrounds.qml b/modules/lock/Backgrounds.qml
index 45d15d0..c8c5db0 100644
--- a/modules/lock/Backgrounds.qml
+++ b/modules/lock/Backgrounds.qml
@@ -35,7 +35,7 @@ Item {
         id: base
 
         anchors.fill: parent
-        color: Colours.alpha(Config.border.colour, false)
+        color: Colours.alpha(Colours.palette.m3surface, false)
         visible: false
     }
 
@@ -86,7 +86,7 @@ Item {
             readonly property real roundingY: flatten ? height / 2 : rounding
 
             strokeWidth: -1
-            fillColor: Config.border.colour
+            fillColor: Colours.palette.m3surface
 
             startX: (innerMask.width - width) / 2 - rounding
 
@@ -153,7 +153,7 @@ Item {
             readonly property real roundingY: flatten ? height / 2 : rounding
 
             strokeWidth: -1
-            fillColor: Config.border.colour
+            fillColor: Colours.palette.m3surface
 
             startX: (innerMask.width - width) / 2 - rounding
             startY: Math.ceil(innerMask.height)
@@ -221,7 +221,7 @@ Item {
             readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding
 
             strokeWidth: -1
-            fillColor: Config.border.colour
+            fillColor: Colours.palette.m3surface
 
             startY: Math.ceil(innerMask.height) - height - roundingY
 
@@ -286,7 +286,7 @@ Item {
             readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding
 
             strokeWidth: -1
-            fillColor: root.isNormal ? Config.border.colour : "transparent"
+            fillColor: root.isNormal ? Colours.palette.m3surface : "transparent"
 
             startX: root.isLarge ? 0 : Math.ceil(innerMask.width)
             startY: root.isLarge ? height + roundingY : Math.ceil(innerMask.height) - height - roundingY
@@ -351,7 +351,7 @@ Item {
             readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding
 
             strokeWidth: -1
-            fillColor: root.isLarge ? Config.border.colour : "transparent"
+            fillColor: root.isLarge ? Colours.palette.m3surface : "transparent"
 
             startX: Math.ceil(innerMask.width)
             startY: Math.ceil(innerMask.height) - height - rounding
@@ -416,7 +416,7 @@ Item {
             readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding
 
             strokeWidth: -1
-            fillColor: root.isLarge ? Config.border.colour : "transparent"
+            fillColor: root.isLarge ? Colours.palette.m3surface : "transparent"
 
             startX: Math.ceil(innerMask.width)
             startY: height + rounding
diff --git a/modules/notifications/Background.qml b/modules/notifications/Background.qml
index 4a38510..8795b14 100644
--- a/modules/notifications/Background.qml
+++ b/modules/notifications/Background.qml
@@ -14,7 +14,7 @@ ShapePath {
     property real fullHeightRounding: wrapper.height >= QsWindow.window?.height - Config.border.thickness * 2 ? -rounding : rounding
 
     strokeWidth: -1
-    fillColor: Config.border.colour
+    fillColor: Colours.palette.m3surface
 
     PathLine {
         relativeX: -(root.wrapper.width + root.rounding)
diff --git a/modules/osd/Background.qml b/modules/osd/Background.qml
index 12cce6a..0a5f928 100644
--- a/modules/osd/Background.qml
+++ b/modules/osd/Background.qml
@@ -12,7 +12,7 @@ ShapePath {
     readonly property real roundingX: flatten ? wrapper.width / 2 : rounding
 
     strokeWidth: -1
-    fillColor: Config.border.colour
+    fillColor: Colours.palette.m3surface
 
     PathArc {
         relativeX: -root.roundingX
diff --git a/modules/session/Background.qml b/modules/session/Background.qml
index 12cce6a..0a5f928 100644
--- a/modules/session/Background.qml
+++ b/modules/session/Background.qml
@@ -12,7 +12,7 @@ ShapePath {
     readonly property real roundingX: flatten ? wrapper.width / 2 : rounding
 
     strokeWidth: -1
-    fillColor: Config.border.colour
+    fillColor: Colours.palette.m3surface
 
     PathArc {
         relativeX: -root.roundingX