Merge pull request #13 from ublue-os/main

[pull] main from ublue-os:main

.github/workflows/build.yml

@@ -78,7 +78,9 @@ jobs:
           if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \
              [[ "${{ matrix.is_stable_version }}" == "true" ]]; then
               BUILD_TAGS+=("latest")
-          elif [[ "${{ matrix.is_gts_version }}" == "true" ]]; then
+          fi
+
+          if [[ "${{ matrix.is_gts_version }}" == "true" ]]; then
               BUILD_TAGS+=("gts")
           fi
 

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.3.0](https://github.com/ublue-os/bluefin/compare/v1.2.0...v1.3.0) (2023-10-27)
+
+
+### Features
+
+* add localsend to recommended utilities ([#618](https://github.com/ublue-os/bluefin/issues/618)) ([588139e](https://github.com/ublue-os/bluefin/commit/588139e7fec63e75107ac9e785fc7c11c52616fe))
+
 ## [1.2.0](https://github.com/ublue-os/bluefin/compare/v1.0.0...v1.2.0) (2023-10-23)
 
 

Containerfile

@@ -17,6 +17,15 @@ ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 ARG PACKAGE_LIST="bluefin"
 
+# GNOME VRR
+RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
+    if [ ${FEDORA_MAJOR_VERSION} -lt 39 ]; then \
+        rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland \
+    ; else \
+        rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem \
+    ; fi && \
+    rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo
+
 COPY usr /usr
 COPY just /tmp/just
 COPY etc/yum.repos.d/ /etc/yum.repos.d/
@@ -46,15 +55,6 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
     mkdir -p /etc/akmods-rpms/ && \
     mv /tmp/akmods-rpms/kmods/*steamdeck*.rpm /etc/akmods-rpms/steamdeck.rpm
 
-# GNOME VRR
-RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
-    if [ ${FEDORA_MAJOR_VERSION} -lt 39 ]; then \
-        rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland \
-    ; else \
-        rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem \
-    ; fi && \
-    rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo
-
 # Starship Shell Prompt
 RUN curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-gnu.tar.gz" && \
   tar -xzf /tmp/starship.tar.gz -C /tmp && \

README.md

@@ -2,16 +2,16 @@
 
 **This image is considered Beta** 
 
-## [Download the test ISO](https://github.com/ublue-os/bluefin/releases/tag/v1.2.0)
+## [Download the test ISO](https://github.com/ublue-os/bluefin/releases/)
 
 A familiar(ish) Ubuntu desktop for Fedora Silverblue. It strives to cover these three use cases:
 - For end users it provides a system as reliable as a Chromebook with near-zero maintainance, with the power of Ubuntu and Fedora fused together
 - For developers we endeavour to provide the best cloud-native developer experience by enabling easy consumption of the [industry's leading tools](https://landscape.cncf.io/card-mode?sort=stars). These are included in dedicated `bluefin-dx` and `bluefin-dx-nvidia` images
 - For gamers we strive to deliver a world-class Flathub gaming experience
 
-![image](https://user-images.githubusercontent.com/1264109/224488462-ac4ed2ad-402d-4116-bd08-15f61acce5cf.png)
+![image](https://github.com/ublue-os/bluefin/assets/1264109/c0b3fa8a-f513-4bb1-b314-e134d1802e18)
 
-> "Let's see what's out there." - Jean-Luc Picard
+> "Evolution is a process of constant branching and expansion." - Stephen Jay Gould
 
 # Documentation
 

dx/etc/yum.repos.d/docker-ce.repo

@@ -1,6 +1,6 @@
 [docker-ce-stable]
 name=Docker CE Stable - $basearch
-baseurl=https://download.docker.com/linux/fedora/38/$basearch/stable
+baseurl=https://download.docker.com/linux/fedora/$releasever/$basearch/stable
 enabled=1
 gpgcheck=1
 gpgkey=https://download.docker.com/linux/fedora/gpg

image-info.sh

@@ -7,7 +7,7 @@ IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME"
 
 case $FEDORA_MAJOR_VERSION in
   38)
-    IMAGE_TAG="latest"
+    IMAGE_TAG="gts"
     ;;
   *)
     IMAGE_TAG="$FEDORA_MAJOR_VERSION"

just/custom.just

@@ -59,6 +59,7 @@ cockpit:
   sudo podman container runlabel --name cockpit-ws RUN quay.io/cockpit/ws
   sudo podman container runlabel INSTALL quay.io/cockpit/ws
   sudo systemctl enable cockpit.service
+  echo 'Open Cockpit -> http://localhost:9090'
 
 # Import a devcontainers profile for VSCode
 code-profile:
@@ -81,6 +82,16 @@ devmode-off:
 devmode-on:
   #!/usr/bin/env bash
   CURRENT_IMAGE=$(rpm-ostree status -b --json | jq -r '.deployments[0]."container-image-reference"')
+
+  if grep -q "/var/ublue-os/image" <<< $CURRENT_IMAGE
+  then
+      echo ""
+      echo "Before we can switch to the Bluefin Developer Experience"
+      echo "the current system needs an update. Please run 'just update'"
+      echo "and reboot your system when the update is finished."
+      exit
+  fi
+
   if grep -q "bluefin-dx" <<< $CURRENT_IMAGE
   then
       echo "You are already on a developer image"

usr/etc/dconf/db/local.d/01-ublue

@@ -3,9 +3,9 @@ favorite-apps = ['org.mozilla.firefox.desktop', 'org.mozilla.Thunderbird.desktop
 enabled-extensions = ['[email protected]', '[email protected]', 'blur-my-shell@aunetx', '[email protected]']
 
 [org/gnome/desktop/background]
-picture-uri='file:///usr/share/backgrounds/lagoon.jpg'
-picture-uri-dark='file:///usr/share/backgrounds/lagoon.jpg'
-picture-options='stretched'
+picture-uri='file:///usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml'
+picture-uri-dark='file:///usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml'
+picture-options='zoom'
 primary-color='000000'
 secondary-color='FFFFFF'
 

usr/etc/yafti.yml

@@ -65,6 +65,7 @@ screens:
           - Font Downloader: org.gustavoperedo.FontDownloader
           - PinApp Menu Editor: io.github.fabrialberio.pinapp
           - Backup: org.gnome.DejaDup
+          - LocalSend: org.localsend.localsend_app
           - Syncthing: com.github.zocker_160.SyncThingy
           - Cockpit Client: org.cockpit_project.CockpitClient
   final-screen:

usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml

@@ -0,0 +1,33 @@
+<background>
+	<starttime>
+		<year>2023</year>
+		<month>04</month>
+		<day>18</day>
+		<hour>8</hour>
+		<minute>00</minute>
+		<second>00</second>
+	</starttime>
+	<!--  This animation will start at 8 AM.  -->
+	<!--  We start with day at 8 AM. It will remain up for 10 hours.  -->
+	<static>
+		<duration>36000.0</duration>
+		<file>/usr/share/backgrounds/bluefin/WallPaper_AutumnDay_Post.webp</file>
+	</static>
+	<!--  Day ended and starts to transition to night at 6 PM. The transition lasts for 2 hours, ending at 8 PM.  -->
+	<transition type="overlay">
+		<duration>7200.0</duration>
+		<from>/usr/share/backgrounds/bluefin/WallPaper_AutumnDay_Post.webp</from>
+		<to>/usr/share/backgrounds/bluefin/WallPaper_AutumnNight_Post.webp</to>
+	</transition>
+	<!--  It's 8 PM, we're showing the night till 6 AM.  -->
+	<static>
+		<duration>36000.0</duration>
+		<file>/usr/share/backgrounds/bluefin/WallPaper_AutumnNight_Post.webp</file>
+	</static>
+	<!--  It's 6 AM, and we're starting to transition to day. Transition completes at 8 AM.  -->
+	<transition type="overlay">
+		<duration>7200.0</duration>
+		<from>/usr/share/backgrounds/bluefin/WallPaper_AutumnNight_Post.webp</from>
+		<to>/usr/share/backgrounds/bluefin/WallPaper_AutumnDay_Post.webp</to>
+	</transition>
+</background>

usr/share/backgrounds/bluefin/bluefin-spring-dynamic.xml

@@ -0,0 +1,33 @@
+<background>
+	<starttime>
+		<year>2023</year>
+		<month>04</month>
+		<day>18</day>
+		<hour>8</hour>
+		<minute>00</minute>
+		<second>00</second>
+	</starttime>
+	<!--  This animation will start at 8 AM.  -->
+	<!--  We start with day at 8 AM. It will remain up for 10 hours.  -->
+	<static>
+		<duration>36000.0</duration>
+		<file>/usr/share/backgrounds/bluefin/WallPaper_SpringDay_Post.webp</file>
+	</static>
+	<!--  Day ended and starts to transition to night at 6 PM. The transition lasts for 2 hours, ending at 8 PM.  -->
+	<transition type="overlay">
+		<duration>7200.0</duration>
+		<from>/usr/share/backgrounds/bluefin/WallPaper_SpringDay_Post.webp</from>
+		<to>/usr/share/backgrounds/bluefin/WallPaper_SpringNight_Post.webp</to>
+	</transition>
+	<!--  It's 8 PM, we're showing the night till 6 AM.  -->
+	<static>
+		<duration>36000.0</duration>
+		<file>/usr/share/backgrounds/bluefin/WallPaper_SpringNight_Post.webp</file>
+	</static>
+	<!--  It's 6 AM, and we're starting to transition to day. Transition completes at 8 AM.  -->
+	<transition type="overlay">
+		<duration>7200.0</duration>
+		<from>/usr/share/backgrounds/bluefin/WallPaper_SpringNight_Post.webp</from>
+		<to>/usr/share/backgrounds/bluefin/WallPaper_SpringDay_Post.webp</to>
+	</transition>
+</background>

usr/share/backgrounds/bluefin/bluefin-summer-dynamic.xml

@@ -0,0 +1,33 @@
+<background>
+	<starttime>
+		<year>2023</year>
+		<month>04</month>
+		<day>18</day>
+		<hour>8</hour>
+		<minute>00</minute>
+		<second>00</second>
+	</starttime>
+	<!--  This animation will start at 8 AM.  -->
+	<!--  We start with day at 8 AM. It will remain up for 10 hours.  -->
+	<static>
+		<duration>36000.0</duration>
+		<file>/usr/share/backgrounds/bluefin/WallPaper_SummerDay_Post.webp</file>
+	</static>
+	<!--  Day ended and starts to transition to night at 6 PM. The transition lasts for 2 hours, ending at 8 PM.  -->
+	<transition type="overlay">
+		<duration>7200.0</duration>
+		<from>/usr/share/backgrounds/bluefin/WallPaper_SummerDay_Post.webp</from>
+		<to>/usr/share/backgrounds/bluefin/WallPaper_SummerNight_Post.webp</to>
+	</transition>
+	<!--  It's 8 PM, we're showing the night till 6 AM.  -->
+	<static>
+		<duration>36000.0</duration>
+		<file>/usr/share/backgrounds/bluefin/WallPaper_SummerNight_Post.webp</file>
+	</static>
+	<!--  It's 6 AM, and we're starting to transition to day. Transition completes at 8 AM.  -->
+	<transition type="overlay">
+		<duration>7200.0</duration>
+		<from>/usr/share/backgrounds/bluefin/WallPaper_SummerNight_Post.webp</from>
+		<to>/usr/share/backgrounds/bluefin/WallPaper_SummerDay_Post.webp</to>
+	</transition>
+</background>

usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml

@@ -0,0 +1,33 @@
+<background>
+	<starttime>
+		<year>2023</year>
+		<month>04</month>
+		<day>18</day>
+		<hour>8</hour>
+		<minute>00</minute>
+		<second>00</second>
+	</starttime>
+	<!--  This animation will start at 8 AM.  -->
+	<!--  We start with day at 8 AM. It will remain up for 10 hours.  -->
+	<static>
+		<duration>36000.0</duration>
+		<file>/usr/share/backgrounds/bluefin/WallPaper_WinterDay_Post.webp</file>
+	</static>
+	<!--  Day ended and starts to transition to night at 6 PM. The transition lasts for 2 hours, ending at 8 PM.  -->
+	<transition type="overlay">
+		<duration>7200.0</duration>
+		<from>/usr/share/backgrounds/bluefin/WallPaper_WinterDay_Post.webp</from>
+		<to>/usr/share/backgrounds/bluefin/WallPaper_WinterNight_Post.webp</to>
+	</transition>
+	<!--  It's 8 PM, we're showing the night till 6 AM.  -->
+	<static>
+		<duration>36000.0</duration>
+		<file>/usr/share/backgrounds/bluefin/WallPaper_WinterNight_Post.webp</file>
+	</static>
+	<!--  It's 6 AM, and we're starting to transition to day. Transition completes at 8 AM.  -->
+	<transition type="overlay">
+		<duration>7200.0</duration>
+		<from>/usr/share/backgrounds/bluefin/WallPaper_WinterNight_Post.webp</from>
+		<to>/usr/share/backgrounds/bluefin/WallPaper_WinterDay_Post.webp</to>
+	</transition>
+</background>

usr/share/gnome-background-properties/bluefin-autumn-dynamic.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper deleted="false">
+    <name>Bluefin - Autumn Dynamic</name>
+    <filename>/usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml</filename>
+    <options>zoom</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#2A1413</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+</wallpapers>
+
+

usr/share/gnome-background-properties/bluefin-spring-dynamic.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper deleted="false">
+    <name>Bluefin - Spring Dynamic</name>
+    <filename>/usr/share/backgrounds/bluefin/bluefin-spring-dynamic.xml</filename>
+    <options>zoom</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#3A663F</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+</wallpapers>
+
+

usr/share/gnome-background-properties/bluefin-summer-dynamic.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper deleted="false">
+    <name>Bluefin - Summer Dynamic</name>
+    <filename>/usr/share/backgrounds/bluefin/bluefin-summer-dynamic.xml</filename>
+    <options>zoom</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#F99F53</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+</wallpapers>
+
+

usr/share/gnome-background-properties/bluefin-winter-dynamic.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper deleted="false">
+    <name>Bluefin - Summer Dynamic</name>
+    <filename>/usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml</filename>
+    <options>zoom</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#8198A7</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+</wallpapers>
+
+

usr/share/gnome-background-properties/chicken.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper deleted="false">
+    <name>Bluefin</name>
+    <filename>/usr/share/backgrounds/chicken.webp</filename>
+    <filename-dark>/usr/share/backgrounds/chicken.webp</filename-dark>
+    <options>zoom</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#5F7491</pcolor>
+    <scolor>#332829</scolor>
+  </wallpaper>
+</wallpapers>