From 8bf5eccee049a263fa08e212ca2f3cdebe07b86c Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 5 Mar 2024 16:03:28 -0500
Subject: [PATCH] refactor(ags): move to App.config

---
 modules/ags/config/binto.ts |  9 +++++----
 modules/ags/config/wim.ts   | 13 ++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/ags/config/binto.ts b/modules/ags/config/binto.ts
index 50d2a42e..e56af1bf 100644
--- a/modules/ags/config/binto.ts
+++ b/modules/ags/config/binto.ts
@@ -5,15 +5,16 @@ import Bar from './ts/bar/binto.ts';
 import { NotifPopups, NotifCenter } from './ts/notifications/binto.ts';
 import Powermenu from './ts/powermenu.ts';
 
-App.addIcons(`${App.configDir}/icons`);
 
 // TODO: add OSD, workspace indicator and current window indicator
-export default {
+App.config({
+    icons: './icons',
+
     onConfigParsed: () => {
         globalThis.Pointers = Pointers;
     },
 
-    windows: [
+    windows: () => [
         AppLauncher(),
         NotifCenter(),
         Powermenu(),
@@ -21,4 +22,4 @@ export default {
         Bar(),
         NotifPopups(),
     ],
-};
+});
diff --git a/modules/ags/config/wim.ts b/modules/ags/config/wim.ts
index 296a209f..aafdd1b0 100644
--- a/modules/ags/config/wim.ts
+++ b/modules/ags/config/wim.ts
@@ -10,12 +10,15 @@ import OSK from './ts/on-screen-keyboard/main.ts';
 import Powermenu from './ts/powermenu.ts';
 import QSettings from './ts/quick-settings/main.ts';
 
-App.addIcons(`${App.configDir}/icons`);
-Setup();
 
+App.config({
+    icons: './icons',
 
-export default {
-    windows: [
+    onConfigParsed: () => {
+        Setup();
+    },
+
+    windows: () => [
         ...Corners(),
 
         AppLauncher(),
@@ -30,4 +33,4 @@ export default {
         BgFade(),
         NotifPopups(),
     ],
-};
+});