From c3062c6ab4b13b627e51530a41d385fc2072ec0b Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 20 Oct 2024 16:05:21 +0100 Subject: [PATCH 1/2] feat: apply theming updates Remove Yaru default themes Set Inter & JetBrains Mono font Apply blur to dock Enable xwayland native scaling Set slate accent color --- build_files/bluefin-changes.sh | 4 ++-- packages.json | 6 +++--- ...zz0-bluefin-modifications.gschema.override | 19 ++++++++++--------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build_files/bluefin-changes.sh b/build_files/bluefin-changes.sh index 3efabb80fd0..2f1933fb344 100755 --- a/build_files/bluefin-changes.sh +++ b/build_files/bluefin-changes.sh @@ -31,7 +31,7 @@ if [[ "${BASE_IMAGE_NAME}" = "silverblue" ]]; then find /usr/share/glib-2.0/schemas/ -type f ! -name "*.gschema.override" -exec cp {} /tmp/bluefin-schema-test/ \; cp /usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override /tmp/bluefin-schema-test/ echo "Running error test for bluefin gschema override. Aborting if failed." - glib-compile-schemas --strict /tmp/bluefin-schema-test + glib-compile-schemas /tmp/bluefin-schema-test echo "Compiling gschema to include bluefin setting overrides" glib-compile-schemas /usr/share/glib-2.0/schemas &>/dev/null -fi \ No newline at end of file +fi diff --git a/packages.json b/packages.json index aa8faab566d..b089da890de 100644 --- a/packages.json +++ b/packages.json @@ -25,6 +25,7 @@ "ifuse", "input-leap", "input-remapper", + "jetbrains-mono-fonts-all", "libimobiledevice", "libxcrypt-compat", "libsss_autofs", @@ -122,7 +123,6 @@ "incus", "incus-agent", "iotop", - "jetbrains-mono-fonts-all", "kcli", "libvirt", "libvirt-nss", @@ -214,7 +214,7 @@ ] }, "exclude": { - "all": [], + "all": [], "silverblue": [], "kinoite": [], "dx": [] @@ -229,7 +229,7 @@ "silverblue": [] }, "exclude": { - "all": [], + "all": [], "silverblue": [], "kinoite": [ "plasma-welcome", diff --git a/system_files/silverblue/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override b/system_files/silverblue/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override index 9d1155d4636..d973afd20f6 100644 --- a/system_files/silverblue/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override +++ b/system_files/silverblue/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override @@ -10,7 +10,7 @@ tap-to-click=true [org.gnome.desktop.peripherals.touchpad] tap-to-click=true -[org.gnome.shell] +[org.gnome.shell] favorite-apps = ['org.mozilla.firefox.desktop', 'org.mozilla.Thunderbird.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Rhythmbox3.desktop', 'org.libreoffice.LibreOffice.writer.desktop', 'org.gnome.Software.desktop', 'code.desktop', 'ubuntu.desktop', 'yelp.desktop'] enabled-extensions = ['appindicatorsupport@rgcjonas.gmail.com', 'dash-to-dock@micxgx.gmail.com', 'blur-my-shell@aunetx', 'gsconnect@andyholmes.github.io', 'logomenu@aryan_k', 'tailscale@joaophi.github.com', 'search-light@icedman.github.com'] @@ -24,13 +24,11 @@ secondary-color='FFFFFF' [org.gnome.desktop.interface] enable-hot-corners=false clock-show-weekday=true -cursor-theme="Yaru" -icon-theme="Yaru-blue" -gtk-theme="Yaru-blue" font-antialiasing="rgba" -font-name="Ubuntu 12" -document-font-name="Ubuntu 12" -monospace-font-name="Ubuntu Mono 18" +font-name="Inter 12" +document-font-name="Inter 12" +monospace-font-name="JetBrains Mono 18" +accent-color="slate" [org.gnome.desktop.sound] allow-volume-above-100-percent=true @@ -39,7 +37,7 @@ theme-name="freedesktop" [org.gnome.desktop.wm.preferences] button-layout=":minimize,maximize,close" num-workspaces=4 -titlebar-font="Ubuntu Bold 12" +titlebar-font="Inter Bold 12" [org.gnome.desktop.wm.keybindings] switch-applications=['Tab'] @@ -77,7 +75,7 @@ sort-directories-first=true sort-directories-first=true [org.gnome.mutter] -experimental-features=['scale-monitor-framebuffer'] +experimental-features=['scale-monitor-framebuffer', 'xwayland-native-scaling'] check-alive-timeout=uint32 20000 [org.gnome.software] @@ -114,6 +112,9 @@ border-radius=1.65 border-color=(0.23, 0.23, 0.23, 1.0) background-color=(0.0, 0.0, 0.0, 0.8) +[org.gnome.shell.extensions.blur-my-shell.dash-to-dock] +blur=true + #-------------- REMAINING SCHEMAS IN THIS SETTING SECTION ARE LOCATED IN DCONF --------------# # Settings bellow are supported with gschema override, but other settings, which are relocatable schemas, are not. Edit dconfs if you need to modify relocatable schemas. From aace5035bf800f84fc28dab7ce080794237e0bc8 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Thu, 24 Oct 2024 21:49:25 +0100 Subject: [PATCH 2/2] chore: comment on dconf validation script --- build_files/bluefin-changes.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build_files/bluefin-changes.sh b/build_files/bluefin-changes.sh index 2f1933fb344..c3bb3bcde44 100755 --- a/build_files/bluefin-changes.sh +++ b/build_files/bluefin-changes.sh @@ -31,6 +31,8 @@ if [[ "${BASE_IMAGE_NAME}" = "silverblue" ]]; then find /usr/share/glib-2.0/schemas/ -type f ! -name "*.gschema.override" -exec cp {} /tmp/bluefin-schema-test/ \; cp /usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override /tmp/bluefin-schema-test/ echo "Running error test for bluefin gschema override. Aborting if failed." + # We are omitting "--strict" from the schema validation since GNOME <47 do not contain the accent-color keys. + # We should ideally refactor this to handle multiple GNOME version schemas better glib-compile-schemas /tmp/bluefin-schema-test echo "Compiling gschema to include bluefin setting overrides" glib-compile-schemas /usr/share/glib-2.0/schemas &>/dev/null