diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81b27be..f84b7cd 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/README.md b/README.md index b068801..51a0cb4 100644 --- a/README.md +++ b/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 [changes](./config/recipes/laptop/laptop-bling.yml) - 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 [docs](https://universal-blue.org/images/framework/) - 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 [changes](./config/recipes/laptop/laptop-bling.yml) - 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 [docs](https://universal-blue.org/images/framework/) - kinoite-framework-userns-hardened diff --git a/config/common/nvidia-laptop-gnome-cinnamon-scripts.yml b/config/common/nvidia-optimus-workaround-scripts.yml similarity index 100% rename from config/common/nvidia-laptop-gnome-cinnamon-scripts.yml rename to config/common/nvidia-optimus-workaround-scripts.yml diff --git a/config/recipes/desktop/recipe-wayblue-hyprland-main-userns.yml b/config/recipes/desktop/recipe-wayblue-hyprland-main-userns.yml new file mode 100644 index 0000000..5be5ebb --- /dev/null +++ b/config/recipes/desktop/recipe-wayblue-hyprland-main-userns.yml @@ -0,0 +1,20 @@ +# image will be published to ghcr.io// +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 \ No newline at end of file diff --git a/config/recipes/desktop/recipe-wayblue-hyprland-main.yml b/config/recipes/desktop/recipe-wayblue-hyprland-main.yml new file mode 100644 index 0000000..3e847a3 --- /dev/null +++ b/config/recipes/desktop/recipe-wayblue-hyprland-main.yml @@ -0,0 +1,22 @@ +# image will be published to ghcr.io// +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 \ No newline at end of file diff --git a/config/recipes/desktop/recipe-wayblue-hyprland-nvidia-userns.yml b/config/recipes/desktop/recipe-wayblue-hyprland-nvidia-userns.yml new file mode 100644 index 0000000..27e7a6a --- /dev/null +++ b/config/recipes/desktop/recipe-wayblue-hyprland-nvidia-userns.yml @@ -0,0 +1,20 @@ +# image will be published to ghcr.io// +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 \ No newline at end of file diff --git a/config/recipes/desktop/recipe-wayblue-hyprland-nvidia.yml b/config/recipes/desktop/recipe-wayblue-hyprland-nvidia.yml new file mode 100644 index 0000000..a7d813f --- /dev/null +++ b/config/recipes/desktop/recipe-wayblue-hyprland-nvidia.yml @@ -0,0 +1,22 @@ +# image will be published to ghcr.io// +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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-bluefin-dx-nvidia-laptop-userns.yml b/config/recipes/laptop/recipe-bluefin-dx-nvidia-laptop-userns.yml index 813e6d1..2854cae 100644 --- a/config/recipes/laptop/recipe-bluefin-dx-nvidia-laptop-userns.yml +++ b/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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-bluefin-nvidia-laptop-userns.yml b/config/recipes/laptop/recipe-bluefin-nvidia-laptop-userns.yml index 0340662..0076e74 100644 --- a/config/recipes/laptop/recipe-bluefin-nvidia-laptop-userns.yml +++ b/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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-bluefin-nvidia-laptop.yml b/config/recipes/laptop/recipe-bluefin-nvidia-laptop.yml index af9feeb..4276630 100644 --- a/config/recipes/laptop/recipe-bluefin-nvidia-laptop.yml +++ b/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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-cinnamon-nvidia-laptop-userns.yml b/config/recipes/laptop/recipe-cinnamon-nvidia-laptop-userns.yml index be53663..f504cc9 100644 --- a/config/recipes/laptop/recipe-cinnamon-nvidia-laptop-userns.yml +++ b/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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-cinnamon-nvidia-laptop.yml b/config/recipes/laptop/recipe-cinnamon-nvidia-laptop.yml index a44c579..3b203b6 100644 --- a/config/recipes/laptop/recipe-cinnamon-nvidia-laptop.yml +++ b/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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-silverblue-nvidia-laptop-userns.yml b/config/recipes/laptop/recipe-silverblue-nvidia-laptop-userns.yml index ef40597..e746d1a 100644 --- a/config/recipes/laptop/recipe-silverblue-nvidia-laptop-userns.yml +++ b/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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-silverblue-nvidia-laptop.yml b/config/recipes/laptop/recipe-silverblue-nvidia-laptop.yml index f9404d9..c2834d8 100644 --- a/config/recipes/laptop/recipe-silverblue-nvidia-laptop.yml +++ b/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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-wayblue-hyprland-main-laptop-userns.yml b/config/recipes/laptop/recipe-wayblue-hyprland-main-laptop-userns.yml new file mode 100644 index 0000000..3ef5d80 --- /dev/null +++ b/config/recipes/laptop/recipe-wayblue-hyprland-main-laptop-userns.yml @@ -0,0 +1,21 @@ +# image will be published to ghcr.io// +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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-wayblue-hyprland-main-laptop.yml b/config/recipes/laptop/recipe-wayblue-hyprland-main-laptop.yml new file mode 100644 index 0000000..8f0dbec --- /dev/null +++ b/config/recipes/laptop/recipe-wayblue-hyprland-main-laptop.yml @@ -0,0 +1,23 @@ +# image will be published to ghcr.io// +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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-wayblue-hyprland-nvidia-laptop-userns.yml b/config/recipes/laptop/recipe-wayblue-hyprland-nvidia-laptop-userns.yml new file mode 100644 index 0000000..9eb1f4d --- /dev/null +++ b/config/recipes/laptop/recipe-wayblue-hyprland-nvidia-laptop-userns.yml @@ -0,0 +1,23 @@ +# image will be published to ghcr.io// +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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-wayblue-hyprland-nvidia-laptop.yml b/config/recipes/laptop/recipe-wayblue-hyprland-nvidia-laptop.yml new file mode 100644 index 0000000..4f7aba4 --- /dev/null +++ b/config/recipes/laptop/recipe-wayblue-hyprland-nvidia-laptop.yml @@ -0,0 +1,25 @@ +# image will be published to ghcr.io// +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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-wayblue-wayfire-nvidia-laptop-userns.yml b/config/recipes/laptop/recipe-wayblue-wayfire-nvidia-laptop-userns.yml index 13c6e89..40a2e82 100644 --- a/config/recipes/laptop/recipe-wayblue-wayfire-nvidia-laptop-userns.yml +++ b/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 \ No newline at end of file diff --git a/config/recipes/laptop/recipe-wayblue-wayfire-nvidia-laptop.yml b/config/recipes/laptop/recipe-wayblue-wayfire-nvidia-laptop.yml index 37c8383..ba89437 100644 --- a/config/recipes/laptop/recipe-wayblue-wayfire-nvidia-laptop.yml +++ b/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 \ No newline at end of file