config: refactor

3 files changed, 215 insertions, 0 deletions

diff --git a/src/config/defaults.ts b/src/config/defaults.ts
new file mode 100644
index 0000000..d699a45
--- /dev/null
+++ b/src/config/defaults.ts
@@ -0,0 +1,146 @@
+import { Astal } from "astal/gtk3";
+
+export default {
+    style: {
+        transparency: "normal", // One of "off", "normal", "high"
+        vibrant: false, // Extra saturation
+    },
+    // Modules
+    bar: {
+        vertical: true,
+        modules: {
+            osIcon: {
+                enabled: true,
+            },
+            activeWindow: {
+                enabled: true,
+            },
+            mediaPlaying: {
+                enabled: true,
+            },
+            workspaces: {
+                enabled: true,
+                shown: 5,
+            },
+            tray: {
+                enabled: true,
+            },
+            statusIcons: {
+                enabled: true,
+            },
+            pkgUpdates: {
+                enabled: true,
+            },
+            notifCount: {
+                enabled: true,
+            },
+            battery: {
+                enabled: true,
+            },
+            dateTime: {
+                enabled: true,
+                format: "%d/%m/%y %R",
+                detailedFormat: "%c",
+            },
+            power: {
+                enabled: true,
+            },
+        },
+    },
+    launcher: {
+        actionPrefix: ">", // Prefix for launcher actions
+        apps: {
+            maxResults: 30, // Actual max results, -1 for infinite
+        },
+        files: {
+            maxResults: 40, // Actual max results, -1 for infinite
+            fdOpts: ["-a", "-t", "f"], // Options to pass to `fd`
+            shortenThreshold: 30, // Threshold to shorten paths in characters
+        },
+        math: {
+            maxResults: 40, // Actual max results, -1 for infinite
+        },
+        todo: {
+            notify: true,
+        },
+        wallpaper: {
+            style: "medium", // One of "compact", "medium", "large"
+        },
+        disabledActions: ["logout", "shutdown", "reboot", "hibernate"], // Actions to hide, see launcher/actions.tsx for available actions
+    },
+    notifpopups: {
+        maxPopups: -1,
+        expire: false,
+        agoTime: true, // Whether to show time in ago format, e.g. 10 mins ago, or raw time, e.g. 10:42
+    },
+    osds: {
+        volume: {
+            position: Astal.WindowAnchor.RIGHT, // Top = 2, Right = 4, Left = 8, Bottom = 16
+            margin: 20,
+            hideDelay: 1500,
+            showValue: true,
+        },
+        brightness: {
+            position: Astal.WindowAnchor.LEFT, // Top = 2, Right = 4, Left = 8, Bottom = 16
+            margin: 20,
+            hideDelay: 1500,
+            showValue: true,
+        },
+        lock: {
+            spacing: 5,
+            caps: {
+                hideDelay: 1000,
+            },
+            num: {
+                hideDelay: 1000,
+            },
+        },
+    },
+    sideleft: {
+        directories: {
+            left: {
+                top: "󰉍  Downloads",
+                middle: "󱧶  Documents",
+                bottom: "󱍙  Music",
+            },
+            right: {
+                top: "󰉏  Pictures",
+                middle: "󰉏  Videos",
+                bottom: "󱂵  Home",
+            },
+        },
+    },
+    // Services
+    math: {
+        maxHistory: 100,
+    },
+    updates: {
+        interval: 900000,
+    },
+    weather: {
+        interval: 600000,
+        key: "assets/weather-api-key.txt", // Path to file containing api key relative to the base directory. To get a key, visit https://weatherapi.com/
+        location: "", // Location as a string or empty to autodetect
+        imperial: false,
+    },
+    cpu: {
+        interval: 2000,
+    },
+    gpu: {
+        interval: 2000,
+    },
+    memory: {
+        interval: 5000,
+    },
+    storage: {
+        interval: 5000,
+    },
+    wallpapers: {
+        paths: [
+            {
+                recursive: true, // Whether to search recursively
+                path: "~/Pictures/Wallpapers", // Path to search
+            },
+        ],
+    },
+};
diff --git a/src/config/funcs.ts b/src/config/funcs.ts
new file mode 100644
index 0000000..bc0a7d1
--- /dev/null
+++ b/src/config/funcs.ts
@@ -0,0 +1,47 @@
+import { GLib, monitorFile, readFileAsync, Variable } from "astal";
+import config from ".";
+import { loadStyleAsync } from "../../app";
+import defaults from "./defaults";
+
+type Settings<T> = { [P in keyof T]: T[P] extends object & { length?: never } ? Settings<T[P]> : Variable<T[P]> };
+
+const CONFIG = `${GLib.get_user_config_dir()}/caelestia/shell.json`;
+
+const isObject = (o: any) => typeof o === "object" && o !== null && !Array.isArray(o);
+
+const deepMerge = <T extends object, U extends object>(a: T, b: U, path = ""): T & U => {
+    const merged: { [k: string]: any } = { ...b };
+    for (const [k, v] of Object.entries(a)) {
+        if (b.hasOwnProperty(k)) {
+            const bv = b[k as keyof U];
+            if (isObject(v) && isObject(bv)) merged[k] = deepMerge(v, bv as object, `${path}${k}.`);
+            else if (typeof v !== typeof bv) {
+                console.warn(`Invalid type for ${path}${k}: ${typeof v} != ${typeof bv}`);
+                merged[k] = v;
+            }
+        } else merged[k] = v;
+    }
+    return merged as any;
+};
+
+export const convertSettings = <T extends object>(obj: T): Settings<T> =>
+    Object.fromEntries(Object.entries(obj).map(([k, v]) => [k, isObject(v) ? convertSettings(v) : Variable(v)])) as any;
+
+const updateSection = (from: { [k: string]: any }, to: { [k: string]: any }, path = "") => {
+    for (const [k, v] of Object.entries(from)) {
+        if (to.hasOwnProperty(k)) {
+            if (isObject(v)) updateSection(v, to[k], `${path}${k}.`);
+            else to[k].set(v);
+        } else console.warn(`Unknown config key: ${path}${k}`);
+    }
+};
+
+export const updateConfig = async () => {
+    updateSection(deepMerge(defaults, JSON.parse(await readFileAsync(CONFIG))), config);
+    loadStyleAsync().catch(console.error);
+};
+
+export const initConfig = () => {
+    monitorFile(CONFIG, () => updateConfig().catch(e => console.warn(`Invalid config: ${e}`)));
+    updateConfig().catch(e => console.warn(`Invalid config: ${e}`));
+};
diff --git a/src/config/index.ts b/src/config/index.ts
new file mode 100644
index 0000000..d09a668
--- /dev/null
+++ b/src/config/index.ts
@@ -0,0 +1,22 @@
+import defaults from "./defaults";
+import { convertSettings } from "./funcs";
+
+const config = convertSettings(defaults);
+
+export const {
+    style,
+    bar,
+    launcher,
+    notifpopups,
+    osds,
+    sideleft,
+    math,
+    updates,
+    weather,
+    cpu,
+    gpu,
+    memory,
+    storage,
+    wallpapers,
+} = config;
+export default config;