chore(yafti): Yafti reorganization

system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml

@@ -6,10 +6,11 @@ screens:
   first-screen:
     source: yafti.screen.title
     values:
-      title: "Welcome to Bazzite (Steam Deck & HTPC Edition)"
+      title: "Welcome to Bazzite (Handheld & HTPC Edition)"
       icon: "/usr/share/ublue-os/bazzite/logo.svg"
       description: |
-        Configure your system to get started. This utility can be re-opened at any time, so don't feel like you have to get it perfect your first go-through.
+        Configure your system to get started. This utility can be re-opened at any time, so don't feel like you have to get it perfect your first go-through.  This may take a long time to install applications and you can view the progress by pressing the "Show Console" button.  If you did not select anything, then press "Next" twice to continue.
+  configure-bazzite:
   configure-bazzite:
     source: yafti.screen.package
     values:
@@ -46,7 +47,7 @@ screens:
           - Autostart Sunshine: ujust setup-sunshine autostart
         Hide GRUB Menu:
           description: |
-            NOTE: Press the escape key before boot to show the menu
+            NOTE: Press the Escape key before boot to show the menu
           default: true
           packages:
           - Hide GRUB: sudo -A ujust configure-grub hide
@@ -125,35 +126,58 @@ screens:
           - Microsoft Edge: com.microsoft.Edge
           - Opera: com.opera.Opera
           - Vivaldi: com.vivaldi.Vivaldi
-        Gaming:
-          description: "Rock and Stone!"
+        Communication:
+          description: Voice & text chat
+          default: false
+          packages:
+          - Discord: com.discordapp.Discord
+          - Element: im.riot.Riot
+          - Mumble: info.mumble.Mumble
+          - TeamSpeak: com.teamspeak.TeamSpeak
+          - Slack: com.slack.Slack
+        Gaming Frontends and Tools:
+          description: For all your gaming needs
           default: false
           packages:
           - BoilR: io.github.philipk.boilr
           - Bottles: com.usebottles.bottles
-          - Chiaki4Deck (PlayStation Remote Play): io.github.streetpea.Chiaki4deck
-          - Discord (Discover Overlay Included): com.discordapp.Discord
-          - DOSBox Staging: io.github.dosbox-staging
+          - DOSBox-X: com.dosbox_x.DOSBox-X
           - GeForce NOW Electron: io.github.hmlendea.geforcenow-electron
-          - Greenlight: io.github.unknownskl.greenlight
           - Heroic Games Launcher (GOG & Epic): com.heroicgameslauncher.hgl
           - itch: io.itch.itch
           - ludusavi (Game Save Backup): com.github.mtkennerly.ludusavi
           - Minecraft (Prism Launcher): org.prismlauncher.PrismLauncher
           - Minecraft Bedrock Launcher: io.mrarm.mcpelauncher
+          - XIV Launcher (Final Fantasy XIV): dev.goats.xivlauncher
+        Game Streaming:
+          description: Cloud not-so-native computing
+          default: false
+          packages:
+          - Chiaki4Deck (PlayStation Remote Play): io.github.streetpea.Chiaki4deck
+          - GeForce NOW Electron: io.github.hmlendea.geforcenow-electron
+          - Greenlight: io.github.unknownskl.greenlight
           - Moonlight: com.moonlight_stream.Moonlight
-          - Mumble: info.mumble.Mumble
-          - OpenMW: org.openmw.OpenMW
+          - Steam Link: com.valvesoftware.SteamLink
+        Free Games:
+          description: Freebies
+          default: false
+          packages:
+          - Battle for Wesnoth: org.wesnoth.Wesnoth
+          - Beyond All Reason: info.beyondallreason.bar
+          - Cave Story NX: com.gitlab.coringao.cavestory-nx
+          - Freedoom 1: io.github.freedoom.Phase1
+          - Mindustry: com.github.Anuken.Mindustry
+          - Minetest: net.minetest.Minetest
+          - OpenRA: net.openra.OpenRA
+          - OpenRCT2: io.openrct2.OpenRCT2
+          - OpenTTD: org.openttd.OpenTTD
           - osu: sh.ppy.osu
-          - Parsec: com.parsecgaming.parsec
           - Space Cadet Pinball: com.github.k4zmu2a.spacecadetpinball
           - Sonic Robo Blast 2: org.srb2.SRB2
           - Sonic Robo Blast 2 Kart: org.srb2.SRB2Kart
-          - Steam Link: com.valvesoftware.SteamLink
           - SuperTux: org.supertuxproject.SuperTux
           - SuperTuxKart: net.supertuxkart.SuperTuxKart
-          - TeamSpeak: com.teamspeak.TeamSpeak
-          - XIV Launcher (Final Fantasy XIV): dev.goats.xivlauncher
+          - Xonotic: org.xonotic.Xonotic
         Emulation:
           description: Play games like it's 1972 (Leave these all unchecked if you're planning to use EmuDeck)
           default: false
@@ -175,28 +199,14 @@ screens:
           - Ryujinx: org.ryujinx.Ryujinx
           - ScummVM: org.scummvm.ScummVM
           - Snes9x: com.snes9x.Snes9x
-          - Stella: io.github.stella_emu.Stella
           - xemu: app.xemu.xemu
-        Streaming:
-          description: Stream to the Internet
-          default: false
-          packages:
-          - OBS Studio: com.obsproject.Studio
-          - Boatswain for Streamdeck: com.feaneron.Boatswain
-        Music:
-          description: "Rock and Roll!"
-          default: false
-          packages:
-          - Cider (Apple Music Client): sh.cider.Cider
-          - Spotify: com.spotify.Client
-          - Strawberry Music Player: org.strawberrymusicplayer.strawberry
-          - Tidal-hifi: com.mastermindzh.tidal-hifi
-        Office and Productivity:
+        Multi-Media, Office, and Productivity:
           description: Bow to Capitalism
           default: false
           packages:
           - Ardour: org.ardour.Ardour
           - Blender: org.blender.Blender
+          - Cider (Apple Music): sh.cider.Cider
           - darktable: org.darktable.Darktable
           - GIMP: org.gimp.GIMP
           - Inkscape: org.inkscape.Inkscape
@@ -207,32 +217,37 @@ screens:
           - Obsidian: md.obsidian.Obsidian
           - OnlyOffice: org.onlyoffice.desktopeditors
           - Planify: io.github.alainm23.planify
-          - Slack: com.slack.Slack
+          - Spotify: com.spotify.Client
           - Standard Notes: org.standardnotes.standardnotes
+          - Strawberry Music Player: org.strawberrymusicplayer.strawberry
           - Tenacity: org.tenacityaudio.Tenacity
+          - Tidal-hifi: com.mastermindzh.tidal-hifi
           - Thunderbird Email: org.mozilla.Thunderbird
+          - VLC: org.videolan.VLC
           - Xournal++: com.github.xournalpp.xournalpp
         Utilities and System Tools:
-          description: Helpful tools
+          description: Helpful utilties for your device
           default: false
           packages:
           - AppImage Pool: io.github.prateekmedia.appimagepool
           - Barrier: com.github.debauchee.barrier
+          - Boatswain for Streamdeck: com.feaneron.Boatswain
           - Bitwarden: com.bitwarden.desktop
           - Calibre: com.calibre_ebook.calibre
           - DejaDup: org.gnome.DejaDup
+          - Easy Effects: com.github.wwmm.easyeffects
           - Fedora Media Writer: org.fedoraproject.MediaWriter
           - Gradience: com.github.GradienceTeam.Gradience
+          - JamesDSP: me.timschneeberger.jdsp4linux
           - KeePassXC: org.keepassxc.KeePassXC
           - Metadata Cleaner: fr.romainvigier.MetadataCleaner
           - OpenRGB: org.openrgb.OpenRGB
           - Pika Backup: org.gnome.World.PikaBackup
           - PinApp: io.github.fabrialberio.pinapp
+          - Pods: com.github.marhkb.Pods
           - qBittorrent: org.qbittorrent.qBittorrent
-          - Resources: net.nokyan.Resources
           - SaveDesktop: io.github.vikdevelop.SaveDesktop
           - Syncthing: com.github.zocker_160.SyncThingy
-          - VLC: org.videolan.VLC
   final-screen:
     source: yafti.screen.title
     values:
@@ -242,12 +257,12 @@ screens:
       - "Install More Applications":
           run: /usr/bin/plasma-discover
       - "Documentation":
-          run: /usr/bin/xdg-open https://universal-blue.discourse.group/docs?category=5
+          run: /usr/bin/xdg-open https://docs.bazzite.gg
       - "Forums":
           run: /usr/bin/xdg-open https://universal-blue.discourse.group/c/bazzite/5
       - "Join the Discord Community":
           run: /usr/bin/xdg-open https://discord.gg/XjG48C7VHx
       - "Reboot now":
           run: systemctl reboot
       description: |
-        Thank you for trying Bazzite (Steam Deck Edition). Please reboot to apply changes made by this setup utility.
+        Thank you for trying Bazzite (Steam Deck / HTPC / Handheld-PC Edition). Please reboot to apply changes made by this setup utility.

system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml

@@ -9,7 +9,8 @@ screens:
       title: "Welcome to Bazzite"
       icon: "/usr/share/ublue-os/bazzite/logo.svg"
       description: |
-        Configure your system to get started. This utility can be re-opened at any time, so don't feel like you have to get it perfect your first go-through.
+        Configure your system to get started. This utility can be re-opened at any time, so don't feel like you have to get it perfect your first go-through.  This may take a long time to install applications and you can view the progress by pressing the "Show Console" button.  If you did not select anything, then press "Next" twice to continue.
+  configure-bazzite:
   configure-bazzite:
     source: yafti.screen.package
     values:
@@ -76,7 +77,7 @@ screens:
   amd-additions:
     source: yafti.screen.package
     values:
-      title: AMD Additions
+      title: AMD/Intel Additions
       condition:
         run: grep -qv 'nvidia' <<< $(jq -r '."image-flavor"' < /usr/share/ublue-os/image-info.json)
       show_terminal: true
@@ -114,35 +115,58 @@ screens:
           - Microsoft Edge: com.microsoft.Edge
           - Opera: com.opera.Opera
           - Vivaldi: com.vivaldi.Vivaldi
-        Gaming:
-          description: "Rock and Stone!"
+        Communication:
+          description: Voice and text chat
+          default: false
+          packages:
+          - Discord: com.discordapp.Discord
+	  - Element: im.riot.Riot
+          - Mumble: info.mumble.Mumble
+          - TeamSpeak: com.teamspeak.TeamSpeak
+          - Slack: com.slack.Slack
+        Gaming Frontends and Tools:
+          description: For all your gaming needs
           default: false
           packages:
           - BoilR: io.github.philipk.boilr
           - Bottles: com.usebottles.bottles
-          - Chiaki (PlayStation Remote Play): re.chiaki.Chiaki
-          - Discord: com.discordapp.Discord
-          - DOSBox Staging: io.github.dosbox-staging
-          - GeForce NOW Electron: io.github.hmlendea.geforcenow-electron
-          - Greenlight: io.github.unknownskl.greenlight
-          - Heroic Games Launcher (GOG &amp; Epic): com.heroicgameslauncher.hgl
+          - DOSBox-X: com.dosbox_x.DOSBox-X
+          - Heroic Games Launcher (Epic): com.heroicgameslauncher.hgl
           - itch: io.itch.itch
           - ludusavi (Game Save Backup): com.github.mtkennerly.ludusavi
           - Minecraft (Prism Launcher): org.prismlauncher.PrismLauncher
           - Minecraft Bedrock Launcher: io.mrarm.mcpelauncher
-          - Moonlight: com.moonlight_stream.Moonlight
-          - Mumble: info.mumble.Mumble
           - OpenMW: org.openmw.OpenMW
+          - XIV Launcher (Final Fantasy XIV): dev.goats.xivlauncher
+        Game Streaming:
+          description: Cloud not-so-native computing
+          default: false
+          packages:
+          - Chiaki (PlayStation Remote Play): re.chiaki.Chiaki
+          - GeForce NOW Electron: io.github.hmlendea.geforcenow-electron
+          - Greenlight: io.github.unknownskl.greenlight
+          - Moonlight: com.moonlight_stream.Moonlight
+          - Steam Link: com.valvesoftware.SteamLink
+        Free Games:
+          description: Freebies
+          default: false
+          packages:
+	  - Battle for Wesnoth: org.wesnoth.Wesnoth
+   	  - Beyond All Reason: info.beyondallreason.bar
+          - Cave Story NX: com.gitlab.coringao.cavestory-nx
+	  - Freedoom 1: io.github.freedoom.Phase1
+	  - Mindustry: com.github.Anuken.Mindustry
+	  - Minetest: net.minetest.Minetest
+	  - OpenRA: net.openra.OpenRA
+	  - OpenRCT2: io.openrct2.OpenRCT2
+	  - OpenTTD: org.openttd.OpenTTD
           - osu: sh.ppy.osu
-          - Parsec: com.parsecgaming.parsec
           - Space Cadet Pinball: com.github.k4zmu2a.spacecadetpinball
           - Sonic Robo Blast 2: org.srb2.SRB2
           - Sonic Robo Blast 2 Kart: org.srb2.SRB2Kart
-          - Steam Link: com.valvesoftware.SteamLink
           - SuperTux: org.supertuxproject.SuperTux
           - SuperTuxKart: net.supertuxkart.SuperTuxKart
-          - TeamSpeak: com.teamspeak.TeamSpeak
-          - XIV Launcher (Final Fantasy XIV): dev.goats.xivlauncher
+	  - Xonotic: org.xonotic.Xonotic
         Emulation:
           description: Play games like it's 1972
           default: false
@@ -164,28 +188,14 @@ screens:
           - Ryujinx: org.ryujinx.Ryujinx
           - ScummVM: org.scummvm.ScummVM
           - Snes9x: com.snes9x.Snes9x
-          - Stella: io.github.stella_emu.Stella
           - xemu: app.xemu.xemu
-        Streaming:
-          description: Stream to the Internet
-          default: false
-          packages:
-          - OBS Studio: com.obsproject.Studio
-          - Boatswain for Streamdeck: com.feaneron.Boatswain
-        Music:
-          description: "Rock and Roll!"
-          default: false
-          packages:
-          - Cider (Apple Music Client): sh.cider.Cider
-          - Spotify: com.spotify.Client
-          - Strawberry Music Player: org.strawberrymusicplayer.strawberry
-          - Tidal-hifi: com.mastermindzh.tidal-hifi
-        Office and Productivity:
+        Multi-Media, Office, and Productivity:
           description: Bow to Capitalism
           default: false
           packages:
           - Ardour: org.ardour.Ardour
           - Blender: org.blender.Blender
+          - Cider (Apple Music): sh.cider.Cider
           - darktable: org.darktable.Darktable
           - GIMP: org.gimp.GIMP
           - Inkscape: org.inkscape.Inkscape
@@ -196,17 +206,21 @@ screens:
           - Obsidian: md.obsidian.Obsidian
           - OnlyOffice: org.onlyoffice.desktopeditors
           - Planify: io.github.alainm23.planify
-          - Slack: com.slack.Slack
+          - Spotify: com.spotify.Client
           - Standard Notes: org.standardnotes.standardnotes
+          - Strawberry Music Player: org.strawberrymusicplayer.strawberry
           - Tenacity: org.tenacityaudio.Tenacity
+          - Tidal-hifi: com.mastermindzh.tidal-hifi
           - Thunderbird Email: org.mozilla.Thunderbird
+          - VLC: org.videolan.VLC		  
           - Xournal++: com.github.xournalpp.xournalpp
         Utilities and System Tools:
-          description: Helpful tools
+          description: Helpful utilties for your device
           default: false
           packages:
           - AppImage Pool: io.github.prateekmedia.appimagepool
           - Barrier: com.github.debauchee.barrier
+          - Boatswain for Streamdeck: com.feaneron.Boatswain
           - Bitwarden: com.bitwarden.desktop
           - Calibre: com.calibre_ebook.calibre
           - DejaDup: org.gnome.DejaDup
@@ -219,11 +233,10 @@ screens:
           - OpenRGB: org.openrgb.OpenRGB
           - Pika Backup: org.gnome.World.PikaBackup
           - PinApp: io.github.fabrialberio.pinapp
+	  - Pods: com.github.marhkb.Pods
           - qBittorrent: org.qbittorrent.qBittorrent
-          - Resources: net.nokyan.Resources
           - SaveDesktop: io.github.vikdevelop.SaveDesktop
           - Syncthing: com.github.zocker_160.SyncThingy
-          - VLC: org.videolan.VLC
   final-screen:
     source: yafti.screen.title
     values:
@@ -233,7 +246,7 @@ screens:
       - "Install More Applications":
           run: /usr/bin/plasma-discover
       - "Documentation":
-          run: /usr/bin/xdg-open https://universal-blue.discourse.group/docs?category=5
+          run: /usr/bin/xdg-open https://docs.bazzite.gg
       - "Forums":
           run: /usr/bin/xdg-open https://universal-blue.discourse.group/c/bazzite/5
       - "Join the Discord Community":