clean up recipes

recipes/intel-amd/cosmic.yml

@@ -3,21 +3,22 @@ description: "myOS is an operating system dedicated to being user-friendly and p
 base-image: ghcr.io/ublue-os/cosmic
 image-version: 40 
 modules:
-  - from-file: common/common-files.yml 
+  - from-file: common/common-files.yml
   - from-file: common/common-scripts.yml
   - from-file: common/base-packages.yml
   - from-file: common/main-kmods.yml
   - from-file: common/remove-firefox.yml
+  - from-file: common/default-flatpaks.yml
   - from-file: common/tailscale.yml
-  - from-file: intel-amd/amd-packages.yml
   - from-file: common/apple.yml
-  - from-file: cosmic/cosmic-packages.yml
-  - from-file: common/common-files.yml
-  - from-file: common/default-flatpaks.yml
-  - from-file: cosmic/cosmic-flatpaks.yml
   - from-file: common/services.yml
-  - from-file: cosmic/cosmic-services.yml
   - from-file: common/initramfs.yml
   - from-file: common/dotfiles.yml
   - type: signing 
   - type: yafti
+# AMD Components
+  - from-file: intel-amd/amd-packages.yml
+# COSMIC Components
+  - from-file: cosmic/cosmic-packages.yml
+  - from-file: cosmic/cosmic-flatpaks.yml
+  - from-file: cosmic/cosmic-services.yml

recipes/intel-amd/gnome.yml

@@ -9,15 +9,17 @@ modules:
   - from-file: common/main-kmods.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/default-flatpaks.yml
-  - from-file: gnome/gnome-flatpaks.yml
   - from-file: common/tailscale.yml
-  - from-file: intel-amd/amd-packages.yml
   - from-file: common/apple.yml
-  - from-file: gnome/gnome-packages.yml
-  - from-file: gnome/gnome-extensions.yml
-  - from-file: gnome/gnome-files.yml
   - from-file: common/services.yml
   - from-file: common/initramfs.yml
   - from-file: common/dotfiles.yml
   - type: signing 
   - type: yafti
+# AMD Components
+  - from-file: intel-amd/amd-packages.yml
+# GNOME Components
+  - from-file: gnome/gnome-flatpaks.yml
+  - from-file: gnome/gnome-packages.yml
+  - from-file: gnome/gnome-extensions.yml
+  - from-file: gnome/gnome-files.yml

recipes/intel-amd/hyprland.yml

@@ -10,16 +10,22 @@ image-version: 40 # 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: hyprland/hyprland-packages.yml
   - from-file: common/common-files.yml
-  - from-file: common/base-packages.yml
   - from-file: common/common-scripts.yml
+  - from-file: common/base-packages.yml
   - from-file: common/main-kmods.yml
+  - from-file: common/remove-firefox.yml
+  - from-file: common/default-flatpaks.yml
   - from-file: common/tailscale.yml
+  - from-file: common/apple.yml
+  - from-file: common/services.yml
+  - from-file: common/initramfs.yml
+  - from-file: common/dotfiles.yml
+  - type: signing 
+  - type: yafti
+# AMD Components
   - from-file: intel-amd/amd-packages.yml
+# Hyprland Components
   - from-file: hyprland/hyprland-files.yml
   - from-file: hyprland/hyprland-scripts.yml
-  - from-file: common/default-flatpaks.yml
-  - from-file: common/services.yml
-  - from-file: common/dotfiles.yml
-  - type: signing # this sets up the proper policy & signing files for signed images to work fully
+

recipes/intel-amd/kde.yml

@@ -3,17 +3,22 @@ description: "myOS is an operating system dedicated to being user-friendly and p
 base-image: ghcr.io/ublue-os/kinoite-main
 image-version: latest 
 modules:
-  - from-file: common/base-packages.yml
   - from-file: common/common-files.yml
   - from-file: common/common-scripts.yml
-  - from-file: common/remove-firefox.yml
+  - from-file: common/base-packages.yml
   - from-file: common/main-kmods.yml
-  - from-file: common/tailscale.yml
-  - from-file: intel-amd/amd-packages.yml
-  - from-file: kde/kde-packages.yml
+  - from-file: common/remove-firefox.yml
   - from-file: common/default-flatpaks.yml
-#  - from-file: common/kde-flatpaks.yml
+  - from-file: common/tailscale.yml
+  - from-file: common/apple.yml
   - from-file: common/services.yml
+  - from-file: common/initramfs.yml
   - from-file: common/dotfiles.yml
   - type: signing 
   - type: yafti
+# AMD Components
+  - from-file: intel-amd/amd-packages.yml
+# KDE Components
+  - from-file: kde/kde-packages.yml
+#  - from-file: common/kde-flatpaks.yml
+

recipes/nvidia/cosmic.yml

@@ -4,21 +4,21 @@ base-image: ghcr.io/ublue-os/cosmic-nvidia
 image-version: 40
 modules:
   - from-file: common/common-files.yml
-  - from-file: common/base-packages.yml
   - from-file: common/common-scripts.yml
-#  - from-file: common/main-kmods.yml
+  - from-file: common/base-packages.yml
+  - from-file: common/main-kmods.yml
   - from-file: common/remove-firefox.yml
+  - from-file: common/default-flatpaks.yml
   - from-file: common/tailscale.yml
- # - from-file: nvidia/bazzite-nvidia.yml
   - from-file: common/apple.yml
-  - from-file: cosmic/cosmic-packages.yml
-  - from-file: common/common-files.yml
-  - from-file: common/default-flatpaks.yml
-  - from-file: cosmic/cosmic-flatpaks.yml
-  - from-file: nvidia/nvidia-flatpaks.yml
   - from-file: common/services.yml
-  - from-file: cosmic/cosmic-services.yml
   - from-file: common/initramfs.yml
   - from-file: common/dotfiles.yml
   - type: signing 
   - type: yafti
+# NVIDIA Components
+  - from-file: nvidia/nvidia-flatpaks.yml
+# COSMIC Components
+  - from-file: cosmic/cosmic-packages.yml
+  - from-file: cosmic/cosmic-flatpaks.yml
+  - from-file: cosmic/cosmic-services.yml

recipes/nvidia/gnome.yml

@@ -4,21 +4,22 @@ base-image: ghcr.io/ublue-os/silverblue-nvidia
 image-version: latest 
 modules:
   - from-file: common/common-files.yml
-  - from-file: common/base-packages.yml
   - from-file: common/common-scripts.yml
+  - from-file: common/base-packages.yml
   - from-file: common/main-kmods.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/default-flatpaks.yml
-  - from-file: gnome/gnome-flatpaks.yml
   - from-file: common/tailscale.yml
-#  - from-file: nvidia/bazzite-nvidia.yml
   - from-file: common/apple.yml
-  - from-file: gnome/gnome-packages.yml
-  - from-file: gnome/gnome-extensions.yml
-  - from-file: gnome/gnome-files.yml
-  - from-file: nvidia/nvidia-flatpaks.yml
   - from-file: common/services.yml
   - from-file: common/initramfs.yml
   - from-file: common/dotfiles.yml
   - type: signing 
   - type: yafti
+# NVIDIA Components
+  - from-file: nvidia/nvidia-flatpaks.yml
+# GNOME Components
+  - from-file: gnome/gnome-flatpaks.yml
+  - from-file: gnome/gnome-packages.yml
+  - from-file: gnome/gnome-extensions.yml
+  - from-file: gnome/gnome-files.yml

recipes/nvidia/hyprland.yml

@@ -3,17 +3,22 @@ description: "myOS is an operating system dedicated to being user-friendly and p
 base-image: ghcr.io/wayblueorg/hyprland-nvidia
 image-version: 40 
 modules:
-  - from-file: hyprland/hyprland-packages.yml
-  - from-file: common/base-packages.yml
   - from-file: common/common-files.yml
   - from-file: common/common-scripts.yml
+  - from-file: common/base-packages.yml
   - from-file: common/main-kmods.yml
+  - from-file: common/remove-firefox.yml
+  - from-file: common/default-flatpaks.yml
   - from-file: common/tailscale.yml
-#  - from-file: nvidia/bazzite-nvidia.yml
-  - from-file: hyprland/hyprland-files.yml
-  - from-file: hyprland/hyprland-scripts.yml
+  - from-file: common/apple.yml
+  - from-file: common/services.yml
+  - from-file: common/initramfs.yml
   - from-file: common/dotfiles.yml
-  - from-file: common/default-flatpaks.yml
+  - type: signing 
+  - type: yafti
+# NVIDIA Components
   - from-file: nvidia/nvidia-flatpaks.yml
-  - from-file: common/services.yml
-  - type: signing
+# Hyprland Components
+  - from-file: hyprland/hyprland-files.yml
+  - from-file: hyprland/hyprland-scripts.yml
+

recipes/nvidia/kde.yml

@@ -3,18 +3,22 @@ description: "myOS is an operating system dedicated to being user-friendly and p
 base-image: ghcr.io/ublue-os/kinoite-nvidia
 image-version: latest 
 modules:
-  - from-file: common/base-packages.yml
   - from-file: common/common-files.yml
   - from-file: common/common-scripts.yml
-  - from-file: common/remove-firefox.yml
+  - from-file: common/base-packages.yml
   - from-file: common/main-kmods.yml
-  - from-file: common/tailscale.yml
-#  - from-file: nvidia/bazzite-nvidia.yml
-  - from-file: kde/kde-packages.yml
+  - from-file: common/remove-firefox.yml
   - from-file: common/default-flatpaks.yml
-  - from-file: nvidia/nvidia-flatpaks.yml
-#  - from-file: common/kde-flatpaks.yml
+  - from-file: common/tailscale.yml
+  - from-file: common/apple.yml
   - from-file: common/services.yml
+  - from-file: common/initramfs.yml
   - from-file: common/dotfiles.yml
   - type: signing 
   - type: yafti
+# NVIDIA Components
+  - from-file: nvidia/nvidia-flatpaks.yml
+# KDE Components
+  - from-file: kde/kde-packages.yml
+#  - from-file: common/kde-flatpaks.yml
+

recipes/surface/gnome.yml

@@ -6,17 +6,18 @@ modules:
   - from-file: common/common-files.yml
   - from-file: common/common-scripts.yml
   - from-file: common/base-packages.yml
-  - from-file: surface/surface-kmods.yml
+  - from-file: common/main-kmods.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/default-flatpaks.yml
-  - from-file: gnome/gnome-flatpaks.yml
   - from-file: common/tailscale.yml
-#  - from-file: common/bazzite.yml
   - from-file: common/apple.yml
-  - from-file: gnome/gnome-packages.yml
-  - from-file: gnome/gnome-extensions.yml
-  - from-file: gnome/gnome-files.yml
   - from-file: common/services.yml
 #  - from-file: common/initramfs.yml
+  - from-file: common/dotfiles.yml
   - type: signing 
   - type: yafti
+# GNOME Components
+  - from-file: gnome/gnome-flatpaks.yml
+  - from-file: gnome/gnome-packages.yml
+  - from-file: gnome/gnome-extensions.yml
+  - from-file: gnome/gnome-files.yml

recipes/surface/kde.yml

@@ -3,16 +3,20 @@ description: "myOS is an operating system dedicated to being user-friendly and p
 base-image: ghcr.io/ublue-os/kinoite-surface
 image-version: latest 
 modules:
-  - from-file: common/base-packages.yml
   - from-file: common/common-files.yml
   - from-file: common/common-scripts.yml
+  - from-file: common/base-packages.yml
+  - from-file: common/main-kmods.yml
   - from-file: common/remove-firefox.yml
-  - from-file: surface/surface-kmods.yml
-  - from-file: common/tailscale.yml
-#  - from-file: common/bazzite.yml
-  - from-file: kde/kde-packages.yml
   - from-file: common/default-flatpaks.yml
-#  - from-file: common/kde-flatpaks.yml
+  - from-file: common/tailscale.yml
+  - from-file: common/apple.yml
   - from-file: common/services.yml
-  - type: signing
+#  - from-file: common/initramfs.yml
+  - from-file: common/dotfiles.yml
+  - type: signing 
   - type: yafti
+# KDE Components
+  - from-file: kde/kde-packages.yml
+#  - from-file: common/kde-flatpaks.yml
+