chore: Zeliblue Bazzite fixes (#286)

zelikos · Dec 22, 2024 · 6993497 · 6993497
2 parents 6365d0f + 89be57c
commit 6993497
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
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
@@ -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
@@ -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

diff --git 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