From 61204997f32bc212ff21188c6cba211f81af0d1d Mon Sep 17 00:00:00 2001
From: Andreas Gerlach <andi@appelgriebsch.org>
Date: Fri, 31 Jul 2020 12:25:34 +0200
Subject: [PATCH] [sway] update theme setting script to include kvantum
configuration
---
overlays/sway/etc/greetd/sway | 6 -----
.../sway/config.d/99-autostart-applications | 2 +-
.../sway/etc/sway/themes/matcha-blue/kvantum | 1 +
.../sway/etc/sway/themes/matcha-green/kvantum | 1 +
...3-settings.sh => import-theme-settings.sh} | 25 ++++++++++++++-----
5 files changed, 22 insertions(+), 13 deletions(-)
create mode 100644 overlays/sway/etc/sway/themes/matcha-blue/kvantum
create mode 100644 overlays/sway/etc/sway/themes/matcha-green/kvantum
rename overlays/sway/usr/local/bin/{import-gtk3-settings.sh => import-theme-settings.sh} (64%)
diff --git a/overlays/sway/etc/greetd/sway b/overlays/sway/etc/greetd/sway
index ddfce658..c25b28c5 100644
--- a/overlays/sway/etc/greetd/sway
+++ b/overlays/sway/etc/greetd/sway
@@ -3,12 +3,6 @@ include /etc/sway/definitions
include /etc/sway/inputs/*
include /etc/sway/outputs/*
-# enable gtk3 theming
-exec import-gtk3-settings.sh $theme/gtk \
- gtk-theme:gtk-theme-name \
- icon-theme:gtk-icon-theme-name \
- cursor-theme:gtk-cursor-theme-name
-
# start gtkgreeter
exec "gtkgreet -l -c sway; swaymsg exit"
diff --git a/overlays/sway/etc/sway/config.d/99-autostart-applications b/overlays/sway/etc/sway/config.d/99-autostart-applications
index 56db3ac6..f1a8b7a3 100644
--- a/overlays/sway/etc/sway/config.d/99-autostart-applications
+++ b/overlays/sway/etc/sway/config.d/99-autostart-applications
@@ -2,7 +2,7 @@
exec $idle
# enable gtk3 theming
-exec_always import-gtk3-settings.sh $theme/gtk \
+exec_always import-theme-settings.sh $theme \
gtk-theme:gtk-theme-name \
icon-theme:gtk-icon-theme-name \
cursor-theme:gtk-cursor-theme-name
diff --git a/overlays/sway/etc/sway/themes/matcha-blue/kvantum b/overlays/sway/etc/sway/themes/matcha-blue/kvantum
new file mode 100644
index 00000000..43be7e3d
--- /dev/null
+++ b/overlays/sway/etc/sway/themes/matcha-blue/kvantum
@@ -0,0 +1 @@
+theme=Matchama-Dark-azul
diff --git a/overlays/sway/etc/sway/themes/matcha-green/kvantum b/overlays/sway/etc/sway/themes/matcha-green/kvantum
new file mode 100644
index 00000000..0fb0cfc9
--- /dev/null
+++ b/overlays/sway/etc/sway/themes/matcha-green/kvantum
@@ -0,0 +1 @@
+theme=Matchama-Dark
diff --git a/overlays/sway/usr/local/bin/import-gtk3-settings.sh b/overlays/sway/usr/local/bin/import-theme-settings.sh
similarity index 64%
rename from overlays/sway/usr/local/bin/import-gtk3-settings.sh
rename to overlays/sway/usr/local/bin/import-theme-settings.sh
index f14b0573..37282f0e 100755
--- a/overlays/sway/usr/local/bin/import-gtk3-settings.sh
+++ b/overlays/sway/usr/local/bin/import-theme-settings.sh
@@ -15,7 +15,7 @@ prepare_gtk3_settings() {
mkdir -p $settings_dir
echo "[Settings]" > $settings_dir/settings.ini
- cat $1 >> $settings_dir/settings.ini
+ cat $1 | sed 's/"//g' >> $settings_dir/settings.ini
}
prepare_gtk4_settings() {
@@ -24,13 +24,26 @@ prepare_gtk4_settings() {
mkdir -p $settings_dir
echo "[Settings]" > $settings_dir/settings.ini
- cat $1 >> $settings_dir/settings.ini
+ cat $1 | sed 's/"//g' >> $settings_dir/settings.ini
}
-if [ -f "$1" ]; then
- prepare_gtk2_settings $1
- prepare_gtk3_settings $1
- prepare_gtk4_settings $1
+prepare_kvantum_settings() {
+ local theme_file=$1
+ local settings_dir=$HOME/.config/Kvantum
+
+ mkdir -p $settings_dir
+ echo "[General]" > $settings_dir/kvantum.kvconfig
+ cat $1 >> $settings_dir/kvantum.kvconfig
+}
+
+if [ -f "$1/gtk" ]; then
+ prepare_gtk2_settings $1/gtk
+ prepare_gtk3_settings $1/gtk
+ prepare_gtk4_settings $1/gtk
+fi
+
+if [ -f "$1/kvantum" ]; then
+ prepare_kvantum_settings $1/kvantum
fi
expression=""
--
GitLab