From b81010b55b36fb249a08b93e4161103879de68bf Mon Sep 17 00:00:00 2001
From: zelikos <pcsikos@zelikos.dev>
Date: Sun, 22 Dec 2024 12:32:17 -0500
Subject: [PATCH 1/2] fix(bazzite): Overwrite Bazzite's brew.fish with
 BlueBuild module's

Opening a terminal with fish as the shell has significant startup lag
with Bazzite's brew.fish, so we're replacing it with BlueBuild's
version.
---
 .../usr/share/fish/vendor_conf.d/brew.fish          | 13 +++++++++++++
 recipes/gnome/zeliblue-bazzite.yml                  |  5 +++++
 2 files changed, 18 insertions(+)
 create mode 100644 files/system_files/overrides/usr/share/fish/vendor_conf.d/brew.fish

diff --git a/files/system_files/overrides/usr/share/fish/vendor_conf.d/brew.fish b/files/system_files/overrides/usr/share/fish/vendor_conf.d/brew.fish
new file mode 100644
index 00000000..396a2376
--- /dev/null
+++ b/files/system_files/overrides/usr/share/fish/vendor_conf.d/brew.fish
@@ -0,0 +1,13 @@
+#!/usr/bin/env fish
+#shellcheck disable=all
+if status --is-interactive
+    if [ -d /home/linuxbrew/.linuxbrew ]
+        eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+        if test -d (brew --prefix)/share/fish/completions
+            set -p fish_complete_path (brew --prefix)/share/fish/completions
+        end
+        if test -d (brew --prefix)/share/fish/vendor_completions.d
+            set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d
+        end
+    end
+end
diff --git a/recipes/gnome/zeliblue-bazzite.yml b/recipes/gnome/zeliblue-bazzite.yml
index ab528df3..1b4b2711 100644
--- a/recipes/gnome/zeliblue-bazzite.yml
+++ b/recipes/gnome/zeliblue-bazzite.yml
@@ -21,6 +21,11 @@ modules:
   - from-file: common/common-flatpaks.yml
   - from-file: common/common-fonts.yml
 
+  - type: files
+    files:
+      - source: system_files/overrides
+        destination: /
+
   - type: script
     scripts:
       - image-info.sh

From 89be57c0188f01af06caa896fb9815202399961c Mon Sep 17 00:00:00 2001
From: zelikos <pcsikos@zelikos.dev>
Date: Sun, 22 Dec 2024 12:40:50 -0500
Subject: [PATCH 2/2] refactor(testing): Use common-base instead of separate
 module calls

We don't need the separate calls in Zeliblue Testing anymore.
---
 recipes/gnome/zeliblue-testing.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/recipes/gnome/zeliblue-testing.yml b/recipes/gnome/zeliblue-testing.yml
index fc6269ea..9545ba8b 100644
--- a/recipes/gnome/zeliblue-testing.yml
+++ b/recipes/gnome/zeliblue-testing.yml
@@ -17,13 +17,7 @@ modules:
       - ARG ZELIBLUE_PRETTY_NAME="Zeliblue"
       - ARG ZELIBLUE_IMAGE_TAG=testing
 
-  - from-file: common/common-bling.yml
-  - from-file: common/common-files.yml
-  - from-file: common/common-flatpaks.yml
-  - from-file: common/common-fonts.yml
-  - from-file: common/common-packages.yml
-  - from-file: common/common-scripts.yml
-  - from-file: common/common-modules.yml
+  - from-file: common/common-base.yml
 
   - from-file: testing/testing-kernel.yml
   - from-file: testing/testing-packages.yml