From 3f26dd3b27f0da27a4b3e2dfbeb0149b6dbf49c9 Mon Sep 17 00:00:00 2001 From: Freddy Date: Sat, 10 Feb 2024 16:49:10 +0000 Subject: [PATCH] Recommend Fedora Atomic Desktops (#2393) Signed-off-by: Jonah Aragon Signed-off-by: Daniel Gray --- docs/desktop.md | 13 +++++++------ docs/tools.md | 4 ++-- .../assets/img/linux-desktop/fedora-silverblue.svg | 1 - .../{fedora-workstation.svg => fedora.svg} | 0 4 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 theme/assets/img/linux-desktop/fedora-silverblue.svg rename theme/assets/img/linux-desktop/{fedora-workstation.svg => fedora.svg} (100%) diff --git a/docs/desktop.md b/docs/desktop.md index a7fc0d06..22dea8c8 100644 --- a/docs/desktop.md +++ b/docs/desktop.md @@ -72,23 +72,24 @@ A large portion of [Arch Linux’s packages](https://reproducible.archlinux.org) ## Immutable Distributions -### Fedora Silverblue +### Fedora Atomic Desktops
-![Fedora Silverblue logo](assets/img/linux-desktop/fedora-silverblue.svg){ align=right } +![Fedora logo](assets/img/linux-desktop/fedora.svg){ align=right } -**Fedora Silverblue** is an immutable variant of Fedora with a strong focus on container workflows and the [GNOME](https://www.gnome.org/) desktop environment. If you prefer an environment other than GNOME, there are also other variants including [Kinoite](https://fedoraproject.org/kinoite/) (which comes with [KDE](https://kde.org/)) and [Sericea](https://fedoraproject.org/sericea/) (which comes with [Sway](https://swaywm.org/), a [Wayland](https://wayland.freedesktop.org)-only tiling window manager). We don't recommend [Onyx](https://fedoraproject.org/onyx/) at this time as it still [requires X11](https://buddiesofbudgie.org/blog/wayland). All of these variants follow the same release schedule as Fedora Workstation, benefiting from the same fast updates and staying very close to upstream. +**Fedora Atomic Desktops** are the immutable variants of Fedora with a strong focus on containerized workflows and Flatpak for desktop applications. All of these variants follow the same release schedule as Fedora Workstation, benefiting from the same fast updates and staying very close to upstream. -[:octicons-home-16: Homepage](https://fedoraproject.org/silverblue/){ .md-button .md-button--primary } -[:octicons-info-16:](https://docs.fedoraproject.org/en-US/fedora-silverblue/){ .card-link title=Documentation} +[:octicons-home-16: Homepage](https://fedoraproject.org/atomic-desktops/){ .md-button .md-button--primary } [:octicons-heart-16:](https://whatcanidoforfedora.org/){ .card-link title=Contribute }
-Silverblue and its variants differ from Fedora Workstation as they replace the [DNF](https://docs.fedoraproject.org/en-US/quick-docs/dnf/) package manager with a much more advanced alternative called [`rpm-ostree`](https://docs.fedoraproject.org/en-US/fedora/latest/system-administrators-guide/package-management/rpm-ostree/). The `rpm-ostree` package manager works by downloading a base image for the system, then overlaying packages over it in a [git](https://en.wikipedia.org/wiki/Git)-like commit tree. When the system is updated, a new base image is downloaded and the overlays will be applied to that new image. +The [Fedora Atomic Desktops](https://fedoramagazine.org/introducing-fedora-atomic-desktops/) come in a variety of flavors depending on the desktop environment you prefer, such as **Fedora Silverblue** (which comes with [GNOME](https://www.gnome.org/)), **Fedora Kinoite**, (which comes with [KDE](https://kde.org/)), **Fedora Sway Atomic**, or **Fedora Budgie Atomic**. However, we don't recommend the last of these as the Budgie desktop environment [still requires X11](https://buddiesofbudgie.org/blog/wayland). + +These operating systems differ from Fedora Workstation as they replace the [DNF](https://docs.fedoraproject.org/en-US/quick-docs/dnf/) package manager with a much more advanced alternative called [`rpm-ostree`](https://docs.fedoraproject.org/en-US/fedora/latest/system-administrators-guide/package-management/rpm-ostree/). The `rpm-ostree` package manager works by downloading a base image for the system, then overlaying packages over it in a [git](https://en.wikipedia.org/wiki/Git)-like commit tree. When the system is updated, a new base image is downloaded and the overlays will be applied to that new image. After the update is complete you will reboot the system into the new deployment. `rpm-ostree` keeps two deployments of the system so that you can easily rollback if something breaks in the new deployment. There is also the option to pin more deployments as needed. diff --git a/docs/tools.md b/docs/tools.md index 14b9b3a6..da148c66 100644 --- a/docs/tools.md +++ b/docs/tools.md @@ -456,10 +456,10 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b
- ![Qubes OS logo](assets/img/qubes/qubes_os.svg){ .twemoji } [Qubes OS (Xen VM Distribution)](desktop.md#qubes-os) -- ![Fedora logo](assets/img/linux-desktop/fedora-workstation.svg){ .twemoji } [Fedora Workstation](desktop.md#fedora-workstation) +- ![Fedora logo](assets/img/linux-desktop/fedora.svg){ .twemoji } [Fedora Workstation](desktop.md#fedora-workstation) - ![openSUSE Tumbleweed logo](assets/img/linux-desktop/opensuse-tumbleweed.svg){ .twemoji } [OpenSUSE Tumbleweed](desktop.md#opensuse-tumbleweed) - ![Arch logo](assets/img/linux-desktop/archlinux.svg){ .twemoji } [Arch Linux](desktop.md#arch-linux) -- ![Fedora Silverblue logo](assets/img/linux-desktop/fedora-silverblue.svg){ .twemoji } [Fedora Silverblue & Kinoite](desktop.md#fedora-silverblue) +- ![Fedora logo](assets/img/linux-desktop/fedora.svg){ .twemoji } [Fedora Atomic Desktops](desktop.md#fedora-atomic-desktops) - ![nixOS logo](assets/img/linux-desktop/nixos.svg){ .twemoji } [NixOS](desktop.md#nixos) - ![Whonix logo](assets/img/linux-desktop/whonix.svg){ .twemoji } [Whonix (Tor)](desktop.md#whonix) - ![Tails logo](assets/img/linux-desktop/tails.svg){ .twemoji } [Tails (Live Boot)](desktop.md#tails) diff --git a/theme/assets/img/linux-desktop/fedora-silverblue.svg b/theme/assets/img/linux-desktop/fedora-silverblue.svg deleted file mode 100644 index f741bfe7..00000000 --- a/theme/assets/img/linux-desktop/fedora-silverblue.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/theme/assets/img/linux-desktop/fedora-workstation.svg b/theme/assets/img/linux-desktop/fedora.svg similarity index 100% rename from theme/assets/img/linux-desktop/fedora-workstation.svg rename to theme/assets/img/linux-desktop/fedora.svg