diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e85da28..4d86b43 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,25 +22,25 @@ jobs: matrix: recipe: # non-userns - # desktop - - recipes/desktop/recipe-silverblue-main.yml - - recipes/desktop/recipe-silverblue-nvidia.yml - - recipes/desktop/recipe-kinoite-main.yml - - recipes/desktop/recipe-kinoite-nvidia.yml - - recipes/desktop/recipe-cinnamon-main.yml - - recipes/desktop/recipe-cinnamon-nvidia.yml - - recipes/desktop/recipe-bluefin-main.yml - - recipes/desktop/recipe-bluefin-nvidia.yml - - recipes/desktop/recipe-sericea-main.yml - - 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 - - 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 + # general + - recipes/general/recipe-silverblue-main.yml + - recipes/general/recipe-silverblue-nvidia.yml + - recipes/general/recipe-kinoite-main.yml + - recipes/general/recipe-kinoite-nvidia.yml + - recipes/general/recipe-cinnamon-main.yml + - recipes/general/recipe-cinnamon-nvidia.yml + - recipes/general/recipe-bluefin-main.yml + - recipes/general/recipe-bluefin-nvidia.yml + - recipes/general/recipe-sericea-main.yml + - recipes/general/recipe-sericea-nvidia.yml + - recipes/general/recipe-wayblue-wayfire-main.yml + - recipes/general/recipe-wayblue-wayfire-nvidia.yml + - recipes/general/recipe-wayblue-hyprland-main.yml + - recipes/general/recipe-wayblue-hyprland-nvidia.yml + - recipes/general/recipe-wayblue-river-main.yml + - recipes/general/recipe-wayblue-river-nvidia.yml + - recipes/general/recipe-wayblue-sway-main.yml + - recipes/general/recipe-wayblue-sway-nvidia.yml # laptop - recipes/laptop/recipe-silverblue-main-laptop.yml - recipes/laptop/recipe-silverblue-nvidia-laptop.yml @@ -73,27 +73,27 @@ jobs: - recipes/server/recipe-server-main.yml - recipes/server/recipe-server-nvidia.yml # userns - # desktop - - recipes/desktop/recipe-silverblue-main-userns.yml - - recipes/desktop/recipe-silverblue-nvidia-userns.yml - - recipes/desktop/recipe-kinoite-main-userns.yml - - recipes/desktop/recipe-kinoite-nvidia-userns.yml - - recipes/desktop/recipe-cinnamon-main-userns.yml - - recipes/desktop/recipe-cinnamon-nvidia-userns.yml - - recipes/desktop/recipe-bluefin-main-userns.yml - - recipes/desktop/recipe-bluefin-nvidia-userns.yml - - recipes/desktop/recipe-bluefin-dx-main-userns.yml - - recipes/desktop/recipe-bluefin-dx-nvidia-userns.yml - - recipes/desktop/recipe-sericea-main-userns.yml - - 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 - - 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 + # general + - recipes/general/recipe-silverblue-main-userns.yml + - recipes/general/recipe-silverblue-nvidia-userns.yml + - recipes/general/recipe-kinoite-main-userns.yml + - recipes/general/recipe-kinoite-nvidia-userns.yml + - recipes/general/recipe-cinnamon-main-userns.yml + - recipes/general/recipe-cinnamon-nvidia-userns.yml + - recipes/general/recipe-bluefin-main-userns.yml + - recipes/general/recipe-bluefin-nvidia-userns.yml + - recipes/general/recipe-bluefin-dx-main-userns.yml + - recipes/general/recipe-bluefin-dx-nvidia-userns.yml + - recipes/general/recipe-sericea-main-userns.yml + - recipes/general/recipe-sericea-nvidia-userns.yml + - recipes/general/recipe-wayblue-wayfire-main-userns.yml + - recipes/general/recipe-wayblue-wayfire-nvidia-userns.yml + - recipes/general/recipe-wayblue-hyprland-main-userns.yml + - recipes/general/recipe-wayblue-hyprland-nvidia-userns.yml + - recipes/general/recipe-wayblue-river-main-userns.yml + - recipes/general/recipe-wayblue-river-nvidia-userns.yml + - recipes/general/recipe-wayblue-sway-main-userns.yml + - recipes/general/recipe-wayblue-sway-nvidia-userns.yml # laptop - recipes/laptop/recipe-silverblue-main-laptop-userns.yml - recipes/laptop/recipe-silverblue-nvidia-laptop-userns.yml diff --git a/README.md b/README.md index c6b1f71..cb59fec 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Have a look at [PREINSTALL-README](PREINSTALL-README.md) before proceeding. #### Without User Namespaces [What's the difference?](USERNS.md) -##### desktop +##### general purpose - kinoite-main-hardened - kinoite-nvidia-hardened - cinnamon-main-hardened @@ -85,35 +85,11 @@ Have a look at [PREINSTALL-README](PREINSTALL-README.md) before proceeding. - wayblue-sway-main-hardened - wayblue-sway-nvidia-hardened -##### laptop [changes](./config/recipes/laptop/laptop-bling.yml) -- kinoite-main-laptop-hardened -- kinoite-nvidia-laptop-hardened -- cinnamon-main-laptop-hardened -- cinnamon-nvidia-laptop-hardened -- bluefin-main-laptop-hardened -- bluefin-nvidia-laptop-hardened -- silverblue-main-laptop-hardened -- silverblue-nvidia-laptop-hardened +##### asus [docs](https://universal-blue.org/images/asus/) - silverblue-asus-hardened - silverblue-asus-nvidia-hardened - kinoite-asus-hardened - kinoite-asus-nvidia-hardened -- sericea-main-laptop-hardened -- sericea-nvidia-laptop-hardened -- wayblue-wayfire-main-laptop-hardened -- wayblue-wayfire-nvidia-laptop-hardened -- wayblue-hyprland-main-laptop-hardened -- 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 [docs](https://universal-blue.org/images/framework/) -- kinoite-framework-hardened -- bluefin-framework-hardened -- silverblue-framework-hardened -- sericea-framework-hardened ##### server - server-main-hardened @@ -121,7 +97,7 @@ Have a look at [PREINSTALL-README](PREINSTALL-README.md) before proceeding. #### With User Namespaces [What's the difference?](USERNS.md) -##### desktop +##### general purpose - kinoite-main-userns-hardened - kinoite-nvidia-userns-hardened - cinnamon-main-userns-hardened @@ -143,38 +119,11 @@ Have a look at [PREINSTALL-README](PREINSTALL-README.md) before proceeding. - wayblue-sway-main-userns-hardened - wayblue-sway-nvidia-userns-hardened -##### laptop [changes](./config/recipes/laptop/laptop-bling.yml) -- kinoite-main-laptop-userns-hardened -- kinoite-nvidia-laptop-userns-hardened -- cinnamon-main-laptop-userns-hardened -- cinnamon-nvidia-laptop-userns-hardened -- bluefin-dx-main-laptop-userns-hardened -- bluefin-dx-nvidia-laptop-userns-hardened -- bluefin-main-laptop-userns-hardened -- bluefin-nvidia-laptop-userns-hardened -- silverblue-main-laptop-userns-hardened -- silverblue-nvidia-laptop-userns-hardened +##### asus [docs](https://universal-blue.org/images/asus/) - silverblue-asus-userns-hardened - silverblue-asus-nvidia-userns-hardened - kinoite-asus-userns-hardened - kinoite-asus-nvidia-userns-hardened -- sericea-main-laptop-userns-hardened -- 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 -- 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 [docs](https://universal-blue.org/images/framework/) -- kinoite-framework-userns-hardened -- bluefin-framework-userns-hardened -- bluefin-dx-framework-userns-hardened -- silverblue-framework-userns-hardened -- sericea-framework-userns-hardened ##### server - server-main-userns-hardened @@ -218,6 +167,14 @@ rpm-ostree kargs \ --append=nvidia-drm.modeset=1 ``` +#### Nvidia optimus laptop +If you are using an nvidia image on an optimus laptop, run this after installation: + +``` +ujust configure-nvidia-optimus +``` + + ## Contributing Follow the [contributing documentation](CONTRIBUTING.md#contributing), and make sure to respect the [CoC](CODE_OF_CONDUCT.md). diff --git a/config/files/usr/libexec/deprecated-images.json b/config/files/usr/libexec/deprecated-images.json new file mode 100644 index 0000000..193a421 --- /dev/null +++ b/config/files/usr/libexec/deprecated-images.json @@ -0,0 +1,7 @@ +{ + "imageTypes": [ + "framework", + "main-laptop", + "nvidia-laptop" + ] +} \ No newline at end of file diff --git a/config/files/usr/libexec/deprecated-images.json.md b/config/files/usr/libexec/deprecated-images.json.md new file mode 100644 index 0000000..cd59afd --- /dev/null +++ b/config/files/usr/libexec/deprecated-images.json.md @@ -0,0 +1,18 @@ +# Deprecated Images + +The following image types have been deprecated: + +## framework + +Rationale: [Deprecated upstream](https://github.com/ublue-os/framework#this-image-is-deprecated) +Rebase to: The equivalent image replacing `-framework` with `-main`. For example, for `kinoite-framework-hardened`, rebase to `kinoite-main-hardened`. + +## main-laptop + +Rationale: Upstream recommendations have changed and improvements are being made to PPD. +Rebase to: The equivalent image without `-laptop`. For example, for `kinoite-main-laptop-hardened`, rebase to `kinoite-main-hardened`. + +## nvidia-laptop + +Rationale: Upstream recommendations have changed and improvements are being made to PPD. Additionally, nvidia optimus configuration has moved to upstream `just` commands. +Rebase to: The equivalent image without `-laptop`. For example, for `kinoite-nvidia-laptop-hardened`, rebase to `kinoite-nvidia-hardened` and reboot. Then, run `ujust configure-nvidia-optimus`. diff --git a/config/files/usr/libexec/ublue-motd b/config/files/usr/libexec/ublue-motd index 018b4d5..027363b 100755 --- a/config/files/usr/libexec/ublue-motd +++ b/config/files/usr/libexec/ublue-motd @@ -13,13 +13,26 @@ IMAGE_DATE_SECONDS=$(date -d "$IMAGE_DATE" +%s) CURRENT_SECONDS=$(date +%s) DIFFERENCE=$((CURRENT_SECONDS - IMAGE_DATE_SECONDS)) MONTH=$((7 * 24 * 60 * 60)) -if [ "$DIFFERENCE" -ge "$MONTH" ]; then + +readarray -t imageTypes < <(jq -r '.imageTypes[]' deprecated-images.json) + +isDeprecated=false +for imageType in "${imageTypes[@]}"; do + if [[ "$IMAGE_REF_NAME" == *"$imageType"* ]]; then + isDeprecated=true + break + fi +done + +if $isDeprecated; then + TIP='~~~ NOTICE: You are on a deprecated image, please rebase. ~~~\n~~~ For more information, visit https://github.com/secureblue/secureblue/blob/live/config/files/usr/libexec/deprecated-images.json.md ~~~' +elif [ "$DIFFERENCE" -ge "$MONTH" ]; then TIP='~~~ NOTICE: Your current image is over 1 week old, run `ujust update`. ~~~' else TIP='~~~ NOTICE: There is currently no notice. ~~~' fi -TIP_OUTPUT=$(sed -e "s/%IMAGE_REF_NAME%/$IMAGE_REF_NAME/g" -e "s/%IMAGE_TAG%/$IMAGE_TAG/g" -e "s/%TIP%/$TIP/g" /usr/share/ublue-os/motd/secureblue.txt) +TIP_OUTPUT=$(sed -e "s/%IMAGE_REF_NAME%/$IMAGE_REF_NAME/g" -e "s/%IMAGE_TAG%/$IMAGE_TAG/g" -e "s#%TIP%#$TIP#g" /usr/share/ublue-os/motd/secureblue.txt) while IFS= read -r line; do echo "$line" done <<< $TIP_OUTPUT diff --git a/config/recipes/desktop/recipe-bluefin-dx-main-userns.yml b/config/recipes/general/recipe-bluefin-dx-main-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-bluefin-dx-main-userns.yml rename to config/recipes/general/recipe-bluefin-dx-main-userns.yml diff --git a/config/recipes/desktop/recipe-bluefin-dx-nvidia-userns.yml b/config/recipes/general/recipe-bluefin-dx-nvidia-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-bluefin-dx-nvidia-userns.yml rename to config/recipes/general/recipe-bluefin-dx-nvidia-userns.yml diff --git a/config/recipes/desktop/recipe-bluefin-main-userns.yml b/config/recipes/general/recipe-bluefin-main-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-bluefin-main-userns.yml rename to config/recipes/general/recipe-bluefin-main-userns.yml diff --git a/config/recipes/desktop/recipe-bluefin-main.yml b/config/recipes/general/recipe-bluefin-main.yml similarity index 100% rename from config/recipes/desktop/recipe-bluefin-main.yml rename to config/recipes/general/recipe-bluefin-main.yml diff --git a/config/recipes/desktop/recipe-bluefin-nvidia-userns.yml b/config/recipes/general/recipe-bluefin-nvidia-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-bluefin-nvidia-userns.yml rename to config/recipes/general/recipe-bluefin-nvidia-userns.yml diff --git a/config/recipes/desktop/recipe-bluefin-nvidia.yml b/config/recipes/general/recipe-bluefin-nvidia.yml similarity index 100% rename from config/recipes/desktop/recipe-bluefin-nvidia.yml rename to config/recipes/general/recipe-bluefin-nvidia.yml diff --git a/config/recipes/desktop/recipe-cinnamon-main-userns.yml b/config/recipes/general/recipe-cinnamon-main-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-cinnamon-main-userns.yml rename to config/recipes/general/recipe-cinnamon-main-userns.yml diff --git a/config/recipes/desktop/recipe-cinnamon-main.yml b/config/recipes/general/recipe-cinnamon-main.yml similarity index 100% rename from config/recipes/desktop/recipe-cinnamon-main.yml rename to config/recipes/general/recipe-cinnamon-main.yml diff --git a/config/recipes/desktop/recipe-cinnamon-nvidia-userns.yml b/config/recipes/general/recipe-cinnamon-nvidia-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-cinnamon-nvidia-userns.yml rename to config/recipes/general/recipe-cinnamon-nvidia-userns.yml diff --git a/config/recipes/desktop/recipe-cinnamon-nvidia.yml b/config/recipes/general/recipe-cinnamon-nvidia.yml similarity index 100% rename from config/recipes/desktop/recipe-cinnamon-nvidia.yml rename to config/recipes/general/recipe-cinnamon-nvidia.yml diff --git a/config/recipes/desktop/recipe-kinoite-main-userns.yml b/config/recipes/general/recipe-kinoite-main-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-kinoite-main-userns.yml rename to config/recipes/general/recipe-kinoite-main-userns.yml diff --git a/config/recipes/desktop/recipe-kinoite-main.yml b/config/recipes/general/recipe-kinoite-main.yml similarity index 100% rename from config/recipes/desktop/recipe-kinoite-main.yml rename to config/recipes/general/recipe-kinoite-main.yml diff --git a/config/recipes/desktop/recipe-kinoite-nvidia-userns.yml b/config/recipes/general/recipe-kinoite-nvidia-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-kinoite-nvidia-userns.yml rename to config/recipes/general/recipe-kinoite-nvidia-userns.yml diff --git a/config/recipes/desktop/recipe-kinoite-nvidia.yml b/config/recipes/general/recipe-kinoite-nvidia.yml similarity index 100% rename from config/recipes/desktop/recipe-kinoite-nvidia.yml rename to config/recipes/general/recipe-kinoite-nvidia.yml diff --git a/config/recipes/desktop/recipe-sericea-main-userns.yml b/config/recipes/general/recipe-sericea-main-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-sericea-main-userns.yml rename to config/recipes/general/recipe-sericea-main-userns.yml diff --git a/config/recipes/desktop/recipe-sericea-main.yml b/config/recipes/general/recipe-sericea-main.yml similarity index 100% rename from config/recipes/desktop/recipe-sericea-main.yml rename to config/recipes/general/recipe-sericea-main.yml diff --git a/config/recipes/desktop/recipe-sericea-nvidia-userns.yml b/config/recipes/general/recipe-sericea-nvidia-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-sericea-nvidia-userns.yml rename to config/recipes/general/recipe-sericea-nvidia-userns.yml diff --git a/config/recipes/desktop/recipe-sericea-nvidia.yml b/config/recipes/general/recipe-sericea-nvidia.yml similarity index 100% rename from config/recipes/desktop/recipe-sericea-nvidia.yml rename to config/recipes/general/recipe-sericea-nvidia.yml diff --git a/config/recipes/desktop/recipe-silverblue-main-userns.yml b/config/recipes/general/recipe-silverblue-main-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-silverblue-main-userns.yml rename to config/recipes/general/recipe-silverblue-main-userns.yml diff --git a/config/recipes/desktop/recipe-silverblue-main.yml b/config/recipes/general/recipe-silverblue-main.yml similarity index 100% rename from config/recipes/desktop/recipe-silverblue-main.yml rename to config/recipes/general/recipe-silverblue-main.yml diff --git a/config/recipes/desktop/recipe-silverblue-nvidia-userns.yml b/config/recipes/general/recipe-silverblue-nvidia-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-silverblue-nvidia-userns.yml rename to config/recipes/general/recipe-silverblue-nvidia-userns.yml diff --git a/config/recipes/desktop/recipe-silverblue-nvidia.yml b/config/recipes/general/recipe-silverblue-nvidia.yml similarity index 100% rename from config/recipes/desktop/recipe-silverblue-nvidia.yml rename to config/recipes/general/recipe-silverblue-nvidia.yml diff --git a/config/recipes/desktop/recipe-wayblue-hyprland-main-userns.yml b/config/recipes/general/recipe-wayblue-hyprland-main-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-hyprland-main-userns.yml rename to config/recipes/general/recipe-wayblue-hyprland-main-userns.yml diff --git a/config/recipes/desktop/recipe-wayblue-hyprland-main.yml b/config/recipes/general/recipe-wayblue-hyprland-main.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-hyprland-main.yml rename to config/recipes/general/recipe-wayblue-hyprland-main.yml diff --git a/config/recipes/desktop/recipe-wayblue-hyprland-nvidia-userns.yml b/config/recipes/general/recipe-wayblue-hyprland-nvidia-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-hyprland-nvidia-userns.yml rename to config/recipes/general/recipe-wayblue-hyprland-nvidia-userns.yml diff --git a/config/recipes/desktop/recipe-wayblue-hyprland-nvidia.yml b/config/recipes/general/recipe-wayblue-hyprland-nvidia.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-hyprland-nvidia.yml rename to config/recipes/general/recipe-wayblue-hyprland-nvidia.yml diff --git a/config/recipes/desktop/recipe-wayblue-river-main-userns.yml b/config/recipes/general/recipe-wayblue-river-main-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-river-main-userns.yml rename to config/recipes/general/recipe-wayblue-river-main-userns.yml diff --git a/config/recipes/desktop/recipe-wayblue-river-main.yml b/config/recipes/general/recipe-wayblue-river-main.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-river-main.yml rename to config/recipes/general/recipe-wayblue-river-main.yml diff --git a/config/recipes/desktop/recipe-wayblue-river-nvidia-userns.yml b/config/recipes/general/recipe-wayblue-river-nvidia-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-river-nvidia-userns.yml rename to config/recipes/general/recipe-wayblue-river-nvidia-userns.yml diff --git a/config/recipes/desktop/recipe-wayblue-river-nvidia.yml b/config/recipes/general/recipe-wayblue-river-nvidia.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-river-nvidia.yml rename to config/recipes/general/recipe-wayblue-river-nvidia.yml diff --git a/config/recipes/desktop/recipe-wayblue-sway-main-userns.yml b/config/recipes/general/recipe-wayblue-sway-main-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-sway-main-userns.yml rename to config/recipes/general/recipe-wayblue-sway-main-userns.yml diff --git a/config/recipes/desktop/recipe-wayblue-sway-main.yml b/config/recipes/general/recipe-wayblue-sway-main.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-sway-main.yml rename to config/recipes/general/recipe-wayblue-sway-main.yml diff --git a/config/recipes/desktop/recipe-wayblue-sway-nvidia-userns.yml b/config/recipes/general/recipe-wayblue-sway-nvidia-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-sway-nvidia-userns.yml rename to config/recipes/general/recipe-wayblue-sway-nvidia-userns.yml diff --git a/config/recipes/desktop/recipe-wayblue-sway-nvidia.yml b/config/recipes/general/recipe-wayblue-sway-nvidia.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-sway-nvidia.yml rename to config/recipes/general/recipe-wayblue-sway-nvidia.yml diff --git a/config/recipes/desktop/recipe-wayblue-wayfire-main-userns.yml b/config/recipes/general/recipe-wayblue-wayfire-main-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-wayfire-main-userns.yml rename to config/recipes/general/recipe-wayblue-wayfire-main-userns.yml diff --git a/config/recipes/desktop/recipe-wayblue-wayfire-main.yml b/config/recipes/general/recipe-wayblue-wayfire-main.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-wayfire-main.yml rename to config/recipes/general/recipe-wayblue-wayfire-main.yml diff --git a/config/recipes/desktop/recipe-wayblue-wayfire-nvidia-userns.yml b/config/recipes/general/recipe-wayblue-wayfire-nvidia-userns.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-wayfire-nvidia-userns.yml rename to config/recipes/general/recipe-wayblue-wayfire-nvidia-userns.yml diff --git a/config/recipes/desktop/recipe-wayblue-wayfire-nvidia.yml b/config/recipes/general/recipe-wayblue-wayfire-nvidia.yml similarity index 100% rename from config/recipes/desktop/recipe-wayblue-wayfire-nvidia.yml rename to config/recipes/general/recipe-wayblue-wayfire-nvidia.yml