From 3fd3ee510af083395c2e3c4419d283cdc499a299 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Tue, 22 Aug 2023 14:29:18 -0700
Subject: [PATCH] feat(deck): Switch bios updates to being default disabled,
 these will be enabled by Yafti at launch instead so they may be opted out of.
 chore(deck): Clean-up shortcut removal for wine/winetricks.

---
 Containerfile                                               | 6 +-----
 .../deck/shared/usr/share/ublue-os/firstboot/yafti.yml      | 5 +++++
 .../deck/shared/usr/share/ublue-os/just/custom.just         | 5 +++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Containerfile b/Containerfile
index 1d2d2a76..9f7ed525 100644
--- a/Containerfile
+++ b/Containerfile
@@ -309,9 +309,7 @@ RUN rpm-ostree install \
     ; fi
 
 # Cleanup & Finalize
-RUN rm /usr/share/applications/winetricks.desktop && \
-    rm /usr/share/applications/wine.desktop && \
-    rm /usr/share/applications/wine-*.desktop && \
+RUN rm /usr/share/applications/wine*.desktop && \
     ln -s /usr/bin/steamos-logger /usr/bin/steamos-info && \
     ln -s /usr/bin/steamos-logger /usr/bin/steamos-notice && \
     ln -s /usr/bin/steamos-logger /usr/bin/steamos-warning && \
@@ -342,8 +340,6 @@ RUN rm /usr/share/applications/winetricks.desktop && \
     systemctl enable jupiter-fan-control.service && \
     systemctl enable duperemove-weekly@$(systemd-escape /run/media/mmcblk0p1).timer && \
     systemctl enable vpower.service && \
-    systemctl enable jupiter-biosupdate.service && \
-    systemctl enable jupiter-controller-update.service && \
     systemctl enable ds-inhibit.service && \
     systemctl --global enable sdgyrodsu.service && \
     systemctl disable input-remapper.service && \
diff --git a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
index a4d04483..df24ab07 100644
--- a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -17,6 +17,11 @@ screens:
       show_terminal: true
       package_manager: yafti.plugin.run
       groups:
+        BIOS &amp; Firmware Updates:
+          description: Enables BIOS &amp; Firmware updates for Steam Deck hardware
+          default: true
+          packages:
+          - Enable Updates: just --unstable enable-deck-bios-firmware-updates
         BoilR:
           description: Adds games from various clients to Steam
           default: false
diff --git a/system_files/deck/shared/usr/share/ublue-os/just/custom.just b/system_files/deck/shared/usr/share/ublue-os/just/custom.just
index 9090f206..6916b3d0 100644
--- a/system_files/deck/shared/usr/share/ublue-os/just/custom.just
+++ b/system_files/deck/shared/usr/share/ublue-os/just/custom.just
@@ -252,6 +252,11 @@ unhide-grub:
     sudo grub2-mkconfig -o /boot/grub2/grub.cfg
   fi
 
+enable-deck-bios-firmware-updates:
+  #!/usr/bin/env bash
+  sudo systemctl enable jupiter-biosupdate.service
+  sudo systemctl enable jupiter-controller-update.service
+
 disable-deck-services:
   #!/usr/bin/env bash
   sudo systemctl disable --now jupiter-fan-control.service