From 64be0a5902d3243f0c0184397feb9a4a15449b80 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sat, 5 Oct 2024 00:32:55 +0100 Subject: [PATCH 1/4] chore: dynamically set the wallpaper based on season --- build_files/build-base.sh | 1 + build_files/wallpaper.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100755 build_files/wallpaper.sh diff --git a/build_files/build-base.sh b/build_files/build-base.sh index 0581a46ad65..91c35c75461 100755 --- a/build_files/build-base.sh +++ b/build_files/build-base.sh @@ -17,6 +17,7 @@ rsync -rvK /ctx/system_files/"${BASE_IMAGE_NAME}"/ / /ctx/build_files/packages.sh /ctx/build_files/nvidia.sh /ctx/build_files/image-info.sh +/ctx/build_files/wallpaper.sh /ctx/build_files/fetch-install.sh /ctx/build_files/brew.sh /ctx/build_files/fetch-quadlets.sh diff --git a/build_files/wallpaper.sh b/build_files/wallpaper.sh new file mode 100755 index 00000000000..4f45bdb69e9 --- /dev/null +++ b/build_files/wallpaper.sh @@ -0,0 +1,26 @@ +#!/usr/bin/bash + +set -ouex pipefail + +if test "$BASE_IMAGE_NAME" = "silverblue"; then + DATE_MONTH=$(date +%B | tr '[:upper:]' '[:lower:]') + DATE_MONTH_NUM=$(date +%m) + SEASON="" + case $DATE_MONTH_NUM in + 12|01|02) + SEASON="winter" + ;; + 03|04|05) + SEASON="spring" + ;; + 06|07|08) + SEASON="summer" + ;; + 09|10|11) + SEASON="autumn" + ;; + esac + + sed -i "s|picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-.*-dynamic.xml'|picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-${SEASON}-dynamic.xml'|g" /etc/dconf/db/local.d/00-background + sed -i "s|picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-.*-dynamic.xml'|picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-${SEASON}-dynamic.xml'|g" /etc/dconf/db/local.d/00-background +fi From 146a2733ceb22f58e122bce2ee60ebe0cf9064d1 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sat, 5 Oct 2024 00:36:11 +0100 Subject: [PATCH 2/4] fix: alter the correct gschema override file --- build_files/wallpaper.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build_files/wallpaper.sh b/build_files/wallpaper.sh index 4f45bdb69e9..f20ee577016 100755 --- a/build_files/wallpaper.sh +++ b/build_files/wallpaper.sh @@ -21,6 +21,7 @@ if test "$BASE_IMAGE_NAME" = "silverblue"; then ;; esac - sed -i "s|picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-.*-dynamic.xml'|picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-${SEASON}-dynamic.xml'|g" /etc/dconf/db/local.d/00-background - sed -i "s|picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-.*-dynamic.xml'|picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-${SEASON}-dynamic.xml'|g" /etc/dconf/db/local.d/00-background + WALLPAPER_GSCHEMA_OVERRIDE_FILE="/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override" + sed -i "s|picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-.*-dynamic.xml'|picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-${SEASON}-dynamic.xml'|g" "${WALLPAPER_GSCHEMA_OVERRIDE_FILE}" + sed -i "s|picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-.*-dynamic.xml'|picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-${SEASON}-dynamic.xml'|g" "${WALLPAPER_GSCHEMA_OVERRIDE_FILE}" fi From df3d394a0457d4ddb96c5837e061542bb0fd4592 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sat, 12 Oct 2024 18:28:45 +0100 Subject: [PATCH 3/4] chore: scaffold out all other months --- build_files/wallpaper.sh | 20 ++--------- ...Post.webp => WallPaper_AprilDay_Post.webp} | Bin ...st.webp => WallPaper_AprilNight_Post.webp} | Bin ...st.webp => WallPaper_JanuaryDay_Post.webp} | Bin ....webp => WallPaper_JanuaryNight_Post.webp} | Bin ..._Post.webp => WallPaper_JulyDay_Post.webp} | Bin ...ost.webp => WallPaper_JulyNight_Post.webp} | Bin ...st.webp => WallPaper_OctoberDay_Post.webp} | Bin ....webp => WallPaper_OctoberNight_Post.webp} | Bin ...-dynamic.xml => bluefin-april-dynamic.xml} | 18 +++++----- .../bluefin/bluefin-august-dynamic.xml | 33 ++++++++++++++++++ .../bluefin/bluefin-december-dynamic.xml | 33 ++++++++++++++++++ .../bluefin/bluefin-february-dynamic.xml | 33 ++++++++++++++++++ ...ynamic.xml => bluefin-january-dynamic.xml} | 12 +++---- ...r-dynamic.xml => bluefin-july-dynamic.xml} | 12 +++---- .../bluefin/bluefin-june-dynamic.xml | 33 ++++++++++++++++++ .../bluefin/bluefin-march-dynamic.xml | 33 ++++++++++++++++++ ...ng-dynamic.xml => bluefin-may-dynamic.xml} | 13 +++---- .../bluefin/bluefin-november-dynamic.xml | 33 ++++++++++++++++++ .../bluefin/bluefin-october-dynamic.xml | 32 +++++++++++++++++ .../bluefin/bluefin-september-dynamic.xml | 33 ++++++++++++++++++ ...zz0-bluefin-modifications.gschema.override | 6 ++-- 22 files changed, 296 insertions(+), 48 deletions(-) rename system_files/silverblue/usr/share/backgrounds/bluefin/{WallPaper_SpringDay_Post.webp => WallPaper_AprilDay_Post.webp} (100%) rename system_files/silverblue/usr/share/backgrounds/bluefin/{WallPaper_SpringNight_Post.webp => WallPaper_AprilNight_Post.webp} (100%) rename system_files/silverblue/usr/share/backgrounds/bluefin/{WallPaper_WinterDay_Post.webp => WallPaper_JanuaryDay_Post.webp} (100%) rename system_files/silverblue/usr/share/backgrounds/bluefin/{WallPaper_WinterNight_Post.webp => WallPaper_JanuaryNight_Post.webp} (100%) rename system_files/silverblue/usr/share/backgrounds/bluefin/{WallPaper_SummerDay_Post.webp => WallPaper_JulyDay_Post.webp} (100%) rename system_files/silverblue/usr/share/backgrounds/bluefin/{WallPaper_SummerNight_Post.webp => WallPaper_JulyNight_Post.webp} (100%) rename system_files/silverblue/usr/share/backgrounds/bluefin/{WallPaper_AutumnDay_Post.webp => WallPaper_OctoberDay_Post.webp} (100%) rename system_files/silverblue/usr/share/backgrounds/bluefin/{WallPaper_AutumnNight_Post.webp => WallPaper_OctoberNight_Post.webp} (100%) rename system_files/silverblue/usr/share/backgrounds/bluefin/{bluefin-autumn-dynamic.xml => bluefin-april-dynamic.xml} (72%) create mode 100644 system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-august-dynamic.xml create mode 100644 system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-december-dynamic.xml create mode 100644 system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-february-dynamic.xml rename system_files/silverblue/usr/share/backgrounds/bluefin/{bluefin-winter-dynamic.xml => bluefin-january-dynamic.xml} (53%) rename system_files/silverblue/usr/share/backgrounds/bluefin/{bluefin-summer-dynamic.xml => bluefin-july-dynamic.xml} (54%) create mode 100644 system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-june-dynamic.xml create mode 100644 system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-march-dynamic.xml rename system_files/silverblue/usr/share/backgrounds/bluefin/{bluefin-spring-dynamic.xml => bluefin-may-dynamic.xml} (51%) create mode 100644 system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-november-dynamic.xml create mode 100644 system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-october-dynamic.xml create mode 100644 system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-september-dynamic.xml diff --git a/build_files/wallpaper.sh b/build_files/wallpaper.sh index f20ee577016..884aae751c7 100755 --- a/build_files/wallpaper.sh +++ b/build_files/wallpaper.sh @@ -4,24 +4,8 @@ set -ouex pipefail if test "$BASE_IMAGE_NAME" = "silverblue"; then DATE_MONTH=$(date +%B | tr '[:upper:]' '[:lower:]') - DATE_MONTH_NUM=$(date +%m) - SEASON="" - case $DATE_MONTH_NUM in - 12|01|02) - SEASON="winter" - ;; - 03|04|05) - SEASON="spring" - ;; - 06|07|08) - SEASON="summer" - ;; - 09|10|11) - SEASON="autumn" - ;; - esac WALLPAPER_GSCHEMA_OVERRIDE_FILE="/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override" - sed -i "s|picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-.*-dynamic.xml'|picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-${SEASON}-dynamic.xml'|g" "${WALLPAPER_GSCHEMA_OVERRIDE_FILE}" - sed -i "s|picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-.*-dynamic.xml'|picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-${SEASON}-dynamic.xml'|g" "${WALLPAPER_GSCHEMA_OVERRIDE_FILE}" + sed -i "s|picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-.*-dynamic.xml'|picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-${DATE_MONTH}-dynamic.xml'|g" "${WALLPAPER_GSCHEMA_OVERRIDE_FILE}" + sed -i "s|picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-.*-dynamic.xml'|picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-${DATE_MONTH}-dynamic.xml'|g" "${WALLPAPER_GSCHEMA_OVERRIDE_FILE}" fi diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_SpringDay_Post.webp b/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_AprilDay_Post.webp similarity index 100% rename from system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_SpringDay_Post.webp rename to system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_AprilDay_Post.webp diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_SpringNight_Post.webp b/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_AprilNight_Post.webp similarity index 100% rename from system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_SpringNight_Post.webp rename to system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_AprilNight_Post.webp diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_WinterDay_Post.webp b/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_JanuaryDay_Post.webp similarity index 100% rename from system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_WinterDay_Post.webp rename to system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_JanuaryDay_Post.webp diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_WinterNight_Post.webp b/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_JanuaryNight_Post.webp similarity index 100% rename from system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_WinterNight_Post.webp rename to system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_JanuaryNight_Post.webp diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_SummerDay_Post.webp b/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_JulyDay_Post.webp similarity index 100% rename from system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_SummerDay_Post.webp rename to system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_JulyDay_Post.webp diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_SummerNight_Post.webp b/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_JulyNight_Post.webp similarity index 100% rename from system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_SummerNight_Post.webp rename to system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_JulyNight_Post.webp diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_AutumnDay_Post.webp b/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_OctoberDay_Post.webp similarity index 100% rename from system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_AutumnDay_Post.webp rename to system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_OctoberDay_Post.webp diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_AutumnNight_Post.webp b/system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_OctoberNight_Post.webp similarity index 100% rename from system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_AutumnNight_Post.webp rename to system_files/silverblue/usr/share/backgrounds/bluefin/WallPaper_OctoberNight_Post.webp diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-april-dynamic.xml similarity index 72% rename from system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml rename to system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-april-dynamic.xml index 7b1f77fea66..fb4ae20a0fd 100644 --- a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml +++ b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-april-dynamic.xml @@ -4,29 +4,29 @@ 1 1 6 - 30 + 0 0 - /usr/share/backgrounds/bluefin/WallPaper_AutumnDay_Post.webp - 34200.0 + /usr/share/backgrounds/bluefin/WallPaper_AprilDay_Post.webp + 37800.0 7200.0 - /usr/share/backgrounds/bluefin/WallPaper_AutumnDay_Post.webp - /usr/share/backgrounds/bluefin/WallPaper_AutumnNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_AprilDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_AprilNight_Post.webp - /usr/share/backgrounds/bluefin/WallPaper_AutumnNight_Post.webp - 37800.0 + /usr/share/backgrounds/bluefin/WallPaper_AprilNight_Post.webp + 34200.0 7200.0 - /usr/share/backgrounds/bluefin/WallPaper_AutumnNight_Post.webp - /usr/share/backgrounds/bluefin/WallPaper_AutumnDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_AprilNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_AprilDay_Post.webp diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-august-dynamic.xml b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-august-dynamic.xml new file mode 100644 index 00000000000..c4e28d55975 --- /dev/null +++ b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-august-dynamic.xml @@ -0,0 +1,33 @@ + + + 2018 + 1 + 1 + 5 + 45 + 0 + + + + + /usr/share/backgrounds/bluefin/WallPaper_JulyDay_Post.webp + 41400.0 + + + + 7200.0 + /usr/share/backgrounds/bluefin/WallPaper_JulyDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JulyNight_Post.webp + + + + /usr/share/backgrounds/bluefin/WallPaper_JulyNight_Post.webp + 30600.0 + + + + 7200.0 + /usr/share/backgrounds/bluefin/WallPaper_JulyNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JulyDay_Post.webp + + diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-december-dynamic.xml b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-december-dynamic.xml new file mode 100644 index 00000000000..9f61e3aef97 --- /dev/null +++ b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-december-dynamic.xml @@ -0,0 +1,33 @@ + + + 2018 + 1 + 1 + 6 + 30 + 0 + + + + + /usr/share/backgrounds/bluefin/WallPaper_OctoberDay_Post.webp + 34200.0 + + + + 7200.0 + /usr/share/backgrounds/bluefin/WallPaper_OctoberDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_OctoberNight_Post.webp + + + + /usr/share/backgrounds/bluefin/WallPaper_OctoberNight_Post.webp + 37800.0 + + + + 7200.0 + /usr/share/backgrounds/bluefin/WallPaper_OctoberNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_OctoberDay_Post.webp + + diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-february-dynamic.xml b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-february-dynamic.xml new file mode 100644 index 00000000000..893c874a8bd --- /dev/null +++ b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-february-dynamic.xml @@ -0,0 +1,33 @@ + + + 2018 + 1 + 1 + 6 + 15 + 0 + + + + + /usr/share/backgrounds/bluefin/WallPaper_JanuaryDay_Post.webp + 36000.0 + + + + 1800.0 + /usr/share/backgrounds/bluefin/WallPaper_JanuaryDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JanuaryNight_Post.webp + + + + /usr/share/backgrounds/bluefin/WallPaper_JanuaryNight_Post.webp + 46800.0 + + + + 1800.0 + /usr/share/backgrounds/bluefin/WallPaper_JanuaryNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JanuaryDay_Post.webp + + diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-january-dynamic.xml similarity index 53% rename from system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml rename to system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-january-dynamic.xml index d2e5adae874..eeb6a9a34ae 100644 --- a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml +++ b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-january-dynamic.xml @@ -9,24 +9,24 @@ - /usr/share/backgrounds/bluefin/WallPaper_WinterDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JanuaryDay_Post.webp 36000.0 1800.0 - /usr/share/backgrounds/bluefin/WallPaper_WinterDay_Post.webp - /usr/share/backgrounds/bluefin/WallPaper_WinterNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JanuaryDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JanuaryNight_Post.webp - /usr/share/backgrounds/bluefin/WallPaper_WinterNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JanuaryNight_Post.webp 46800.0 1800.0 - /usr/share/backgrounds/bluefin/WallPaper_WinterNight_Post.webp - /usr/share/backgrounds/bluefin/WallPaper_WinterDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JanuaryNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JanuaryDay_Post.webp diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-summer-dynamic.xml b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-july-dynamic.xml similarity index 54% rename from system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-summer-dynamic.xml rename to system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-july-dynamic.xml index 3e30bc58af7..2524237e9de 100644 --- a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-summer-dynamic.xml +++ b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-july-dynamic.xml @@ -9,24 +9,24 @@ - /usr/share/backgrounds/bluefin/WallPaper_SummerDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JulyDay_Post.webp 41400.0 7200.0 - /usr/share/backgrounds/bluefin/WallPaper_SummerDay_Post.webp - /usr/share/backgrounds/bluefin/WallPaper_SummerNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JulyDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JulyNight_Post.webp - /usr/share/backgrounds/bluefin/WallPaper_SummerNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JulyNight_Post.webp 30600.0 7200.0 - /usr/share/backgrounds/bluefin/WallPaper_SummerNight_Post.webp - /usr/share/backgrounds/bluefin/WallPaper_SummerDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JulyNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JulyDay_Post.webp diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-june-dynamic.xml b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-june-dynamic.xml new file mode 100644 index 00000000000..934149c6c93 --- /dev/null +++ b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-june-dynamic.xml @@ -0,0 +1,33 @@ + + + 2018 + 1 + 1 + 6 + 0 + 0 + + + + + /usr/share/backgrounds/bluefin/WallPaper_AprilDay_Post.webp + 37800.0 + + + + 7200.0 + /usr/share/backgrounds/bluefin/WallPaper_AprilDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_AprilNight_Post.webp + + + + /usr/share/backgrounds/bluefin/WallPaper_AprilNight_Post.webp + 34200.0 + + + + 7200.0 + /usr/share/backgrounds/bluefin/WallPaper_AprilNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_AprilDay_Post.webp + + diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-march-dynamic.xml b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-march-dynamic.xml new file mode 100644 index 00000000000..79f97ec7243 --- /dev/null +++ b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-march-dynamic.xml @@ -0,0 +1,33 @@ + + + 2018 + 1 + 1 + 6 + 15 + 0 + + + + + /usr/share/backgrounds/bluefin/WallPaper_JanuaryDay_Post.webp + 36000.0 + + + + 1800.0 + /usr/share/backgrounds/bluefin/WallPaper_JanuaryDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JanuaryNight_Post.webp + + + + /usr/share/backgrounds/bluefin/WallPaper_JanuaryNight_Post.webp + 46800.0 + + + + 1800.0 + /usr/share/backgrounds/bluefin/WallPaper_JanuaryNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JanuaryDay_Post.webp + + diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-spring-dynamic.xml b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-may-dynamic.xml similarity index 51% rename from system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-spring-dynamic.xml rename to system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-may-dynamic.xml index c182ef630a3..8f46be9f8e0 100644 --- a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-spring-dynamic.xml +++ b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-may-dynamic.xml @@ -8,25 +8,26 @@ 0 + - /usr/share/backgrounds/bluefin/WallPaper_SpringDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_AprilDay_Post.webp 37800.0 7200.0 - /usr/share/backgrounds/bluefin/WallPaper_SpringDay_Post.webp - /usr/share/backgrounds/bluefin/WallPaper_SpringNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_AprilDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_AprilNight_Post.webp - /usr/share/backgrounds/bluefin/WallPaper_SpringNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_AprilNight_Post.webp 34200.0 7200.0 - /usr/share/backgrounds/bluefin/WallPaper_SpringNight_Post.webp - /usr/share/backgrounds/bluefin/WallPaper_SpringDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_AprilNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_AprilDay_Post.webp diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-november-dynamic.xml b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-november-dynamic.xml new file mode 100644 index 00000000000..325c63ca9f8 --- /dev/null +++ b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-november-dynamic.xml @@ -0,0 +1,33 @@ + + + 2018 + 1 + 1 + 6 + 30 + 0 + + + + + /usr/share/backgrounds/bluefin/WallPaper_OctoberDay_Post.webp + 34200.0 + + + + 7200.0 + /usr/share/backgrounds/bluefin/WallPaper_OctoberDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_OctoberNight_Post.webp + + + + /usr/share/backgrounds/bluefin/WallPaper_OctoberNight_Post.webp + 37800.0 + + + + 7200.0 + /usr/share/backgrounds/bluefin/WallPaper_OctoberNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_OctoberDay_Post.webp + + diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-october-dynamic.xml b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-october-dynamic.xml new file mode 100644 index 00000000000..9c013916ff5 --- /dev/null +++ b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-october-dynamic.xml @@ -0,0 +1,32 @@ + + + 2018 + 1 + 1 + 6 + 30 + 0 + + + + /usr/share/backgrounds/bluefin/WallPaper_OctoberDay_Post.webp + 34200.0 + + + + 7200.0 + /usr/share/backgrounds/bluefin/WallPaper_OctoberDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_OctoberNight_Post.webp + + + + /usr/share/backgrounds/bluefin/WallPaper_OctoberNight_Post.webp + 37800.0 + + + + 7200.0 + /usr/share/backgrounds/bluefin/WallPaper_OctoberNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_OctoberDay_Post.webp + + diff --git a/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-september-dynamic.xml b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-september-dynamic.xml new file mode 100644 index 00000000000..65d0d7486e3 --- /dev/null +++ b/system_files/silverblue/usr/share/backgrounds/bluefin/bluefin-september-dynamic.xml @@ -0,0 +1,33 @@ + + + 2018 + 1 + 1 + 5 + 45 + 0 + + + + + /usr/share/backgrounds/bluefin/WallPaper_JulyDay_Post.webp + 41400.0 + + + + 7200.0 + /usr/share/backgrounds/bluefin/WallPaper_JulyDay_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JulyNight_Post.webp + + + + /usr/share/backgrounds/bluefin/WallPaper_JulyNight_Post.webp + 30600.0 + + + + 7200.0 + /usr/share/backgrounds/bluefin/WallPaper_JulyNight_Post.webp + /usr/share/backgrounds/bluefin/WallPaper_JulyDay_Post.webp + + 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 c66a3b89d4f..614500ecb9f 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,13 +10,13 @@ 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'] [org.gnome.desktop.background] -picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml' -picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml' +picture-uri='file:///usr/share/backgrounds/bluefin/.xml' +picture-uri-dark='file:///usr/share/backgrounds/bluefin/.xml' picture-options='zoom' primary-color='000000' secondary-color='FFFFFF' From d869896c9c106217b8afff86afdc09b9fd7ac570 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sat, 12 Oct 2024 19:21:00 +0100 Subject: [PATCH 4/4] chore: update script --- build_files/wallpaper.sh | 10 +++++++--- .../schemas/zz0-bluefin-modifications.gschema.override | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build_files/wallpaper.sh b/build_files/wallpaper.sh index 884aae751c7..30948b0270d 100755 --- a/build_files/wallpaper.sh +++ b/build_files/wallpaper.sh @@ -2,10 +2,14 @@ set -ouex pipefail -if test "$BASE_IMAGE_NAME" = "silverblue"; then +if test "${BASE_IMAGE_NAME}" = "silverblue"; then DATE_MONTH=$(date +%B | tr '[:upper:]' '[:lower:]') + WALLPAPER_URI="/usr/share/backgrounds/bluefin/bluefin-${DATE_MONTH}-dynamic.xml" WALLPAPER_GSCHEMA_OVERRIDE_FILE="/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override" - sed -i "s|picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-.*-dynamic.xml'|picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-${DATE_MONTH}-dynamic.xml'|g" "${WALLPAPER_GSCHEMA_OVERRIDE_FILE}" - sed -i "s|picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-.*-dynamic.xml'|picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-${DATE_MONTH}-dynamic.xml'|g" "${WALLPAPER_GSCHEMA_OVERRIDE_FILE}" + + echo "Setting wallpaper URI to ${WALLPAPER_URI}" + + sed -i "s|picture-uri='DO_NOT_CHANGE'|picture-uri='file://${WALLPAPER_URI}'|g" "${WALLPAPER_GSCHEMA_OVERRIDE_FILE}" + sed -i "s|picture-uri-dark='DO_NOT_CHANGE'|picture-uri-dark='file://${WALLPAPER_URI}'|g" "${WALLPAPER_GSCHEMA_OVERRIDE_FILE}" fi 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 614500ecb9f..15e40462ad6 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 @@ -15,8 +15,8 @@ favorite-apps = ['org.mozilla.firefox.desktop', 'org.mozilla.Thunderbird.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'] [org.gnome.desktop.background] -picture-uri='file:///usr/share/backgrounds/bluefin/.xml' -picture-uri-dark='file:///usr/share/backgrounds/bluefin/.xml' +picture-uri='DO_NOT_CHANGE' +picture-uri-dark='DO_NOT_CHANGE' picture-options='zoom' primary-color='000000' secondary-color='FFFFFF'