[sway] theming improved; support matcha-green and matcha-blue working

overlays/sway/etc/profile.d/gtk-wayland.sh

@@ -5,6 +5,5 @@
 export MOZ_ENABLE_WAYLAND=1
 export MOZ_DBUS_REMOTE=1
 export LIBVA_DRIVER_NAME=v4l2_request
-export GTK_THEME=Matcha-dark-sea
 export GTK_CSD=0
 export LD_PRELOAD=/usr/lib/libgtk3-nocsd.so.0

overlays/sway/etc/skel/.config/gtk-4.0/settings.ini

-[Settings]
-gtk-theme-name=Matcha-dark-sea
-gtk-icon-theme-name=Papirus-Dark-Maia
-gtk-font-name=Noto Sans 11
-gtk-cursor-theme-name=xcursor-breeze
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_BOTH
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintfull

overlays/sway/etc/sway/config.d/99-autostart-applications

@@ -2,7 +2,7 @@
 exec $idle
 
 # enable gtk3 theming
-exec_always import-gtk3-settings.sh \
+exec_always import-gtk3-settings.sh $theme/gtk \
     gtk-theme:gtk-theme-name \
     icon-theme:gtk-icon-theme-name \
     cursor-theme:gtk-cursor-theme-name

overlays/sway/etc/sway/definitions

@@ -12,8 +12,6 @@ set $right l
 # styles - matcha-green or matcha-blue
 set $theme /etc/sway/themes/matcha-green
 
-set $background /usr/share/wallpapers/manjaro-arm/generic/manjaro-arm2.png
-
 # Your preferred terminal emulator
 set $term termite --config $theme/termite
 

overlays/sway/etc/skel/.config/gtk-3.0/settings.ini → overlays/sway/etc/sway/themes/matcha-blue/gtk

-[Settings]
-gtk-theme-name=Matcha-dark-sea
-gtk-icon-theme-name=Papirus-Dark-Maia
-gtk-font-name=Noto Sans 11
-gtk-cursor-theme-name=xcursor-breeze
+gtk-theme-name="Matcha-dark-azul"
+gtk-icon-theme-name="Papirus-Dark"
+gtk-font-name="Noto Sans 11"
+gtk-cursor-theme-name="xcursor-breeze"
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
@@ -12,4 +11,5 @@ gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=1
 gtk-xft-antialias=1
 gtk-xft-hinting=1
-gtk-xft-hintstyle=hintfull
+gtk-xft-hintstyle="hintfull"
+

overlays/sway/etc/sway/themes/matcha-blue/sway

 # based on Base16 Seti UI
 # Author: Appelgriebsch
 
+set $background /usr/share/wallpapers/manjaro-arm/generic/manjaro-arm.png
+
 set $base00 #14161b
 set $base01 #282a2b
 set $base02 #3B758C

overlays/sway/etc/skel/.gtkrc-2.0 → overlays/sway/etc/sway/themes/matcha-green/gtk

-# DO NOT EDIT! This file will be overwritten by LXAppearance.
-# Any customization should be done in ~/.gtkrc-2.0.mine instead.
-
-include "/home/andi/.gtkrc-2.0.mine"
 gtk-theme-name="Matcha-dark-sea"
 gtk-icon-theme-name="Papirus-Dark-Maia"
 gtk-font-name="Noto Sans 11"

overlays/sway/etc/sway/themes/matcha-green/sway

 # based on Base16 Seti UI
 # Author: Appelgriebsch
 
+set $background /usr/share/wallpapers/manjaro-arm/generic/manjaro-arm2.png
+
 set $base00 #141a1b
 set $base01 #282a2b
 set $base02 #3B758C

overlays/sway/usr/local/bin/import-gtk3-settings.sh

 #!/bin/sh
 
-# usage: import-gsettings <gsettings key>:<settings.ini key> <gsettings key>:<settings.ini key> ...
+# usage: import-gsettings <theme-file> <gsettings key>:<settings.ini key> <gsettings key>:<settings.ini key> ...
+prepare_gtk2_settings() {
+  local theme_file=$1
+  local settings_dir=$HOME
+
+  echo "include \"/home/andi/.gtkrc-2.0.mine\"" > $settings_dir/.gtkrc-2.0
+  cat $1 >> $settings_dir/.gtkrc-2.0
+}
+
+prepare_gtk3_settings() {
+  local theme_file=$1
+  local settings_dir=$HOME/.config/gtk-3.0
+
+  mkdir -p $settings_dir
+  echo "[settings]" > $settings_dir/settings.ini
+  cat $1 >> $settings_dir/settings.ini
+}
+
+prepare_gtk4_settings() {
+  local theme_file=$1
+  local settings_dir=$HOME/.config/gtk-4.0
+
+  mkdir -p $settings_dir
+  echo "[settings]" > $settings_dir/settings.ini
+  cat $1 >> $settings_dir/settings.ini
+}
+
+if [ -f "$1" ]; then
+  prepare_gtk2_settings $1
+  prepare_gtk3_settings $1
+  prepare_gtk4_settings $1
+fi
 
 expression=""
 for pair in "$@"; do