scheme: use new scheme backend

7 files changed, 36 insertions, 109 deletions

diff --git a/.gitignore b/.gitignore
index 906d358..278594f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 @girs/
 node_modules/
 scss/scheme/_index.scss
-scss/scheme/_dynamic.scss
 assets/weather-api-key.txt
diff --git a/app.tsx b/app.tsx
index f6ed759..113644e 100644
--- a/app.tsx
+++ b/app.tsx
@@ -11,12 +11,18 @@ import { execAsync, GLib, monitorFile, readFileAsync, writeFileAsync } from "ast
 import { App } from "astal/gtk3";
 
 const loadStyleAsync = async () => {
-    let scheme = "mocha";
+    let schemeColours;
     if (GLib.file_test(`${CACHE}/scheme/current.txt`, GLib.FileTest.EXISTS)) {
         const currentScheme = await readFileAsync(`${CACHE}/scheme/current.txt`);
-        if (GLib.file_test(`${SRC}/scss/scheme/_${currentScheme}.scss`, GLib.FileTest.EXISTS)) scheme = currentScheme;
-    }
-    await writeFileAsync(`${SRC}/scss/scheme/_index.scss`, `@forward "${scheme}";`);
+        schemeColours = currentScheme
+            .split("\n")
+            .map(l => {
+                const [name, hex] = l.split(" ");
+                return `$${name}: #${hex};`;
+            })
+            .join("\n");
+    } else schemeColours = await readFileAsync(`${SRC}/scss/scheme/_default.scss`);
+    await writeFileAsync(`${SRC}/scss/scheme/_index.scss`, schemeColours);
     App.apply_css(await execAsync(`sass ${SRC}/style.scss`), true);
 };
 
diff --git a/scss/scheme/_default.scss b/scss/scheme/_default.scss
new file mode 100644
index 0000000..a94fff7
--- /dev/null
+++ b/scss/scheme/_default.scss
@@ -0,0 +1,26 @@
+$rosewater: #edcbc5;
+$flamingo: #d3a4a4;
+$pink: #d792c6;
+$mauve: #c678dd;
+$red: #be5046;
+$maroon: #e06c75;
+$peach: #d19a66;
+$yellow: #e5c07b;
+$green: #98c379;
+$teal: #56b6c2;
+$sky: #90ccd7;
+$sapphire: #389dcc;
+$blue: #61afef;
+$lavender: #8e98d9;
+$text: #abb2bf;
+$subtext1: #95a0b5;
+$subtext0: #838b9c;
+$overlay2: #767f8f;
+$overlay1: #666e7c;
+$overlay0: #5c6370;
+$surface2: #4b5263;
+$surface1: #3c414f;
+$surface0: #30343e;
+$base: #282c34;
+$mantle: #21242b;
+$crust: #1e2126;
diff --git a/scss/scheme/_frappe.scss b/scss/scheme/_frappe.scss
deleted file mode 100644
index 49485fc..0000000
--- a/scss/scheme/_frappe.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-$rosewater: #f2d5cf;
-$flamingo: #eebebe;
-$pink: #f4b8e4;
-$mauve: #ca9ee6;
-$red: #e78284;
-$maroon: #ea999c;
-$peach: #ef9f76;
-$yellow: #e5c890;
-$green: #a6d189;
-$teal: #81c8be;
-$sky: #99d1db;
-$sapphire: #85c1dc;
-$blue: #8caaee;
-$lavender: #babbf1;
-$text: #c6d0f5;
-$subtext1: #b5bfe2;
-$subtext0: #a5adce;
-$overlay2: #949cbb;
-$overlay1: #838ba7;
-$overlay0: #737994;
-$surface2: #626880;
-$surface1: #51576d;
-$surface0: #414559;
-$base: #303446;
-$mantle: #292c3c;
-$crust: #232634;
diff --git a/scss/scheme/_latte.scss b/scss/scheme/_latte.scss
deleted file mode 100644
index 96487a1..0000000
--- a/scss/scheme/_latte.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-$rosewater: #dc8a78;
-$flamingo: #dd7878;
-$pink: #ea76cb;
-$mauve: #8839ef;
-$red: #d20f39;
-$maroon: #e64553;
-$peach: #fe640b;
-$yellow: #df8e1d;
-$green: #40a02b;
-$teal: #179299;
-$sky: #04a5e5;
-$sapphire: #209fb5;
-$blue: #1e66f5;
-$lavender: #7287fd;
-$text: #4c4f69;
-$subtext1: #5c5f77;
-$subtext0: #6c6f85;
-$overlay2: #7c7f93;
-$overlay1: #8c8fa1;
-$overlay0: #9ca0b0;
-$surface2: #acb0be;
-$surface1: #bcc0cc;
-$surface0: #ccd0da;
-$base: #eff1f5;
-$mantle: #e6e9ef;
-$crust: #dce0e8;
diff --git a/scss/scheme/_macchiato.scss b/scss/scheme/_macchiato.scss
deleted file mode 100644
index 9355e38..0000000
--- a/scss/scheme/_macchiato.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-$rosewater: #f4dbd6;
-$flamingo: #f0c6c6;
-$pink: #f5bde6;
-$mauve: #c6a0f6;
-$red: #ed8796;
-$maroon: #ee99a0;
-$peach: #f5a97f;
-$yellow: #eed49f;
-$green: #a6da95;
-$teal: #8bd5ca;
-$sky: #91d7e3;
-$sapphire: #7dc4e4;
-$blue: #8aadf4;
-$lavender: #b7bdf8;
-$text: #cad3f5;
-$subtext1: #b8c0e0;
-$subtext0: #a5adcb;
-$overlay2: #939ab7;
-$overlay1: #8087a2;
-$overlay0: #6e738d;
-$surface2: #5b6078;
-$surface1: #494d64;
-$surface0: #363a4f;
-$base: #24273a;
-$mantle: #1e2030;
-$crust: #181926;
diff --git a/scss/scheme/_mocha.scss b/scss/scheme/_mocha.scss
deleted file mode 100644
index 728949d..0000000
--- a/scss/scheme/_mocha.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-$rosewater: #f5e0dc;
-$flamingo: #f2cdcd;
-$pink: #f5c2e7;
-$mauve: #cba6f7;
-$red: #f38ba8;
-$maroon: #eba0ac;
-$peach: #fab387;
-$yellow: #f9e2af;
-$green: #a6e3a1;
-$teal: #94e2d5;
-$sky: #89dceb;
-$sapphire: #74c7ec;
-$blue: #89b4fa;
-$lavender: #b4befe;
-$text: #cdd6f4;
-$subtext1: #bac2de;
-$subtext0: #a6adc8;
-$overlay2: #9399b2;
-$overlay1: #7f849c;
-$overlay0: #6c7086;
-$surface2: #585b70;
-$surface1: #45475a;
-$surface0: #313244;
-$base: #1e1e2e;
-$mantle: #181825;
-$crust: #11111b;