From 6fac717306b98280e93906cd289c06b78b00e804 Mon Sep 17 00:00:00 2001
From: Yuri Zamyatin <yuri@yrz.am>
Date: Tue, 15 Apr 2025 21:44:14 +0000
Subject: [PATCH] change config format

---
 assets/css/index.scss        | 10 +++++++++-
 assets/css/variables.scss    |  9 ---------
 data/theme.json              | 21 +++++++++++++++++++++
 init/import-environment.sh   | 11 ++---------
 layouts/_default/baseof.html |  2 +-
 5 files changed, 33 insertions(+), 20 deletions(-)
 delete mode 100644 assets/css/variables.scss
 create mode 100644 data/theme.json

diff --git a/assets/css/index.scss b/assets/css/index.scss
index 7df9b1f..defdda8 100644
--- a/assets/css/index.scss
+++ b/assets/css/index.scss
@@ -1,4 +1,12 @@
-@import "variables.scss";
+$color-fg: #{{ .Site.Data.theme.color.fg }};
+$color-fg-dark: #{{ .Site.Data.theme.color.fg_dark }};
+$color-fg-accent: #{{ .Site.Data.theme.color.fg_accent }};
+$color-bg: #{{ .Site.Data.theme.color.bg }};
+$color-bg-accent-light: #{{ .Site.Data.theme.color.bg_accent_light }};
+$color-bg-accent-dark: #{{ .Site.Data.theme.color.bg_accent_dark }};
+$opacity-low: {{ .Site.Data.theme.opacity.low }};
+$opacity-mid: {{ .Site.Data.theme.opacity.med }};
+
 @import "basic.scss";
 @import "classic-layout.scss";
 @import "home-layout.scss";
diff --git a/assets/css/variables.scss b/assets/css/variables.scss
deleted file mode 100644
index 337f36a..0000000
--- a/assets/css/variables.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-$color-fg: #ffffff;
-$color-fg-dark: #b8bcc1;
-$color-fg-accent: #9988ff;
-$color-bg: #0d1117;
-$color-bg-accent-light: #510079;
-$color-bg-accent-dark: #020030;
-
-$opacity-low: 0.2;
-$opacity-mid: 0.55;
diff --git a/data/theme.json b/data/theme.json
new file mode 100644
index 0000000..8c3c109
--- /dev/null
+++ b/data/theme.json
@@ -0,0 +1,21 @@
+{
+	"color": {
+		"fg": "ffffff",
+		"fg_dark": "b8bcc1",
+		"fg_accent": "9988ff",
+		"bg": "0d1117",
+		"bg_accent_light":"510079",
+		"bg_accent_dark":"020030"
+	},
+	"opacity": {
+		"low": 0.2,
+		"med": 0.55,
+		"high": 0.85
+	},
+	"font": {
+		"name_regular": "Roboto",
+		"name_mono": "Roboto Mono",
+		"size_base_pt": 12,
+		"size_step_pt": 1.5
+	}
+}
diff --git a/init/import-environment.sh b/init/import-environment.sh
index fcb4335..6729d3b 100755
--- a/init/import-environment.sh
+++ b/init/import-environment.sh
@@ -1,12 +1,5 @@
 #!/bin/sh
 set -e
+cd "$(dirname "$0")"
 
-cd "$(dirname "$0")/.."
-[ -d ./themes/yrzam ] && cd ./themes/yrzam
-
-VARS=$(printenv | \
-	grep -E 'THEME_.*' | \
-	sed -e 's/[= ].*//g' | sed -e 's/^/\$/' | tr '\n' ' '
-)
-
-envsubst "$VARS" < "./assets/css/variables.scss.tmpl" > "./assets/css/variables.scss"
+cp ~/.config/theme.json ../data/theme.json
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 6bb809e..1a006de 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -6,7 +6,7 @@
     <!-- prettier-ignore -->
     <title>{{ if not .IsHome }}{{ .LinkTitle | humanize }} - {{ end }}{{ .Site.Title }}</title>
     {{ $opts := dict "transpiler" "libsass" "targetPath" "_style.css" }}
-    {{ with resources.Get "css/index.scss" | toCSS $opts | minify | fingerprint }}
+    {{ with resources.Get "css/index.scss" | resources.ExecuteAsTemplate "" . | toCSS $opts | minify | fingerprint }}
       <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" />
     {{ end }}
     {{ range resources.Match "favicon/*.png" }}