fix: rearrange modules to ensure file changes are applied properly

config/recipes/asus/recipe-kinoite-asus-nvidia-userns.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
-  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
+  - type: signing
   - type: yafti 

config/recipes/asus/recipe-kinoite-asus-nvidia.yml

@@ -10,15 +10,15 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
-  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
+  - type: signing
   - type: yafti 

config/recipes/asus/recipe-kinoite-asus-userns.yml

@@ -10,13 +10,13 @@ image-version: 39 # 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-files.yml
-  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
+  - type: signing
   - type: yafti 

config/recipes/asus/recipe-kinoite-asus.yml

@@ -10,15 +10,15 @@ image-version: 39 # 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-files.yml
-  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
+  - type: signing
   - type: yafti 

config/recipes/asus/recipe-silverblue-asus-nvidia-userns.yml

@@ -10,12 +10,12 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/asus/recipe-silverblue-asus-nvidia.yml

@@ -10,14 +10,14 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/asus/recipe-silverblue-asus-userns.yml

@@ -10,12 +10,12 @@ image-version: 39 # 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-files.yml
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/asus/recipe-silverblue-asus.yml

@@ -10,14 +10,14 @@ image-version: 39 # 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-files.yml
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-bluefin-dx-main-userns.yml

@@ -10,12 +10,12 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/bluefin-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-bluefin-dx-nvidia-userns.yml

@@ -10,12 +10,12 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/bluefin-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-bluefin-main-userns.yml

@@ -10,12 +10,12 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/bluefin-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-bluefin-main.yml

@@ -10,14 +10,14 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/bluefin-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-bluefin-nvidia-userns.yml

@@ -10,12 +10,12 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/bluefin-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-bluefin-nvidia.yml

@@ -10,14 +10,14 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/bluefin-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-cinnamon-main-userns.yml

@@ -10,11 +10,11 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/cinnamon-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-cinnamon-main.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
-  - from-file: common/common-scripts.yml
-  - type: signing
-  - from-file: common/gui-scripts.yml
   - from-file: common/disableuserns-packages.yml
+  - from-file: common/common-scripts.yml
+  - from-file: common/gui-scripts.yml
   - from-file: common/disableuserns-scripts.yml
   - from-file: common/cinnamon-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-cinnamon-nvidia-userns.yml

@@ -10,11 +10,11 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/cinnamon-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-cinnamon-nvidia.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
-  - from-file: common/common-scripts.yml
-  - type: signing
-  - from-file: common/gui-scripts.yml
   - from-file: common/disableuserns-packages.yml
+  - from-file: common/common-scripts.yml
+  - from-file: common/gui-scripts.yml
   - from-file: common/disableuserns-scripts.yml
   - from-file: common/cinnamon-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-kinoite-main-userns.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
-  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-kinoite-main.yml

@@ -10,15 +10,15 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
-  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-kinoite-nvidia-userns.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
-  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-kinoite-nvidia.yml

@@ -10,15 +10,15 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
-  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-sericea-main-userns.yml

@@ -10,11 +10,11 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-sericea-main.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-sericea-nvidia-userns.yml

@@ -10,11 +10,11 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-sericea-nvidia.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-silverblue-main-userns.yml

@@ -10,12 +10,12 @@ image-version: 39 # 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-files.yml
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-silverblue-main.yml

@@ -10,14 +10,14 @@ image-version: 39 # 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-files.yml
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-silverblue-nvidia-userns.yml

@@ -10,12 +10,12 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-silverblue-nvidia.yml

@@ -10,14 +10,14 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-hyprland-main-userns.yml

@@ -10,11 +10,11 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-hyprland-main.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-hyprland-nvidia-userns.yml

@@ -10,11 +10,11 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-hyprland-nvidia.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-river-main-userns.yml

@@ -10,11 +10,11 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-river-main.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-river-nvidia-userns.yml

@@ -10,11 +10,11 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-river-nvidia.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-sway-main-userns.yml

@@ -10,11 +10,11 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-sway-main.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-sway-nvidia-userns.yml

@@ -10,11 +10,11 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-sway-nvidia.yml

@@ -10,13 +10,13 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-wayfire-main-userns.yml

@@ -10,12 +10,12 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/wayfire-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-wayfire-main.yml

@@ -10,14 +10,14 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/wayfire-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-wayfire-nvidia-userns.yml

@@ -10,12 +10,12 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/wayfire-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/general/recipe-wayblue-wayfire-nvidia.yml

@@ -10,14 +10,14 @@ image-version: 39
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
-  - from-file: common/common-files.yml
+  - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/common-scripts.yml
-  - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/wayfire-scripts.yml
-  - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
+  - from-file: common/common-files.yml
+  - type: signing
   - type: yafti 

config/recipes/server/recipe-server-main-userns.yml

@@ -10,9 +10,9 @@ image-version: stable
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
+  - from-file: common/common-packages.yml
+  - from-file: common/server-scripts.yml
+  - from-file: common/common-scripts.yml
   - from-file: common/common-files.yml
   - from-file: common/server-files.yml
-  - from-file: common/server-scripts.yml
-  - from-file: common/common-packages.yml
-  - from-file: common/common-scripts.yml
   - type: signing

config/recipes/server/recipe-server-main.yml

@@ -10,10 +10,10 @@ image-version: stable
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
+  - from-file: common/common-packages.yml
+  - from-file: common/server-scripts.yml
+  - from-file: common/common-scripts.yml
+  - from-file: common/disableuserns-scripts.yml
   - from-file: common/common-files.yml  
   - from-file: common/server-files.yml
-  - from-file: common/server-scripts.yml
-  - from-file: common/common-packages.yml
-  - from-file: common/common-scripts.yml
-  - type: signing
-  - from-file: common/disableuserns-scripts.yml
+  - type: signing

config/recipes/server/recipe-server-nvidia-userns.yml

@@ -10,9 +10,9 @@ image-version: stable-nvidia
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
+  - from-file: common/common-packages.yml
+  - from-file: common/server-scripts.yml
+  - from-file: common/common-scripts.yml
   - from-file: common/common-files.yml
   - from-file: common/server-files.yml
-  - from-file: common/server-scripts.yml
-  - from-file: common/common-packages.yml
-  - from-file: common/common-scripts.yml
   - type: signing

config/recipes/server/recipe-server-nvidia.yml

@@ -10,10 +10,10 @@ image-version: stable-nvidia
 # list of modules, executed in order
 # you can include multiple instances of the same module
 modules:
+  - from-file: common/common-packages.yml
+  - from-file: common/server-scripts.yml
+  - from-file: common/common-scripts.yml
+  - from-file: common/disableuserns-scripts.yml
   - from-file: common/common-files.yml
   - from-file: common/server-files.yml
-  - from-file: common/server-scripts.yml
-  - from-file: common/common-packages.yml
-  - from-file: common/common-scripts.yml
-  - type: signing
-  - from-file: common/disableuserns-scripts.yml
+  - type: signing