From 99b03aac429a9957d96d71bc80b6f50e80224765 Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (Cosmic Fusion)" <83735213+CosmicFusion@users.noreply.github.com> Date: Tue, 12 Sep 2023 00:07:21 +0300 Subject: [PATCH] Move to Jasper Theme --- pika-settings/debian/changelog | 6 +++++ pika-settings/debian/control | 2 +- .../debian/pika-settings.gsettings-override | 24 +++++++++---------- pika-settings/usr/bin/pika-theme-setup | 16 ++++++------- .../usr/share/pixmaps/pika-mono-logo.svg | 11 --------- 5 files changed, 27 insertions(+), 32 deletions(-) delete mode 100644 pika-settings/usr/share/pixmaps/pika-mono-logo.svg diff --git a/pika-settings/debian/changelog b/pika-settings/debian/changelog index 31e2189..5b1455e 100644 --- a/pika-settings/debian/changelog +++ b/pika-settings/debian/changelog @@ -1,3 +1,9 @@ +pika-settings (4.3-99pika1.lunar) lunar; urgency=low + + * Update to lunar + + -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 + pika-settings (4.2-99pika3.lunar) lunar; urgency=low * Update to lunar diff --git a/pika-settings/debian/control b/pika-settings/debian/control index a5e9bed..196d204 100644 --- a/pika-settings/debian/control +++ b/pika-settings/debian/control @@ -9,7 +9,7 @@ Homepage: https://github.com/PikaOS-Linux/ Package: pika-settings Architecture: all -Depends: gnome-backgrounds, dconf-gsettings-backend | gsettings-backend, gnome-control-center-data, gsettings-desktop-schemas (>= 40), libglib2.0-bin (>= 2.53.4-3ubuntu1~), pika-theme +Depends: gnome-backgrounds, dconf-gsettings-backend | gsettings-backend, gnome-control-center-data, gsettings-desktop-schemas (>= 40), libglib2.0-bin (>= 2.53.4-3ubuntu1~), pika-theme, fonts-ubuntu Conflicts: ubuntu-settings, ubuntu-wallpapers, ubuntu-wallpapers-kinetic, ubuntu-wallpapers-lunar, pika-kde-settings Replaces: ubuntu-settings, ubuntu-wallpapers, ubuntu-wallpapers-kinetic, ubuntu-wallpapers-lunar Provides: ubuntu-settings, ubuntu-wallpapers, ubuntu-wallpapers-kinetic, ubuntu-wallpapers-lunar diff --git a/pika-settings/debian/pika-settings.gsettings-override b/pika-settings/debian/pika-settings.gsettings-override index c92be97..68560c5 100644 --- a/pika-settings/debian/pika-settings.gsettings-override +++ b/pika-settings/debian/pika-settings.gsettings-override @@ -124,26 +124,26 @@ picture-uri = 'file:///usr/share/backgrounds/pika/Wallpaper_PikaOS_Parrot_8K.png [org.gnome.desktop.wm.preferences] button-layout = 'appmenu:close' -titlebar-font = 'Fira Sans Semi-Bold 10' -theme = 'Orchis-Yellow-Light' +titlebar-font = 'Ubuntu Bold 11' +theme = 'Jasper-Yellow-Light' [org.gnome.desktop.sound] theme-name = 'pika' [org.gnome.desktop.interface] -gtk-theme = 'Orchis-Yellow-Light' +gtk-theme = 'Jasper-Yellow-Light' icon-theme = 'Papirus' cursor-theme = 'Adwaita' -monospace-font-name = 'Fira Mono 11' -document-font-name = 'Roboto Slab 11' -font-name = 'Fira Sans Semi-Light 10' +monospace-font-name = 'Ubuntu Mono 13' +document-font-name = 'Sans 11' +font-name = 'Ubuntu 11' color-scheme = 'prefer-dark' [org.gnome.shell] favorite-apps = ['pika-installer.desktop', 'pika-welcome-welcome.desktop', 'firefox.desktop', 'repoman.desktop', 'update-manager.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'gnome-system-monitor.desktop'] [org.gnome.shell] -enabled-extensions = ['ubuntu-appindicators@ubuntu.com', 'pika-darkmode@pika.com'] +enabled-extensions = ['ubuntu-appindicators@ubuntu.com', 'pika-darkmode@pika.com', 'pop-shell@system76.com'] [org.gnome.shell.extensions.nightthemeswitcher.time] manual-time-source = true @@ -153,13 +153,13 @@ time-source = 'ondemand' [org.gnome.shell.extensions.nightthemeswitcher.gtk-variants] enabled = true -day = 'Orchis-Yellow-Light' -night = 'Orchis-Yellow-Dark' +day = 'Jasper-Yellow-Light' +night = 'Jasper-Yellow-Dark' [org.gnome.shell.extensions.nightthemeswitcher.shell-variants] enabled = true -day = 'Orchis-Yellow-Light' -night = 'Orchis-Yellow-Dark' +day = 'Jasper-Yellow-Light' +night = 'Jasper-Yellow-Dark' [org.gnome.shell.extensions.nightthemeswitcher.commands] enabled = true @@ -167,7 +167,7 @@ sunrise = 'pika-gnome-theme' sunset = 'pika-gnome-theme dark' [org.gnome.shell.extensions.arcmenu] -custom-menu-button-icon = '/usr/share/pixmaps/pika-mono-logo.svg' +custom-menu-button-icon = '/usr/share/pixmaps/pika-logo-duotone.svg' menu-button-icon = 'Custom_Icon' [org.gnome.mutter] diff --git a/pika-settings/usr/bin/pika-theme-setup b/pika-settings/usr/bin/pika-theme-setup index ae7e357..f511772 100755 --- a/pika-settings/usr/bin/pika-theme-setup +++ b/pika-settings/usr/bin/pika-theme-setup @@ -3,12 +3,12 @@ if gsettings get org.pika.layouts pika-theme | grep 2 then dconf write /org/pika/layouts/pika-theme 1 gnome-extensions enable pika-darkmode@pika.com -dconf write /org/gnome/desktop/wm/preferences/titlebar-font "'Fira Sans Semi-Bold 10'" +dconf write /org/gnome/desktop/wm/preferences/titlebar-font "'Ubuntu Bold 11'" 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/desktop/interface/monospace-font-name "'Ubuntu Mono 13'" +dconf write /org/gnome/desktop/interface/document-font-name "'Sans 11'" +dconf write /org/gnome/desktop/interface/font-name "'Ubuntu 11'" 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'" @@ -17,11 +17,11 @@ dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/enabled true 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/enabled true -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/gtk-variants/day "'Jasper-Yellow-Light'" +dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/night "'Jasper-Yellow-Dark'" dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/enabled true -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'" +dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/day "'Jasper-Yellow-Light'" +dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/night "'Jasper-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 diff --git a/pika-settings/usr/share/pixmaps/pika-mono-logo.svg b/pika-settings/usr/share/pixmaps/pika-mono-logo.svg deleted file mode 100644 index f79d527..0000000 --- a/pika-settings/usr/share/pixmaps/pika-mono-logo.svg +++ /dev/null @@ -1,11 +0,0 @@ - - 5263934 - - - - - - - \ No newline at end of file