From ccd677c22bc7f9754716ef9477ea4a42afe92a20 Mon Sep 17 00:00:00 2001
From: Chris Lauretano <1905121+lauretano@users.noreply.github.com>
Date: Sat, 9 Nov 2024 09:41:14 -0500
Subject: [PATCH 1/5] feat: potentially a full fix to running dracut during
 build to get apple_bce module to run for LUKS

---
 .../system/usr/lib/dracut/dracut.conf.d/10-t2-apple-bce.conf  | 1 +
 recipes/common/common-t2-enablement-f41.yml                   | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 files/system/usr/lib/dracut/dracut.conf.d/10-t2-apple-bce.conf

diff --git a/files/system/usr/lib/dracut/dracut.conf.d/10-t2-apple-bce.conf b/files/system/usr/lib/dracut/dracut.conf.d/10-t2-apple-bce.conf
new file mode 100644
index 0000000..5620b07
--- /dev/null
+++ b/files/system/usr/lib/dracut/dracut.conf.d/10-t2-apple-bce.conf
@@ -0,0 +1 @@
+force_drivers+=" apple_bce snd_pcm snd"
\ No newline at end of file
diff --git a/recipes/common/common-t2-enablement-f41.yml b/recipes/common/common-t2-enablement-f41.yml
index 8782e4b..5ba68b5 100644
--- a/recipes/common/common-t2-enablement-f41.yml
+++ b/recipes/common/common-t2-enablement-f41.yml
@@ -28,3 +28,7 @@ modules:
       # using asahi-installer fork to package for use in fedora
       # it's hacky <3
       - apple-bcm-firmware.sh
+
+  - type: script
+    snippets: 
+      - "set -x; kver=$(cd /usr/lib/modules && echo *); dracut -vf /usr/lib/modules/$kver/initramfs.img $kver"

From 4fa5f15829148a668a9df6bd442eb365de165908 Mon Sep 17 00:00:00 2001
From: Chris Lauretano <1905121+lauretano@users.noreply.github.com>
Date: Sat, 9 Nov 2024 09:41:49 -0500
Subject: [PATCH 2/5] feat: re-added hyprland to the kansei spin

---
 files/system/hyprland/etc/environment         |  2 ++
 .../share/wayland-sessions/hyprland.desktop   |  5 ++++
 files/system/hyprland/usr/bin/starthyprland   | 13 ++++++++++
 recipes/common/common-apps-hyprland.yml       | 24 +++++++++++++++++++
 recipes/common/common-files-hyprland.yml      |  6 +++++
 recipes/t2-atomic-kansei.yml                  | 12 +++++-----
 6 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 files/system/hyprland/etc/environment
 create mode 100644 files/system/hyprland/usr/bin/share/wayland-sessions/hyprland.desktop
 create mode 100644 files/system/hyprland/usr/bin/starthyprland
 create mode 100644 recipes/common/common-apps-hyprland.yml
 create mode 100644 recipes/common/common-files-hyprland.yml

diff --git a/files/system/hyprland/etc/environment b/files/system/hyprland/etc/environment
new file mode 100644
index 0000000..b85d5f3
--- /dev/null
+++ b/files/system/hyprland/etc/environment
@@ -0,0 +1,2 @@
+GTK_THEME=Adwaita:dark
+QT_STYLE_OVERRIDE=adwaita-dark
\ No newline at end of file
diff --git a/files/system/hyprland/usr/bin/share/wayland-sessions/hyprland.desktop b/files/system/hyprland/usr/bin/share/wayland-sessions/hyprland.desktop
new file mode 100644
index 0000000..bb824cb
--- /dev/null
+++ b/files/system/hyprland/usr/bin/share/wayland-sessions/hyprland.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Hyprland
+Comment=An intelligent dynamic tiling Wayland compositor
+Exec=/usr/bin/starthyprland
+Type=Application
\ No newline at end of file
diff --git a/files/system/hyprland/usr/bin/starthyprland b/files/system/hyprland/usr/bin/starthyprland
new file mode 100644
index 0000000..f3cb578
--- /dev/null
+++ b/files/system/hyprland/usr/bin/starthyprland
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -oue pipefail
+
+
+hyprland_conf="$HOME/.config/hypr/hyprland.conf"
+base="/usr/share/hyprland/hyprland.conf"
+
+if [ -f "$hyprland_conf" ]; then
+    Hyprland -c "$hyprland_conf"
+else
+    Hyprland -c "$base"
+fi
\ No newline at end of file
diff --git a/recipes/common/common-apps-hyprland.yml b/recipes/common/common-apps-hyprland.yml
new file mode 100644
index 0000000..47a122c
--- /dev/null
+++ b/recipes/common/common-apps-hyprland.yml
@@ -0,0 +1,24 @@
+modules:
+  - type: rpm-ostree
+    install:
+      - hyprland
+      - waybar
+      - xdg-desktop-portal-hyprland
+      - hyprpaper
+      - hyprlock
+      - hypridle
+      - hyprpicker
+      - grim
+      - slurp
+      - swaync
+      - wlogout
+      
+  - type: rpm-ostree
+    repos:
+      - https://copr.fedorainfracloud.org/coprs/erikreider/SwayNotificationCenter/repo/fedora-%OS_VERSION%/erikreider-SwayNotificationCenter-fedora-%OS_VERSION%.repo
+    install:
+      - SwayNotificationCenter
+      
+  - type: script
+    snippets: 
+      #- "sed -i '/^UseIn/ s/$/,sway/' /usr/share/xdg-desktop-portal/portals/gnome-keyring.portal"
diff --git a/recipes/common/common-files-hyprland.yml b/recipes/common/common-files-hyprland.yml
new file mode 100644
index 0000000..a70ab1c
--- /dev/null
+++ b/recipes/common/common-files-hyprland.yml
@@ -0,0 +1,6 @@
+type: files
+files:
+  - source: system/hyprland/etc
+    destination: /etc
+  - source: system/hyprland/usr
+    destination: /usr
\ No newline at end of file
diff --git a/recipes/t2-atomic-kansei.yml b/recipes/t2-atomic-kansei.yml
index e3e4335..ca8bd99 100644
--- a/recipes/t2-atomic-kansei.yml
+++ b/recipes/t2-atomic-kansei.yml
@@ -12,18 +12,18 @@ image-version: 41
 modules:
   - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
   - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
-  #- from-file: common/common-apps-gnome.yml
-  - from-file: common/common-apps-cosmic.yml
+  - from-file: common/common-apps-hyprland.yml
+  - from-file: common/common-apps-plasma.yml
   - from-file: common/common-apps.yml #installs apps common across all the t2 editions
   - from-file: common/common-apps-wayland.yml
   - from-file: common/common-apps-river.yml
-  - from-file: common/common-apps-sway.yml
+  #- from-file: common/common-apps-sway.yml
   - from-file: common/common-kansei.yml
   - from-file: common/common-files.yml
-  #- from-file: common/common-files-gnome.yml
-  #- from-file: common/common-files-cosmic.yml
+  - from-file: common/common-files-hyprland.yml
+  - from-file: common/common-files-plasma.yml
   - from-file: common/common-files-river.yml
-  - from-file: common/common-files-sway.yml
+  #- from-file: common/common-files-sway.yml
 
   - type: script
     snippets: 

From 1a553e4cf0e4f9bab2196ee940e79c36d47e9bf2 Mon Sep 17 00:00:00 2001
From: Chris Lauretano <1905121+lauretano@users.noreply.github.com>
Date: Sat, 9 Nov 2024 10:10:25 -0500
Subject: [PATCH 3/5] fix: might fix kansei image build

---
 files/scripts/t2-apple-bce.sh               | 10 ++++++++++
 recipes/common/common-t2-enablement-f41.yml |  2 +-
 recipes/common/common-t2-kernel.yml         |  5 +++--
 recipes/t2-atomic-kansei.yml                | 11 ++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 files/scripts/t2-apple-bce.sh

diff --git a/files/scripts/t2-apple-bce.sh b/files/scripts/t2-apple-bce.sh
new file mode 100644
index 0000000..c39286e
--- /dev/null
+++ b/files/scripts/t2-apple-bce.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# Tell this script to exit if there are any errors.
+# You should have this in every custom script, to ensure that your completed
+# builds actually ran successfully without any errors!
+set -oue pipefail
+
+echo 'T2-Atomic: Kernel Post-Install: Running Dracut to load apple_bce module at early boot'
+
+set -x; kver=$(cd /usr/lib/modules && echo *); dracut -vf /usr/lib/modules/$kver/initramfs.img $kver
diff --git a/recipes/common/common-t2-enablement-f41.yml b/recipes/common/common-t2-enablement-f41.yml
index 5ba68b5..1c3289b 100644
--- a/recipes/common/common-t2-enablement-f41.yml
+++ b/recipes/common/common-t2-enablement-f41.yml
@@ -31,4 +31,4 @@ modules:
 
   - type: script
     snippets: 
-      - "set -x; kver=$(cd /usr/lib/modules && echo *); dracut -vf /usr/lib/modules/$kver/initramfs.img $kver"
+      #- "set -x; kver=$(cd /usr/lib/modules && echo *); dracut -vf /usr/lib/modules/$kver/initramfs.img $kver"
diff --git a/recipes/common/common-t2-kernel.yml b/recipes/common/common-t2-kernel.yml
index 1c325dd..44adf1b 100644
--- a/recipes/common/common-t2-kernel.yml
+++ b/recipes/common/common-t2-kernel.yml
@@ -5,7 +5,8 @@ modules:
       - https://copr.fedorainfracloud.org/coprs/sharpenedblade/t2linux/repo/fedora-%OS_VERSION%/sharpenedblade-t2linux-fedora-%OS_VERSION%.repo
  
 
-# install the t2 kerel
+# install the t2 kernel 
   - type: script
     scripts:
-      - t2-kernel.sh
\ No newline at end of file
+      - t2-kernel.sh
+      - t2-apple-bce.sh
\ No newline at end of file
diff --git a/recipes/t2-atomic-kansei.yml b/recipes/t2-atomic-kansei.yml
index ca8bd99..8ac4020 100644
--- a/recipes/t2-atomic-kansei.yml
+++ b/recipes/t2-atomic-kansei.yml
@@ -10,6 +10,11 @@ base-image: ghcr.io/ublue-os/sericea-main
 image-version: 41
 
 modules:
+  - from-file: common/common-files.yml
+  - from-file: common/common-files-hyprland.yml
+  - from-file: common/common-files-plasma.yml
+  - from-file: common/common-files-river.yml
+  #- from-file: common/common-files-sway.yml
   - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
   - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps-hyprland.yml
@@ -19,11 +24,7 @@ modules:
   - from-file: common/common-apps-river.yml
   #- from-file: common/common-apps-sway.yml
   - from-file: common/common-kansei.yml
-  - from-file: common/common-files.yml
-  - from-file: common/common-files-hyprland.yml
-  - from-file: common/common-files-plasma.yml
-  - from-file: common/common-files-river.yml
-  #- from-file: common/common-files-sway.yml
+
 
   - type: script
     snippets: 

From 6c42b7b5b6fa8e7852faff01e7f7b4edef5adba7 Mon Sep 17 00:00:00 2001
From: Chris Lauretano <1905121+lauretano@users.noreply.github.com>
Date: Sat, 9 Nov 2024 10:27:40 -0500
Subject: [PATCH 4/5] fix: things were out of order, making another attempt at
 kansei spin only

---
 files/system/etc/dracut.conf.d/cmdline.conf                    | 2 +-
 files/system/usr/lib/dracut/dracut.conf.d/10-t2-apple-bce.conf | 1 -
 recipes/common/common-t2-kernel.yml                            | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 files/system/usr/lib/dracut/dracut.conf.d/10-t2-apple-bce.conf

diff --git a/files/system/etc/dracut.conf.d/cmdline.conf b/files/system/etc/dracut.conf.d/cmdline.conf
index 9f68c88..c84bbe8 100644
--- a/files/system/etc/dracut.conf.d/cmdline.conf
+++ b/files/system/etc/dracut.conf.d/cmdline.conf
@@ -1 +1 @@
-kernel_cmdline+=" intel_iommu=on iommu=pt mem_sleep_default=s2idle"
\ No newline at end of file
+kernel_cmdline+=" intel_iommu=on iommu=pt mem_sleep_default=s2idle "
\ No newline at end of file
diff --git a/files/system/usr/lib/dracut/dracut.conf.d/10-t2-apple-bce.conf b/files/system/usr/lib/dracut/dracut.conf.d/10-t2-apple-bce.conf
deleted file mode 100644
index 5620b07..0000000
--- a/files/system/usr/lib/dracut/dracut.conf.d/10-t2-apple-bce.conf
+++ /dev/null
@@ -1 +0,0 @@
-force_drivers+=" apple_bce snd_pcm snd"
\ No newline at end of file
diff --git a/recipes/common/common-t2-kernel.yml b/recipes/common/common-t2-kernel.yml
index 44adf1b..30ae2d1 100644
--- a/recipes/common/common-t2-kernel.yml
+++ b/recipes/common/common-t2-kernel.yml
@@ -9,4 +9,4 @@ modules:
   - type: script
     scripts:
       - t2-kernel.sh
-      - t2-apple-bce.sh
\ No newline at end of file
+      #- t2-apple-bce.sh
\ No newline at end of file

From 3dd80623e1778f5b01f956689880b24adfabf1d2 Mon Sep 17 00:00:00 2001
From: Chris Lauretano <1905121+lauretano@users.noreply.github.com>
Date: Sat, 9 Nov 2024 11:21:35 -0500
Subject: [PATCH 5/5] feat: update all recipes for re-ordered files

---
 files/system/etc/dracut.conf.d/t2-bce.conf  |  2 +-
 recipes/common/common-apps-cosmic.yml       | 14 +++++++-------
 recipes/t2-atomic-cosmic-gnome-fsync-ba.yml |  4 ++--
 recipes/t2-atomic-cosmic-gnome.yml          |  4 ++--
 recipes/t2-atomic-cosmic-plasma.yml         |  4 ++--
 recipes/t2-atomic-cosmic.yml                |  6 ++----
 recipes/t2-atomic-gnome-fsync-ba.yml        |  4 ++--
 recipes/t2-atomic-gnome-kansei.yml          |  4 ++--
 recipes/t2-atomic-gnome.yml                 |  4 ++--
 recipes/t2-atomic-plasma-fsync-ba.yml       |  4 ++--
 recipes/t2-atomic-plasma-fsync.yml          |  4 ++--
 recipes/t2-atomic-plasma-kansei.yml         |  4 ++--
 recipes/t2-atomic-plasma.yml                |  4 ++--
 recipes/t2-atomic-river.yml                 |  4 ++--
 recipes/t2-atomic-sway-fsync-ba.yml         |  4 ++--
 recipes/t2-atomic-sway.yml                  |  6 +++---
 16 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/files/system/etc/dracut.conf.d/t2-bce.conf b/files/system/etc/dracut.conf.d/t2-bce.conf
index e3a638e..a07fd27 100644
--- a/files/system/etc/dracut.conf.d/t2-bce.conf
+++ b/files/system/etc/dracut.conf.d/t2-bce.conf
@@ -1,2 +1,2 @@
 #load apple-bce early so keyboard works for LUKS and early boot
-force_drivers+=" apple-bce snd snd-pcm "
\ No newline at end of file
+force_drivers+=" apple_bce snd snd-pcm "
\ No newline at end of file
diff --git a/recipes/common/common-apps-cosmic.yml b/recipes/common/common-apps-cosmic.yml
index ab18e83..525d0e2 100644
--- a/recipes/common/common-apps-cosmic.yml
+++ b/recipes/common/common-apps-cosmic.yml
@@ -1,14 +1,14 @@
 # modules and things general to all cosmic recipes
 modules:
   - type: rpm-ostree
-    repos:
-      # TEMP: this is hardcoded as rawhide as of 20240531 as f40 repo isn't yet available (brand new copr)
-      - https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch/repo/fedora-40/ryanabx-cosmic-epoch-fedora-%OS_VERSION%.repo
+  #  repos:
+  #    # TEMP: this is hardcoded as rawhide as of 20240531 as f40 repo isn't yet available (brand new copr)
+  #    - https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch/repo/fedora-40/ryanabx-cosmic-epoch-fedora-%OS_VERSION%.repo
     install:
       - cosmic-desktop
 
 
-  - type: rpm-ostree
-    install:
-      - tuned
-      - gnome-keyring
\ No newline at end of file
+  #- type: rpm-ostree
+  #  install:
+  #    - tuned
+  #    - gnome-keyring
\ No newline at end of file
diff --git a/recipes/t2-atomic-cosmic-gnome-fsync-ba.yml b/recipes/t2-atomic-cosmic-gnome-fsync-ba.yml
index 55711b9..b246eae 100644
--- a/recipes/t2-atomic-cosmic-gnome-fsync-ba.yml
+++ b/recipes/t2-atomic-cosmic-gnome-fsync-ba.yml
@@ -12,11 +12,11 @@ image-version: 41
 alt-tags: 
   - fsync-ba
 modules:
-  - from-file: common/common-t2-enablement.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
-  - from-file: common/common-t2-enablement-fsync-ba.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-files.yml
   - from-file: common/common-files-cosmic.yml
   - from-file: common/common-files-gnome.yml
+  - from-file: common/common-t2-enablement.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
+  - from-file: common/common-t2-enablement-fsync-ba.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps.yml
   - from-file: common/common-apps-cosmic.yml
   - from-file: common/common-apps-gnome.yml #and gnome flatpaks etc because this has both
diff --git a/recipes/t2-atomic-cosmic-gnome.yml b/recipes/t2-atomic-cosmic-gnome.yml
index 0a8597f..76f671f 100644
--- a/recipes/t2-atomic-cosmic-gnome.yml
+++ b/recipes/t2-atomic-cosmic-gnome.yml
@@ -11,11 +11,11 @@ base-image: ghcr.io/ublue-os/silverblue-main
 image-version: 41
 
 modules:
-  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
-  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-files.yml
   - from-file: common/common-files-cosmic.yml
   - from-file: common/common-files-gnome.yml
+  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
+  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps.yml
   - from-file: common/common-apps-cosmic.yml
   - from-file: common/common-apps-gnome.yml #and gnome flatpaks etc because this has both
diff --git a/recipes/t2-atomic-cosmic-plasma.yml b/recipes/t2-atomic-cosmic-plasma.yml
index a17994d..213555e 100644
--- a/recipes/t2-atomic-cosmic-plasma.yml
+++ b/recipes/t2-atomic-cosmic-plasma.yml
@@ -11,11 +11,11 @@ base-image: ghcr.io/ublue-os/kinoite-main
 image-version: 41
 
 modules:
-  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
-  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-files.yml
   - from-file: common/common-files-cosmic.yml
   - from-file: common/common-files-plasma.yml
+  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
+  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps-cosmic.yml
   - from-file: common/common-apps.yml
   - from-file: common/common-apps-plasma.yml #and plasma flatpaks etc because this has both
diff --git a/recipes/t2-atomic-cosmic.yml b/recipes/t2-atomic-cosmic.yml
index 706bc5c..69705d7 100644
--- a/recipes/t2-atomic-cosmic.yml
+++ b/recipes/t2-atomic-cosmic.yml
@@ -7,16 +7,14 @@ name: t2-atomic-cosmic
 # description will be included in the image's metadata
 description: Fedora Atomic Cosmic base spin for Apple T2 Hardware
 
-base-image: ghcr.io/ublue-os/base-main
+base-image: quay.io/fedora-ostree-desktops/cosmic-atomic
 image-version: 41
 
 modules:
+  - from-file: common/common-files.yml
   - from-file: common/common-t2-enablement.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
   - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
-  - from-file: common/common-files.yml
-  - from-file: common/common-files-cosmic.yml
   - from-file: common/common-apps.yml
-  - from-file: common/common-apps-cosmic.yml
 
   - type: signing # this sets up the proper policy & signing files for signed images to work fully
   
diff --git a/recipes/t2-atomic-gnome-fsync-ba.yml b/recipes/t2-atomic-gnome-fsync-ba.yml
index 370812d..6685545 100644
--- a/recipes/t2-atomic-gnome-fsync-ba.yml
+++ b/recipes/t2-atomic-gnome-fsync-ba.yml
@@ -12,10 +12,10 @@ image-version: 41
 alt-tags: 
   - fsync-ba
 modules:
-  - from-file: common/common-t2-enablement.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
-  - from-file: common/common-t2-enablement-fsync-ba.yml  #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-files.yml
   - from-file: common/common-files-gnome.yml
+  - from-file: common/common-t2-enablement.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
+  - from-file: common/common-t2-enablement-fsync-ba.yml  #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps.yml #installs apps common across all the t2 editions
   - from-file: common/common-apps-gnome.yml #installs gnome flatpaks and such
 
diff --git a/recipes/t2-atomic-gnome-kansei.yml b/recipes/t2-atomic-gnome-kansei.yml
index 95e52bf..5b9775c 100644
--- a/recipes/t2-atomic-gnome-kansei.yml
+++ b/recipes/t2-atomic-gnome-kansei.yml
@@ -15,10 +15,10 @@ image-version: 41 # latest is also supported if you want new updates ASAP
 # module configuration, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-t2-enablement.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
-  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-files.yml
   - from-file: common/common-files-gnome.yml
+  - from-file: common/common-t2-enablement.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
+  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps.yml #installs apps common across all the t2 editions
   - from-file: common/common-kansei.yml
   - from-file: common/common-apps-gnome.yml #gnome flatpaks
diff --git a/recipes/t2-atomic-gnome.yml b/recipes/t2-atomic-gnome.yml
index 02b3e2e..9a5fe9e 100644
--- a/recipes/t2-atomic-gnome.yml
+++ b/recipes/t2-atomic-gnome.yml
@@ -11,10 +11,10 @@ base-image: ghcr.io/ublue-os/silverblue-main
 image-version: 41
 
 modules:
-  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
-  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-files.yml
   - from-file: common/common-files-gnome.yml
+  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
+  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps.yml #installs apps common across all the t2 editions
   - from-file: common/common-apps-gnome.yml #installs gnome flatpaks and such
 
diff --git a/recipes/t2-atomic-plasma-fsync-ba.yml b/recipes/t2-atomic-plasma-fsync-ba.yml
index 5a06d5e..612c50f 100644
--- a/recipes/t2-atomic-plasma-fsync-ba.yml
+++ b/recipes/t2-atomic-plasma-fsync-ba.yml
@@ -12,10 +12,10 @@ image-version: 41
 alt-tags:
   - fsync-ba
 modules:
-  - from-file: common/common-t2-enablement.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
-  - from-file: common/common-t2-enablement-fsync-ba.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-files.yml
   - from-file: common/common-files-plasma.yml
+  - from-file: common/common-t2-enablement.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
+  - from-file: common/common-t2-enablement-fsync-ba.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps.yml #installs apps common across all the t2 editions
   - from-file: common/common-apps-plasma.yml #and plasma flatpaks etc because this has both
   - type: signing # this sets up the proper policy & signing files for signed images to work fully
diff --git a/recipes/t2-atomic-plasma-fsync.yml b/recipes/t2-atomic-plasma-fsync.yml
index ac34f30..f77905f 100644
--- a/recipes/t2-atomic-plasma-fsync.yml
+++ b/recipes/t2-atomic-plasma-fsync.yml
@@ -12,10 +12,10 @@ image-version: 41
 alt-tags:
   - fsync
 modules:
-  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
-  - from-file: common/common-t2-enablement-fsync-f41.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-files.yml
   - from-file: common/common-files-plasma.yml
+  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
+  - from-file: common/common-t2-enablement-fsync-f41.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps.yml #installs apps common across all the t2 editions
   - from-file: common/common-apps-plasma.yml #and plasma flatpaks etc because this has both
   - type: signing # this sets up the proper policy & signing files for signed images to work fully
diff --git a/recipes/t2-atomic-plasma-kansei.yml b/recipes/t2-atomic-plasma-kansei.yml
index 70ae4ed..061fdb8 100644
--- a/recipes/t2-atomic-plasma-kansei.yml
+++ b/recipes/t2-atomic-plasma-kansei.yml
@@ -11,10 +11,10 @@ base-image: ghcr.io/ublue-os/kinoite-main
 image-version: 41
 
 modules:
-  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
-  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-files.yml
   - from-file: common/common-files-plasma.yml
+  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
+  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps.yml #installs apps common across all the t2 editions
   - from-file: common/common-apps-plasma.yml #and plasma flatpaks etc because this has both
   - from-file: common/common-kansei.yml
diff --git a/recipes/t2-atomic-plasma.yml b/recipes/t2-atomic-plasma.yml
index a1466c3..11b0da2 100644
--- a/recipes/t2-atomic-plasma.yml
+++ b/recipes/t2-atomic-plasma.yml
@@ -11,10 +11,10 @@ base-image: ghcr.io/ublue-os/kinoite-main
 image-version: 41
 
 modules:
-  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
-  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-files.yml
   - from-file: common/common-files-plasma.yml
+  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
+  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps.yml #installs apps common across all the t2 editions
   - from-file: common/common-apps-plasma.yml #and plasma flatpaks etc because this has both
   - type: signing # this sets up the proper policy & signing files for signed images to work fully
diff --git a/recipes/t2-atomic-river.yml b/recipes/t2-atomic-river.yml
index 2a10cc2..608b965 100644
--- a/recipes/t2-atomic-river.yml
+++ b/recipes/t2-atomic-river.yml
@@ -11,10 +11,10 @@ base-image: ghcr.io/ublue-os/base-main
 image-version: 41
 
 modules:
-  - from-file: common/common-t2-kernel.yml #installs fsync kernel
-  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
   - from-file: common/common-files.yml
   - from-file: common/common-files-river.yml
+  - from-file: common/common-t2-kernel.yml #installs fsync kernel
+  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
   - from-file: common/common-apps-wayland.yml
   - from-file: common/common-apps.yml
   - from-file: common/common-apps-river.yml
diff --git a/recipes/t2-atomic-sway-fsync-ba.yml b/recipes/t2-atomic-sway-fsync-ba.yml
index e1e06d8..79695c2 100644
--- a/recipes/t2-atomic-sway-fsync-ba.yml
+++ b/recipes/t2-atomic-sway-fsync-ba.yml
@@ -12,10 +12,10 @@ image-version: 41
 alt-tags:
   - fsync-ba
 modules:
-  - from-file: common/common-t2-enablement.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
-  - from-file: common/common-t2-enablement-fsync-ba.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-files.yml
   - from-file: common/common-files-sway.yml
+  - from-file: common/common-t2-enablement.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
+  - from-file: common/common-t2-enablement-fsync-ba.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps-sway.yml
   - from-file: common/common-apps-wayland.yml
   - from-file: common/common-apps.yml
diff --git a/recipes/t2-atomic-sway.yml b/recipes/t2-atomic-sway.yml
index d6dcb55..da5c9be 100644
--- a/recipes/t2-atomic-sway.yml
+++ b/recipes/t2-atomic-sway.yml
@@ -10,11 +10,11 @@ description: Fedora Atomic Sway (sericea) spin for Apple T2 Hardware
 base-image: ghcr.io/ublue-os/sericea-main
 image-version: 41
 
-modules:
-  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
-  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
+modules:  
   - from-file: common/common-files.yml
   - from-file: common/common-files-sway.yml
+  - from-file: common/common-t2-enablement-f41.yml #installs t2 kernel, t2 grub arguments, and packages for enabling t2 hardware
+  - from-file: common/common-t2-kernel.yml #pulls fsync containerfile and overrides base image kernel
   - from-file: common/common-apps-sway.yml
   - from-file: common/common-apps-wayland.yml
   - from-file: common/common-apps.yml