From 4fa9b2f38901ee2b8836094c25904f7ae5a6385d Mon Sep 17 00:00:00 2001 From: Ward Nakchbandi Date: Mon, 27 Mar 2023 13:08:05 +0300 Subject: [PATCH] fix themeing forever --- debian/changelog | 2 +- debian/control | 3 ++- usr/lib/pika/gnome-layouts/theme.sh | 20 +++++++++++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 19a56e6..f10388f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-gnome-layouts (2.0-99pika4) kinetic; urgency=low +pika-gnome-layouts (2.0-99pika5) kinetic; urgency=low * Redo Themeing system diff --git a/debian/control b/debian/control index 89a2925..e8efe08 100644 --- a/debian/control +++ b/debian/control @@ -20,5 +20,6 @@ Depends: pika-welcome, gnome-shell-extension-desktop-icons-ng, gnome-shell-extension-appindicator, gnome-shell-extension-pika-darkmode, - dconf-cli + dconf-cli, + pika-theme Description: PikaOS Gnome Desktop Layouts Selector diff --git a/usr/lib/pika/gnome-layouts/theme.sh b/usr/lib/pika/gnome-layouts/theme.sh index 6dd2a7b..ae4c88e 100755 --- a/usr/lib/pika/gnome-layouts/theme.sh +++ b/usr/lib/pika/gnome-layouts/theme.sh @@ -23,7 +23,19 @@ dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/day "'Or dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/night "'Orchis-Yellow-Dark'" dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/day "'Orchis-Yellow-Light'" dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/night "'Orchis-Yellow-Dark'" -pkexec /usr/lib/pika/gnome-layouts/papirus-folders -u -C yellow +echo '#! /bin/bash' > $HOME/.config/pika_theme || touch $HOME/.config/pika_theme && echo '#! /bin/bash' > $HOME/.config/pika_theme +echo 'KVANTUM_THEME_DARK=Orchis-dark' >> $HOME/.config/pika_theme +echo 'KVANTUM_THEME_LIGHT=Orchis' >> $HOME/.config/pika_theme +echo 'GTK_THEME_PATH_DARK=/usr/share/themes/$(dconf read /org/gnome/desktop/interface/gtk-theme | 'sed \"s+\'++\"' | 'sed \"s+\'++\"' | 'sed \"s+-Dark++\"' | 'sed \"s+-Light++\"')'-Dark >> $HOME/.config/pika_theme +echo 'GTK_THEME_PATH_LIGHT=/usr/share/themes/$(dconf read /org/gnome/desktop/interface/gtk-theme | 'sed \"s+\'++\"' | 'sed \"s+\'++\"' | 'sed \"s+-Dark++\"' | 'sed \"s+-Light++\"')'-Light >> $HOME/.config/pika_theme +pkexec /usr/lib/pika/gnome-layouts/papirus-folders -u -C yellow\ + +if dconf read /org/gnome/desktop/interface/color-scheme | grep dark +then +/usr/lib/pika/gnome-layouts/libadwaita.sh dark +else +/usr/lib/pika/gnome-layouts/libadwaita.sh +fi fi if [[ $1 == gnome ]] then @@ -40,4 +52,10 @@ dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/day "'ad dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/night "'adw-gtk3-dark'" dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/day "''" dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/night "''" +echo '#! /bin/bash' > $HOME/.config/pika_theme || touch $HOME/.config/pika_theme && echo '#! /bin/bash' > $HOME/.config/pika_theme +echo 'KVANTUM_THEME_DARK=' >> $HOME/.config/pika_theme +echo 'KVANTUM_THEME_LIGHT=' >> $HOME/.config/pika_theme +echo 'GTK_THEME_PATH_DARK=' >> $HOME/.config/pika_theme +echo 'GTK_THEME_PATH_LIGHT=' >> $HOME/.config/pika_theme +rm -rfv $HOME/.config/gtk-4.0 fi