chore: improve file names and add hyprland images

.github/workflows/build.yml

@@ -35,6 +35,8 @@ jobs:
           - recipes/desktop/recipe-sericea-nvidia.yml
           - recipes/desktop/recipe-wayblue-wayfire-main.yml
           - recipes/desktop/recipe-wayblue-wayfire-nvidia.yml
+          - recipes/desktop/recipe-wayblue-hyprland-main.yml
+          - recipes/desktop/recipe-wayblue-hyprland-nvidia.yml
           # laptop
           - recipes/laptop/recipe-silverblue-main-laptop.yml
           - recipes/laptop/recipe-silverblue-nvidia-laptop.yml
@@ -50,6 +52,8 @@ jobs:
           - recipes/laptop/recipe-sericea-nvidia-laptop.yml
           - recipes/laptop/recipe-wayblue-wayfire-main-laptop.yml
           - recipes/laptop/recipe-wayblue-wayfire-nvidia-laptop.yml
+          - recipes/laptop/recipe-wayblue-hyprland-main-laptop.yml
+          - recipes/laptop/recipe-wayblue-hyprland-nvidia-laptop.yml
           # framework
           - recipes/laptop/recipe-silverblue-framework.yml
           - recipes/laptop/recipe-kinoite-framework.yml
@@ -74,6 +78,8 @@ jobs:
           - recipes/desktop/recipe-sericea-nvidia-userns.yml
           - recipes/desktop/recipe-wayblue-wayfire-main-userns.yml
           - recipes/desktop/recipe-wayblue-wayfire-nvidia-userns.yml
+          - recipes/desktop/recipe-wayblue-hyprland-main-userns.yml
+          - recipes/desktop/recipe-wayblue-hyprland-nvidia-userns.yml
           # laptop
           - recipes/laptop/recipe-silverblue-main-laptop-userns.yml
           - recipes/laptop/recipe-silverblue-nvidia-laptop-userns.yml
@@ -91,6 +97,8 @@ jobs:
           - recipes/laptop/recipe-sericea-nvidia-laptop-userns.yml
           - recipes/laptop/recipe-wayblue-wayfire-main-laptop-userns.yml
           - recipes/laptop/recipe-wayblue-wayfire-nvidia-laptop-userns.yml
+          - recipes/laptop/recipe-wayblue-hyprland-main-laptop-userns.yml
+          - recipes/laptop/recipe-wayblue-hyprland-nvidia-laptop-userns.yml
           # framework
           - recipes/laptop/recipe-silverblue-framework-userns.yml
           - recipes/laptop/recipe-kinoite-framework-userns.yml

README.md

@@ -78,6 +78,8 @@ Have a look at [PREINSTALL-README](PREINSTALL-README.md) before proceeding.
 - sericea-nvidia-hardened
 - wayblue-wayfire-main-hardened
 - wayblue-wayfire-nvidia-hardened
+- wayblue-hyprland-main-hardened
+- wayblue-hyprland-nvidia-hardened
 
 ##### laptop <sup>[changes](./config/recipes/laptop/laptop-bling.yml)</sup>
 - kinoite-main-laptop-hardened
@@ -94,6 +96,8 @@ Have a look at [PREINSTALL-README](PREINSTALL-README.md) before proceeding.
 - sericea-nvidia-laptop-hardened
 - wayblue-wayfire-main-laptop-hardened
 - wayblue-wayfire-nvidia-laptop-hardened
+- wayblue-hyprland-main-laptop-hardened
+- wayblue-hyprland-nvidia-laptop-hardened
 
 ###### framework <sup>[docs](https://universal-blue.org/images/framework/)</sup>
 - kinoite-framework-hardened
@@ -122,6 +126,8 @@ Have a look at [PREINSTALL-README](PREINSTALL-README.md) before proceeding.
 - sericea-nvidia-userns-hardened
 - wayblue-wayfire-main-userns-hardened
 - wayblue-wayfire-nvidia-userns-hardened
+- wayblue-hyprland-main-userns-hardened
+- wayblue-hyprland-nvidia-userns-hardened
 
 ##### laptop <sup>[changes](./config/recipes/laptop/laptop-bling.yml)</sup>
 - kinoite-main-laptop-userns-hardened
@@ -140,6 +146,8 @@ Have a look at [PREINSTALL-README](PREINSTALL-README.md) before proceeding.
 - sericea-nvidia-laptop-userns-hardened
 - wayblue-wayfire-main-laptop-userns-hardened
 - wayblue-wayfire-nvidia-laptop-userns-hardened
+- wayblue-hyprland-main-laptop-userns-hardened
+- wayblue-hyprland-nvidia-laptop-userns-hardened
 
 ###### framework <sup>[docs](https://universal-blue.org/images/framework/)</sup>
 - kinoite-framework-userns-hardened

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

@@ -0,0 +1,20 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-hyprland-main-userns-hardened
+# description will be included in the image's metadata
+description: "wayblue hyprland main with some hardening applied"
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/wayblueorg/hyprland
+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
+  - type: yafti 

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

@@ -0,0 +1,22 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-hyprland-main-hardened
+# description will be included in the image's metadata
+description: "wayblue hyprland main with some hardening applied"
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/wayblueorg/hyprland
+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/disableuserns-packages.yml
+  - from-file: common/disableuserns-scripts.yml
+  - type: yafti 

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

@@ -0,0 +1,20 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-hyprland-nvidia-userns-hardened
+# description will be included in the image's metadata
+description: "wayblue hyprland nvidia with some hardening applied"
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/wayblueorg/hyprland-nvidia
+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
+  - type: yafti 

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

@@ -0,0 +1,22 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-hyprland-nvidia-hardened
+# description will be included in the image's metadata
+description: "wayblue hyprland nvidia with some hardening applied"
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/wayblueorg/hyprland-nvidia
+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/disableuserns-packages.yml
+  - from-file: common/disableuserns-scripts.yml
+  - type: yafti 

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

@@ -19,6 +19,6 @@ modules:
   - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
-  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-optimus-workaround-scripts.yml
   - from-file: common/nvidia-laptop-scripts.yml
   - type: yafti 

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

@@ -19,6 +19,6 @@ modules:
   - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
-  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-optimus-workaround-scripts.yml
   - from-file: common/nvidia-laptop-scripts.yml
   - type: yafti 

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

@@ -21,6 +21,6 @@ modules:
   - from-file: common/bluefin-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
-  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-optimus-workaround-scripts.yml
   - from-file: common/nvidia-laptop-scripts.yml
   - type: yafti 

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

@@ -18,6 +18,6 @@ modules:
   - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/cinnamon-scripts.yml
-  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-optimus-workaround-scripts.yml
   - from-file: common/nvidia-laptop-scripts.yml
   - type: yafti 

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

@@ -20,6 +20,6 @@ modules:
   - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
   - from-file: common/cinnamon-scripts.yml
-  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-optimus-workaround-scripts.yml
   - from-file: common/nvidia-laptop-scripts.yml
   - type: yafti 

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

@@ -19,6 +19,6 @@ modules:
   - from-file: common/common-scripts.yml
   - type: signing
   - from-file: common/gui-scripts.yml
-  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-optimus-workaround-scripts.yml
   - from-file: common/nvidia-laptop-scripts.yml
   - type: yafti 

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

@@ -21,6 +21,6 @@ modules:
   - from-file: common/gui-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
-  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-optimus-workaround-scripts.yml
   - from-file: common/nvidia-laptop-scripts.yml
   - type: yafti 

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

@@ -0,0 +1,21 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-hyprland-main-laptop-userns-hardened
+# description will be included in the image's metadata
+description: "wayblue hyprland main with some hardening applied, for laptops"
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/wayblueorg/hyprland
+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: recipes/laptop/laptop-bling.yml
+  - from-file: common/common-scripts.yml
+  - type: signing
+  - from-file: common/gui-scripts.yml
+  - type: yafti 

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

@@ -0,0 +1,23 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-hyprland-main-laptop-hardened
+# description will be included in the image's metadata
+description: "wayblue hyprland main with some hardening applied, for laptops"
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/wayblueorg/hyprland
+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: recipes/laptop/laptop-bling.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
+  - type: yafti 

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

@@ -0,0 +1,23 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-hyprland-nvidia-laptop-userns-hardened
+# description will be included in the image's metadata
+description: "wayblue hyprland nvidia with some hardening applied, for laptops"
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/wayblueorg/hyprland-nvidia
+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: recipes/laptop/laptop-bling.yml
+  - from-file: common/common-scripts.yml
+  - type: signing
+  - from-file: common/gui-scripts.yml
+  - from-file: common/nvidia-optimus-workaround-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
+  - type: yafti 

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

@@ -0,0 +1,25 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-hyprland-nvidia-laptop-hardened
+# description will be included in the image's metadata
+description: "wayblue hyprland nvidia with some hardening applied, for laptops"
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/wayblueorg/hyprland-nvidia
+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: recipes/laptop/laptop-bling.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/nvidia-optimus-workaround-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
+  - type: yafti 

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

@@ -19,6 +19,6 @@ modules:
   - type: signing
   - from-file: common/gui-scripts.yml
   - from-file: common/wayfire-scripts.yml
-  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-optimus-workaround-scripts.yml
   - from-file: common/nvidia-laptop-scripts.yml
   - type: yafti 

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

@@ -21,6 +21,6 @@ modules:
   - from-file: common/wayfire-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml
-  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-optimus-workaround-scripts.yml
   - from-file: common/nvidia-laptop-scripts.yml
   - type: yafti