From fd38d2706e422aa7a36e2852c27b41eb5154b1a4 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 8 Aug 2023 22:21:05 -0600 Subject: [PATCH 1/4] feat(user-setup): Add user Flathub repo --- system_files/desktop/shared/usr/bin/bazzite-user-setup | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup index 5279eeb2..6cd9d80f 100755 --- a/system_files/desktop/shared/usr/bin/bazzite-user-setup +++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup @@ -42,6 +42,12 @@ else fi fi +# Setup Flathub +if grep -qz 'fedora' <<< $(flatpak remotes); then + flatpak remote-delete fedora --force +fi +flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo + # Prevent future executions echo "Writing state file" -touch $HOME/.bazzite-configured \ No newline at end of file +touch $HOME/.bazzite-configured From c4f69ead455f9b7c18ad86def5848abf45ae4cb9 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 8 Aug 2023 22:27:34 -0600 Subject: [PATCH 2/4] feat(system-flatpak-install): Opt out of Fedora's third party repositories --- .../desktop/shared/usr/bin/ublue-flatpak-system-install | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install b/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install index a56aa9fe..c8eaa437 100755 --- a/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install +++ b/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install @@ -1,6 +1,11 @@ #!/usr/bin/env bash source /etc/default/bazzite +if grep -qz 'fedora' <<< $(flatpak remotes); then + /usr/lib/fedora-third-party/fedora-third-party-opt-out + /usr/bin/fedora-third-party disable +fi + if [[ -f '/etc/flatpak/install' ]]; then cat /etc/flatpak/install | while read line; do flatpak install --system --noninteractive flathub $line From 807cf62f780782e4bf635e35dca9fdc95e9bae0c Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 8 Aug 2023 22:31:59 -0600 Subject: [PATCH 3/4] chore(desktop): Remove Flatpak modifications Handled in setup scripts now --- .../shared/usr/share/ublue-os/firstboot/yafti.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml index 90e56786..0e90c7c4 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml +++ b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml @@ -78,19 +78,6 @@ screens: packages: - GreenWithEnvy (GPU Overclocking): flatpak install --user --noninteractive com.leinardi.gwe - Supergfxctl (Hybrid GPU Switching): just --unstable enable-supergfxctl - can-we-modify-your-flatpaks: - source: yafti.screen.consent - values: - title: Setting up Flathub - condition: - run: flatpak remotes --system | grep -q fedora - description: | - WARNING: This will modify your Flatpaks if you are rebasing! If you do not want to do this exit the installer. - actions: - - run: /usr/lib/fedora-third-party/fedora-third-party-opt-out - - run: /usr/bin/fedora-third-party disable - - run: flatpak remote-delete fedora --force - - run: flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo applications: source: yafti.screen.package values: From d07439112672600c829771ac407020580626eb7a Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 8 Aug 2023 22:33:10 -0600 Subject: [PATCH 4/4] chore(deck): Remove Flatpak modifications --- .../shared/usr/share/ublue-os/firstboot/yafti.yml | 13 ------------- 1 file changed, 13 deletions(-) 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 4831266f..046cc488 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 @@ -70,19 +70,6 @@ screens: default: false packages: - Switch SteamOS-BTRFS config to EXT4: sudo -A just --unstable switch-to-ext4 - can-we-modify-your-flatpaks: - source: yafti.screen.consent - values: - title: Setting up Flathub - condition: - run: flatpak remotes --system | grep -q fedora - description: | - WARNING: This will modify your Flatpaks if you are rebasing! If you do not want to do this exit the installer. - actions: - - run: /usr/lib/fedora-third-party/fedora-third-party-opt-out - - run: /usr/bin/fedora-third-party disable - - run: flatpak remote-delete fedora --force - - run: flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo applications: source: yafti.screen.package values: