More tweaks for el9. Also compile and setup mako with appropriate theme.

8 files changed, 64 insertions, 20 deletions

diff --git a/el9.sh b/el9.sh
index adf7a6b..1dc2341 100755
--- a/el9.sh
+++ b/el9.sh
@@ -455,6 +455,30 @@ meson compile -C build
 meson install -C build
 cd -
 
+_srcdir="$codedir/wtype"
+_srcrepo=https://github.com/atx/wtype
+if ! [ -d "$_srcdir" ] ; then
+	git clone "$_srcrepo" "$_srcdir"
+fi
+cd "$_srcdir"
+git checkout v0.4
+meson setup -Dprefix="${_pfx}" build
+meson compile -C build
+meson install -C build
+cd -
+
+_srcdir="$codedir/mako"
+_srcrepo=https://github.com/emersion/mako
+if ! [ -d "$_srcdir" ] ; then
+	git clone "$_srcrepo" "$_srcdir"
+fi
+cd "$_srcdir"
+git checkout v1.10.0
+meson setup -Dprefix="${_pfx}" build
+meson compile -C build
+meson install -C build
+cd -
+
 zigver=0.15.2
 zigdir="$RIVERWM_BASE/zig/zig$zigver"
 zigout="${zigdir}.tar.xz"
diff --git a/link.sh b/link.sh
index a7440eb..21bed0d 100755
--- a/link.sh
+++ b/link.sh
@@ -12,6 +12,14 @@ fi
 
 ln -sv "$(pwd)"/waylandrc "$HOME"/.waylandrc
 
+# Default to dark if we don't have any conf yet
+if ! [ -e mako/config ] ; then
+	ln -s dark mako/config
+fi
+if ! [ -e river/theme_conf ] ; then
+	echo 'mode=dark' > river/theme_conf
+fi
+
 for _d in * ; do
 	! [ -d "$_d" ] && continue
 
diff --git a/mako/config b/mako/config
new file mode 120000
index 0000000..df9f911
--- /dev/null
+++ b/mako/config
@@ -0,0 +1 @@
+dark
\ No newline at end of file
diff --git a/mako/dark b/mako/dark
new file mode 100644
index 0000000..52b092b
--- /dev/null
+++ b/mako/dark
@@ -0,0 +1,6 @@
+background-color=#282828
+border-color=#ebdbb2
+text-color=#ebdbb2
+border-radius=12
+padding=12
+font=IBM 3270 12
diff --git a/mako/light b/mako/light
new file mode 100644
index 0000000..dc566ce
--- /dev/null
+++ b/mako/light
@@ -0,0 +1,6 @@
+background-color=#fbf1c7
+border-color=#3c3836
+text-color=#3c3836
+border-radius=12
+padding=12
+font=IBM 3270 12
diff --git a/river/theme_helper b/river/theme_helper
index 5de2830..870f351 100755
--- a/river/theme_helper
+++ b/river/theme_helper
@@ -8,6 +8,14 @@ gnomeSet() {
 	gsettings set org.gnome.desktop.interface color-scheme "$1" || echo "color-scheme failed"
 }
 
+kickWaybar() {
+		sh -c 'if pgrep waybar; then pkill waybar ; exec waybar ; fi' &
+}
+
+kickMako() {
+		sh -c 'if pgrep mako; then pkill mako ; exec mako ; fi' &
+}
+
 bgcolor_dark=0x282828
 bgcolor_light=0xfbf1c7
 
@@ -27,6 +35,10 @@ case $mode in
 		gsettings set org.gnome.desktop.interface gtk-theme Adwaita-dark || echo "gtk-theme failed..."
 		pkill -SIGUSR1 foot
 		riverctl background-color "$bgcolor_dark"
+		echo '@import url("style-dark.css");' > "$XDG_CONFIG_HOME"/waybar/style.css
+		kickWaybar
+		ln -sf dark "$XDG_CONFIG_HOME"/mako/config
+		kickMako
 	;;
 	dark)
 		mode=light
@@ -34,6 +46,10 @@ case $mode in
 		gsettings set org.gnome.desktop.interface gtk-theme Adwaita || echo "gtk-theme failed..."
 		pkill -SIGUSR2 foot
 		riverctl background-color "$bgcolor_light"
+		echo '@import url("style-light.css");' > "$XDG_CONFIG_HOME"/waybar/style.css
+		kickWaybar
+		ln -sf light "$XDG_CONFIG_HOME"/mako/config
+		kickMako
 	;;
 esac
 
diff --git a/waybar/style.css b/waybar/style.css
index b8571d3..6aad1ba 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,20 +1 @@
-@define-color background #282828;
-@define-color foreground #ebdbb2;
-@define-color regular0 #282828;
-@define-color regular1 #cc241d;
-@define-color regular2 #98971a;
-@define-color regular3 #d79921;
-@define-color regular4 #458588;
-@define-color regular5 #b16286;
-@define-color regular6 #689d6a;
-@define-color regular7 #a89984;
-@define-color bright0 #928374;
-@define-color bright1 #fb4934;
-@define-color bright2 #b8bb26;
-@define-color bright3 #fabd2f;
-@define-color bright4 #83a598;
-@define-color bright5 #d3869b;
-@define-color bright6 #8ec07c;
-@define-color bright7 #ebdbb2;
-
-@import url("base.css");
+@import url("style-dark.css");
diff --git a/waylandrc b/waylandrc
index 186eeaa..449f268 100755
--- a/waylandrc
+++ b/waylandrc
@@ -45,6 +45,8 @@ if [ -d "$RIVERWM_BASE" ] ; then
 	fi
 fi
 
+[ -x "$(command -v mako)" ] && sh -c 'exec mako' &
+
 
 exec river