diff --git a/debian/changelog b/debian/changelog index ff5f589..5398adf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pika-gnome-layouts (2.0-99pika7) kinetic; urgency=low + + * Fix theming maybe + + -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 + pika-gnome-layouts (2.0-99pika6) kinetic; urgency=low * Redo Themeing system diff --git a/debian/control b/debian/control index e8efe08..821bdbd 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Package: pika-gnome-layouts Architecture: all Depends: pika-welcome, gnome-shell-extension-arc-menu, - gnome-shell-extension-custom-accent-colors, gnome-shell-extension-just-perfection, gnome-shell-extension-launch-new-instance, gnome-shell-extension-places-menu, @@ -21,5 +20,6 @@ Depends: pika-welcome, gnome-shell-extension-appindicator, gnome-shell-extension-pika-darkmode, dconf-cli, - pika-theme + pika-theme, + pika-settings Description: PikaOS Gnome Desktop Layouts Selector diff --git a/usr/lib/pika/gnome-layouts/dconf-accent.sh b/usr/lib/pika/gnome-layouts/dconf-accent.sh index d226a99..004339f 100755 --- a/usr/lib/pika/gnome-layouts/dconf-accent.sh +++ b/usr/lib/pika/gnome-layouts/dconf-accent.sh @@ -8,8 +8,8 @@ dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/enabled dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/enabled true dconf write /org/pika/layouts/pika-theme 1 dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/enabled true -dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/sunrise "'/usr/lib/pika/gnome-layouts/libadwaita.sh'" -dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/sunset "'/usr/lib/pika/gnome-layouts/libadwaita.sh dark'" +dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/sunrise "'pika-gnome-theme'" +dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/sunset "'pika-gnome-theme dark'" if [[ $1 == Blue ]] then dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/day "'Orchis-Light'" @@ -24,7 +24,7 @@ dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/night fi if dconf read /org/gnome/desktop/interface/color-scheme | grep dark then -/usr/lib/pika/gnome-layouts/libadwaita.sh dark +pika-gnome-theme dark else -/usr/lib/pika/gnome-layouts/libadwaita.sh +pika-gnome-theme fi diff --git a/usr/lib/pika/gnome-layouts/libadwaita.sh b/usr/lib/pika/gnome-layouts/libadwaita.sh deleted file mode 100755 index 8a1f065..0000000 --- a/usr/lib/pika/gnome-layouts/libadwaita.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/bash - -# Remove current libadwaita theme -rm -rfv $HOME/.config/gtk-4.0 - -# Import Theme Settings From system dir -if [ -f /etc/pika_theme ] -then -. "/etc/pika_theme" -fi - -# Import Theme Settings From user dir -if [ -f $HOME/.config/pika_theme ] -then -. "$HOME/.config/pika_theme" -fi - -if [[ $1 = dark ]] -then -kvantummanager --set $KVANTUM_THEME_DARK -cp -rfv $GTK_THEME_PATH_DARK/gtk-4.0 $HOME/.config/ -else -kvantummanager --set $KVANTUM_THEME_LIGHT -cp -rfv $GTK_THEME_PATH_LIGHT/gtk-4.0 $HOME/.config/ -fi \ No newline at end of file diff --git a/usr/lib/pika/gnome-layouts/theme.sh b/usr/lib/pika/gnome-layouts/theme.sh index 1a5bcda..6e8ecb4 100755 --- a/usr/lib/pika/gnome-layouts/theme.sh +++ b/usr/lib/pika/gnome-layouts/theme.sh @@ -1,4 +1,6 @@ #! /bin/bash +rm -rfv $HOME/.config/gtk-4.0 + gnome-extensions enable pika-darkmode@pika.com dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/manual-time-source true dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/ondemand-button-placement "'none'" @@ -9,32 +11,35 @@ dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/enable if [[ $1 == pika ]] then -dconf write /org/pika/layouts/pika-theme 1 dconf write /org/gnome/desktop/wm/preferences/titlebar-font "'Fira Sans Semi-Bold 10'" dconf write /org/gnome/desktop/sound/theme-name "'pika'" dconf write /org/gnome/desktop/interface/icon-theme "'Papirus'" dconf write /org/gnome/desktop/interface/monospace-font-name "'Fira Mono 11'" dconf write /org/gnome/desktop/interface/document-font-name "'Roboto Slab 11'" dconf write /org/gnome/desktop/interface/font-name "'Fira Sans Semi-Light 10'" +dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/manual-time-source = true +dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/ondemand-button-placement = "'none'" +dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/ondemand-time = "'night'" +dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/time-source = "'ondemand'" dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/enabled true -dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/sunrise "'/usr/lib/pika/gnome-layouts/libadwaita.sh'" -dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/sunset "'/usr/lib/pika/gnome-layouts/libadwaita.sh dark'" +dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/sunrise "'pika-gnome-theme'" +dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/sunset "'pika-gnome-theme dark'" dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/day "'Orchis-Yellow-Light'" 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'" 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 '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 +pika-gnome-theme dark else -/usr/lib/pika/gnome-layouts/libadwaita.sh +pika-gnome-theme fi fi if [[ $1 == gnome ]] @@ -57,5 +62,4 @@ 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