From 17c6889e5448fc9cba29b9cd319d7be9222cd9d2 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Sun, 21 Apr 2024 16:03:20 -0700
Subject: [PATCH] chore: Move flatpak lists to installer / chore: Fix fastfetch
 aliases, including under fish.

---
 .github/workflows/build_iso.yml                            | 4 ++--
 {scripts => installer}/gnome_flatpaks/flatpaks             | 0
 {scripts => installer}/kde_flatpaks/flatpaks               | 0
 .../desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh   | 1 +
 .../desktop/shared/usr/share/ublue-os/just/80-bazzite.just | 2 +-
 .../usr/share/fish/vendor_conf.d/bazzite-neofetch.fish     | 7 ++++---
 6 files changed, 8 insertions(+), 6 deletions(-)
 rename {scripts => installer}/gnome_flatpaks/flatpaks (100%)
 rename {scripts => installer}/kde_flatpaks/flatpaks (100%)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 86ec9b9c..87e95233 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -71,10 +71,10 @@ jobs:
         id: generate-flatpak-dir-shortname
         shell: bash
         run: |
-          FLATPAK_DIR_SHORTNAME="scripts/kde_flatpaks"
+          FLATPAK_DIR_SHORTNAME="installer/kde_flatpaks"
 
           if [[ "${{ matrix.image_name }}" =~ "gnome" ]]; then
-            FLATPAK_DIR_SHORTNAME="scripts/gnome_flatpaks"
+            FLATPAK_DIR_SHORTNAME="installer/gnome_flatpaks"
           fi
 
           echo "flatpak-dir-shortname=${FLATPAK_DIR_SHORTNAME}" >> $GITHUB_OUTPUT
diff --git a/scripts/gnome_flatpaks/flatpaks b/installer/gnome_flatpaks/flatpaks
similarity index 100%
rename from scripts/gnome_flatpaks/flatpaks
rename to installer/gnome_flatpaks/flatpaks
diff --git a/scripts/kde_flatpaks/flatpaks b/installer/kde_flatpaks/flatpaks
similarity index 100%
rename from scripts/kde_flatpaks/flatpaks
rename to installer/kde_flatpaks/flatpaks
diff --git a/system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh b/system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh
index 23cebbe9..7496a7a9 100755
--- a/system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh
+++ b/system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh
@@ -1,3 +1,4 @@
 alias neofetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc'
 alias neowofetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc'
 alias hyfetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc'
+alias fastfetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc'
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
index 2b3c52b0..93d90f3d 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
@@ -27,7 +27,7 @@ _install-system-flatpaks:
     else
         FLATPAKS="kde_flatpaks/flatpaks"
     fi
-    FLATPAK_LIST="$(curl https://raw.githubusercontent.com/ublue-os/bazzite/main/scripts/${FLATPAKS} | tr '\n' ' ')"
+    FLATPAK_LIST="$(curl https://raw.githubusercontent.com/ublue-os/bazzite/main/installer/${FLATPAKS} | tr '\n' ' ')"
     flatpak --system -y install ${FLATPAK_LIST}
 
 # Install Bazzite's Steam Game Mode Startup Video
diff --git a/system_files/overrides/usr/share/fish/vendor_conf.d/bazzite-neofetch.fish b/system_files/overrides/usr/share/fish/vendor_conf.d/bazzite-neofetch.fish
index 4c3b2687..7496a7a9 100644
--- a/system_files/overrides/usr/share/fish/vendor_conf.d/bazzite-neofetch.fish
+++ b/system_files/overrides/usr/share/fish/vendor_conf.d/bazzite-neofetch.fish
@@ -1,3 +1,4 @@
-alias neofetch='/usr/bin/neowofetch --source /usr/share/ublue-os/bazzite/logo.txt --ascii_colors 12 7 13 --config /usr/share/ublue-os/bazzite/neofetch.conf --package_separate off'
-alias neowofetch='/usr/bin/neowofetch --source /usr/share/ublue-os/bazzite/logo.txt --ascii_colors 12 7 13 --config /usr/share/ublue-os/bazzite/neofetch.conf --package_separate off'
-alias hyfetch='/usr/bin/hyfetch --ascii-file /usr/share/ublue-os/bazzite/logo.txt'
+alias neofetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc'
+alias neowofetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc'
+alias hyfetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc'
+alias fastfetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc'