From d3db9c8c8ba9f1344e7044e8ea08d0273eb09f9c Mon Sep 17 00:00:00 2001
From: qoijjj <129108030+qoijjj@users.noreply.github.com>
Date: Thu, 7 Mar 2024 23:07:37 -0800
Subject: [PATCH] chore: add additional wayblue base images

---
 .github/workflows/build.yml                   |  8 ++++++
 README.md                                     |  8 ++++++
 .../recipe-wayblue-sway-main-userns.yml       | 20 +++++++++++++++
 .../desktop/recipe-wayblue-sway-main.yml      | 22 ++++++++++++++++
 .../recipe-wayblue-sway-nvidia-userns.yml     | 20 +++++++++++++++
 .../desktop/recipe-wayblue-sway-nvidia.yml    | 22 ++++++++++++++++
 ...recipe-wayblue-sway-main-laptop-userns.yml | 21 ++++++++++++++++
 .../recipe-wayblue-sway-main-laptop.yml       | 23 +++++++++++++++++
 ...cipe-wayblue-sway-nvidia-laptop-userns.yml | 23 +++++++++++++++++
 .../recipe-wayblue-sway-nvidia-laptop.yml     | 25 +++++++++++++++++++
 10 files changed, 192 insertions(+)
 create mode 100644 config/recipes/desktop/recipe-wayblue-sway-main-userns.yml
 create mode 100644 config/recipes/desktop/recipe-wayblue-sway-main.yml
 create mode 100644 config/recipes/desktop/recipe-wayblue-sway-nvidia-userns.yml
 create mode 100644 config/recipes/desktop/recipe-wayblue-sway-nvidia.yml
 create mode 100644 config/recipes/laptop/recipe-wayblue-sway-main-laptop-userns.yml
 create mode 100644 config/recipes/laptop/recipe-wayblue-sway-main-laptop.yml
 create mode 100644 config/recipes/laptop/recipe-wayblue-sway-nvidia-laptop-userns.yml
 create mode 100644 config/recipes/laptop/recipe-wayblue-sway-nvidia-laptop.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6729d1a..e85da28 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,6 +39,8 @@ jobs:
           - recipes/desktop/recipe-wayblue-hyprland-nvidia.yml
           - recipes/desktop/recipe-wayblue-river-main.yml
           - recipes/desktop/recipe-wayblue-river-nvidia.yml
+          - recipes/desktop/recipe-wayblue-sway-main.yml
+          - recipes/desktop/recipe-wayblue-sway-nvidia.yml
           # laptop
           - recipes/laptop/recipe-silverblue-main-laptop.yml
           - recipes/laptop/recipe-silverblue-nvidia-laptop.yml
@@ -60,6 +62,8 @@ jobs:
           - recipes/laptop/recipe-wayblue-hyprland-nvidia-laptop.yml
           - recipes/laptop/recipe-wayblue-river-main-laptop.yml
           - recipes/laptop/recipe-wayblue-river-nvidia-laptop.yml
+          - recipes/laptop/recipe-wayblue-sway-main-laptop.yml
+          - recipes/laptop/recipe-wayblue-sway-nvidia-laptop.yml
           # framework
           - recipes/laptop/recipe-silverblue-framework.yml
           - recipes/laptop/recipe-kinoite-framework.yml
@@ -88,6 +92,8 @@ jobs:
           - recipes/desktop/recipe-wayblue-hyprland-nvidia-userns.yml
           - recipes/desktop/recipe-wayblue-river-main-userns.yml
           - recipes/desktop/recipe-wayblue-river-nvidia-userns.yml
+          - recipes/desktop/recipe-wayblue-sway-main-userns.yml
+          - recipes/desktop/recipe-wayblue-sway-nvidia-userns.yml
           # laptop
           - recipes/laptop/recipe-silverblue-main-laptop-userns.yml
           - recipes/laptop/recipe-silverblue-nvidia-laptop-userns.yml
@@ -111,6 +117,8 @@ jobs:
           - recipes/laptop/recipe-wayblue-hyprland-nvidia-laptop-userns.yml
           - recipes/laptop/recipe-wayblue-river-main-laptop-userns.yml
           - recipes/laptop/recipe-wayblue-river-nvidia-laptop-userns.yml
+          - recipes/laptop/recipe-wayblue-sway-main-laptop-userns.yml
+          - recipes/laptop/recipe-wayblue-sway-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 86cad55..c6b1f71 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,8 @@ Have a look at [PREINSTALL-README](PREINSTALL-README.md) before proceeding.
 - wayblue-hyprland-nvidia-hardened
 - wayblue-river-main-hardened
 - wayblue-river-nvidia-hardened
+- wayblue-sway-main-hardened
+- wayblue-sway-nvidia-hardened
 
 ##### laptop <sup>[changes](./config/recipes/laptop/laptop-bling.yml)</sup>
 - kinoite-main-laptop-hardened
@@ -104,6 +106,8 @@ Have a look at [PREINSTALL-README](PREINSTALL-README.md) before proceeding.
 - wayblue-hyprland-nvidia-laptop-hardened
 - wayblue-river-main-laptop-hardened
 - wayblue-river-nvidia-laptop-hardened
+- wayblue-sway-main-laptop-hardened
+- wayblue-sway-nvidia-laptop-hardened
 
 ###### framework <sup>[docs](https://universal-blue.org/images/framework/)</sup>
 - kinoite-framework-hardened
@@ -136,6 +140,8 @@ Have a look at [PREINSTALL-README](PREINSTALL-README.md) before proceeding.
 - wayblue-hyprland-nvidia-userns-hardened
 - wayblue-river-main-userns-hardened
 - wayblue-river-nvidia-userns-hardened
+- wayblue-sway-main-userns-hardened
+- wayblue-sway-nvidia-userns-hardened
 
 ##### laptop <sup>[changes](./config/recipes/laptop/laptop-bling.yml)</sup>
 - kinoite-main-laptop-userns-hardened
@@ -160,6 +166,8 @@ Have a look at [PREINSTALL-README](PREINSTALL-README.md) before proceeding.
 - wayblue-hyprland-nvidia-laptop-userns-hardened
 - wayblue-river-main-laptop-userns-hardened
 - wayblue-river-nvidia-laptop-userns-hardened
+- wayblue-sway-main-laptop-userns-hardened
+- wayblue-sway-nvidia-laptop-userns-hardened
 
 ###### framework <sup>[docs](https://universal-blue.org/images/framework/)</sup>
 - kinoite-framework-userns-hardened
diff --git a/config/recipes/desktop/recipe-wayblue-sway-main-userns.yml b/config/recipes/desktop/recipe-wayblue-sway-main-userns.yml
new file mode 100644
index 0000000..47eeaec
--- /dev/null
+++ b/config/recipes/desktop/recipe-wayblue-sway-main-userns.yml
@@ -0,0 +1,20 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-sway-main-userns-hardened
+# description will be included in the image's metadata
+description: "wayblue sway 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/sway
+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-sway-main.yml b/config/recipes/desktop/recipe-wayblue-sway-main.yml
new file mode 100644
index 0000000..0fe0e04
--- /dev/null
+++ b/config/recipes/desktop/recipe-wayblue-sway-main.yml
@@ -0,0 +1,22 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-sway-main-hardened
+# description will be included in the image's metadata
+description: "wayblue sway 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/sway
+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-sway-nvidia-userns.yml b/config/recipes/desktop/recipe-wayblue-sway-nvidia-userns.yml
new file mode 100644
index 0000000..9303265
--- /dev/null
+++ b/config/recipes/desktop/recipe-wayblue-sway-nvidia-userns.yml
@@ -0,0 +1,20 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-sway-nvidia-userns-hardened
+# description will be included in the image's metadata
+description: "wayblue sway 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/sway-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-sway-nvidia.yml b/config/recipes/desktop/recipe-wayblue-sway-nvidia.yml
new file mode 100644
index 0000000..731871c
--- /dev/null
+++ b/config/recipes/desktop/recipe-wayblue-sway-nvidia.yml
@@ -0,0 +1,22 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-sway-nvidia-hardened
+# description will be included in the image's metadata
+description: "wayblue sway 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/sway-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-wayblue-sway-main-laptop-userns.yml b/config/recipes/laptop/recipe-wayblue-sway-main-laptop-userns.yml
new file mode 100644
index 0000000..5775745
--- /dev/null
+++ b/config/recipes/laptop/recipe-wayblue-sway-main-laptop-userns.yml
@@ -0,0 +1,21 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-sway-main-laptop-userns-hardened
+# description will be included in the image's metadata
+description: "wayblue sway 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/sway
+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-sway-main-laptop.yml b/config/recipes/laptop/recipe-wayblue-sway-main-laptop.yml
new file mode 100644
index 0000000..2158cc4
--- /dev/null
+++ b/config/recipes/laptop/recipe-wayblue-sway-main-laptop.yml
@@ -0,0 +1,23 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-sway-main-laptop-hardened
+# description will be included in the image's metadata
+description: "wayblue sway 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/sway
+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-sway-nvidia-laptop-userns.yml b/config/recipes/laptop/recipe-wayblue-sway-nvidia-laptop-userns.yml
new file mode 100644
index 0000000..44f9dcf
--- /dev/null
+++ b/config/recipes/laptop/recipe-wayblue-sway-nvidia-laptop-userns.yml
@@ -0,0 +1,23 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-sway-nvidia-laptop-userns-hardened
+# description will be included in the image's metadata
+description: "wayblue sway 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/sway-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-sway-nvidia-laptop.yml b/config/recipes/laptop/recipe-wayblue-sway-nvidia-laptop.yml
new file mode 100644
index 0000000..9c35a1c
--- /dev/null
+++ b/config/recipes/laptop/recipe-wayblue-sway-nvidia-laptop.yml
@@ -0,0 +1,25 @@
+# image will be published to ghcr.io/<user>/<name>
+name: wayblue-sway-nvidia-laptop-hardened
+# description will be included in the image's metadata
+description: "wayblue sway 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/sway-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