Fixed order-of-operations issue on Framework, removed redundant remov…

…al in Toybox
BrodyB · Jul 19, 2024 · 65703da · 65703da
1 parent a4aa493
commit 65703da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/recipes/recipe-framework.yml b/recipes/recipe-framework.yml
@@ -20,8 +20,6 @@ modules:
     scripts:
       - removeBluefinWallpapers.sh
 
-  - from-file: common-modules.yml
-
   - type: rpm-ostree
     remove:
       # - firefox
@@ -32,4 +30,6 @@ modules:
       - gnome-classic-session
       - gnome-classic-session-xsession
 
+
+  - from-file: common-modules.yml
   - type: signing # this sets up the proper policy & signing files for signed images to work fully
diff --git a/recipes/recipe-toybox.yml b/recipes/recipe-toybox.yml
@@ -8,20 +8,14 @@ base-image: ghcr.io/ublue-os/bazzite-gnome-nvidia
 image-version: stable
 
 modules:
-  # - type: gschema-overrides
-  #   include:
-  #     - zz1-desktop.gschema.override
+  - type: gschema-overrides
+    include:
+      - zz1-desktop.gschema.override
 
   - type: files
     files:
       - usr: /desktop-usr
 
-  - type: default-flatpaks
-    notify: true # Send notification after install/uninstall is finished (true/false)
-    system:
-      remove:
-        - org.mozilla.firefox
-
   - from-file: common-modules.yml
 
   - type: signing # this sets up the proper policy & signing files for signed images to work fully