change things

5 files changed, 33 insertions, 114 deletions

diff --git a/config/BarConfig.qml b/config/BarConfig.qml
index 34d8436..6548e98 100644
--- a/config/BarConfig.qml
+++ b/config/BarConfig.qml
@@ -47,10 +47,6 @@ JsonObject {
             id: "statusIcons",
             enabled: true
         },
-        {
-            id: "power",
-            enabled: true
-        }
     ]
 
     component ScrollActions: JsonObject {
diff --git a/config/Config.qml b/config/Config.qml
index bf8f6f2..e5029b2 100644
--- a/config/Config.qml
+++ b/config/Config.qml
@@ -20,10 +20,9 @@ Singleton {
     property alias notifs: adapter.notifs
     property alias osd: adapter.osd
     property alias session: adapter.session
-    property alias winfo: adapter.winfo
-    property alias utilities: adapter.utilities
     property alias sidebar: adapter.sidebar
     property alias services: adapter.services
+    property alias toasts: adapter.toasts
     property alias paths: adapter.paths
 
     // Helper function to serialize the config object
@@ -40,11 +39,10 @@ Singleton {
             notifs: serializeNotifs(),
             osd: serializeOsd(),
             session: serializeSession(),
-            winfo: serializeWinfo(),
-            utilities: serializeUtilities(),
             sidebar: serializeSidebar(),
             services: serializeServices(),
-            paths: serializePaths()
+            toasts: serializeToasts(),
+            paths: serializePaths(),
         };
     }
 
@@ -259,34 +257,6 @@ Singleton {
         };
     }
 
-    function serializeWinfo(): var {
-        return {};
-    }
-
-    function serializeUtilities(): var {
-        return {
-            enabled: utilities.enabled,
-            maxToasts: utilities.maxToasts,
-            toasts: {
-                configLoaded: utilities.toasts.configLoaded,
-                chargingChanged: utilities.toasts.chargingChanged,
-                dndChanged: utilities.toasts.dndChanged,
-                audioOutputChanged: utilities.toasts.audioOutputChanged,
-                audioInputChanged: utilities.toasts.audioInputChanged,
-                capsLockChanged: utilities.toasts.capsLockChanged,
-                numLockChanged: utilities.toasts.numLockChanged,
-                kbLayoutChanged: utilities.toasts.kbLayoutChanged,
-                vpnChanged: utilities.toasts.vpnChanged,
-                nowPlaying: utilities.toasts.nowPlaying
-            },
-            vpn: {
-                enabled: utilities.vpn.enabled,
-                provider: utilities.vpn.provider
-            },
-            quickToggles: utilities.quickToggles
-        };
-    }
-
     function serializeSidebar(): var {
         return {
             enabled: sidebar.enabled,
@@ -310,6 +280,21 @@ Singleton {
         };
     }
 
+    function serializeToasts(): var {
+        return {
+            configLoaded: toats.configLoaded,
+            chargingChanged: toats.chargingChanged,
+            dndChanged: toats.dndChanged,
+            audioOutputChanged: toats.audioOutputChanged,
+            audioInputChanged: toats.audioInputChanged,
+            capsLockChanged: toats.capsLockChanged,
+            numLockChanged: toats.numLockChanged,
+            kbLayoutChanged: toats.kbLayoutChanged,
+            kbLimit: toats.kbLimit,
+            nowPlaying: toats.nowPlaying,
+        };
+    }
+
     function serializePaths(): var {
         return {
             wallpaper: paths.wallpaper,
@@ -352,10 +337,9 @@ Singleton {
             property NotifsConfig notifs: NotifsConfig {}
             property OsdConfig osd: OsdConfig {}
             property SessionConfig session: SessionConfig {}
-            property WInfoConfig winfo: WInfoConfig {}
-            property UtilitiesConfig utilities: UtilitiesConfig {}
             property SidebarConfig sidebar: SidebarConfig {}
             property ServiceConfig services: ServiceConfig {}
+            property ToastsConfig toasts: ToastsConfig {}
             property UserPaths paths: UserPaths {}
         }
     }
diff --git a/config/ToastsConfig.qml b/config/ToastsConfig.qml
new file mode 100644
index 0000000..5fed72f
--- /dev/null
+++ b/config/ToastsConfig.qml
@@ -0,0 +1,14 @@
+import Quickshell.Io
+
+JsonObject {
+    property bool configLoaded: true
+    property bool chargingChanged: true
+    property bool dndChanged: true
+    property bool audioOutputChanged: true
+    property bool audioInputChanged: true
+    property bool capsLockChanged: true
+    property bool numLockChanged: true
+    property bool kbLayoutChanged: true
+    property bool kbLimit: true
+    property bool nowPlaying: false
+}
diff --git a/config/UtilitiesConfig.qml b/config/UtilitiesConfig.qml
deleted file mode 100644
index e102526..0000000
--- a/config/UtilitiesConfig.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-import Quickshell.Io
-
-JsonObject {
-    property bool enabled: true
-    property int maxToasts: 4
-
-    property Sizes sizes: Sizes {}
-    property Toasts toasts: Toasts {}
-    property Vpn vpn: Vpn {}
-
-    component Sizes: JsonObject {
-        property int width: 430
-        property int toastWidth: 430
-    }
-
-    component Toasts: JsonObject {
-        property bool configLoaded: true
-        property bool chargingChanged: true
-        property bool dndChanged: true
-        property bool audioOutputChanged: true
-        property bool audioInputChanged: true
-        property bool capsLockChanged: true
-        property bool numLockChanged: true
-        property bool kbLayoutChanged: true
-        property bool kbLimit: true
-        property bool vpnChanged: true
-        property bool nowPlaying: false
-    }
-
-    component Vpn: JsonObject {
-        property bool enabled: false
-        property list<var> provider: ["netbird"]
-    }
-
-    property list<var> quickToggles: [
-        {
-            id: "wifi",
-            enabled: true
-        },
-        {
-            id: "bluetooth",
-            enabled: true
-        },
-        {
-            id: "mic",
-            enabled: true
-        },
-        {
-            id: "settings",
-            enabled: true
-        },
-        {
-            id: "gameMode",
-            enabled: true
-        },
-        {
-            id: "dnd",
-            enabled: true
-        },
-        {
-            id: "vpn",
-            enabled: false
-        }
-    ]
-}
diff --git a/config/WInfoConfig.qml b/config/WInfoConfig.qml
deleted file mode 100644
index 5025780..0000000
--- a/config/WInfoConfig.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Quickshell.Io
-
-JsonObject {
-    property Sizes sizes: Sizes {}
-
-    component Sizes: JsonObject {
-        property real heightMult: 0.7
-        property real detailsWidth: 500
-    }
-}