feat: refactor recipe files to modularize common configurations and scripts

L0g0ff · L0g0ff · commit 472254b34a2d · 2026-02-09T19:51:35.000+01:00
diff --git a/recipes/common-dnf.yml b/recipes/common-dnf.yml
@@ -0,0 +1,36 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
+
+modules:
+  - type: dnf
+    install:
+      packages:
+        - keeperpasswordmanager
+    repos:
+      cleanup: true
+      files:
+        - keeper.repo
+
+  - type: dnf
+    install:
+      packages:
+        - https://github.com/ramboxapp/download/releases/download/v2.5.2/Rambox-2.5.2-linux-x64.rpm
+        - wezterm
+        - https://cdn.zoom.us/prod/6.7.2.6498/zoom_x86_64.rpm
+        - https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm
+        - https://github.com/PowerShell/PowerShell/releases/download/v7.5.4/powershell-7.5.4-1.rh.x86_64.rpm
+        - https://github.com/TibixDev/winboat/releases/download/v0.9.0/winboat-0.9.0-x86_64.rpm
+    repos:
+      cleanup: true
+      copr:
+        - wezfurlong/wezterm-nightly
+
+  - type: dnf
+    install:
+      packages:
+        - https://repo.kompassos.nl/rpm/ICAClient-rhel-25.08.0.88-0.x86_64.rpm
+    repos:
+      cleanup: true
+      files:
+        - https://repo.kompassos.nl/rpm/kompass.repo
+        - https://copr.fedorainfracloud.org/coprs/mlampe/webkit2gtk3/repo/rhel+epel-10/mlampe-webkit2gtk3-rhel+epel-10.repo # Workaround for Citrix ICAClient dependency on webkit2gtk3: https://community.citrix.com/forums/topic/258561-fedora-43-no-longer-provides-webkit2gtk3-226/
diff --git a/recipes/common-files.yml b/recipes/common-files.yml
@@ -0,0 +1,21 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
+
+modules:
+  - type: files
+    files:
+      - source: system
+        destination: / # copies files/system/* (* means everything inside it) into your image's root folder /
+
+  - type: justfiles
+    validate: false
+    include:
+    - configure_bridge_networking.just
+    - generate_iso.just
+    - install_claude_code.just
+    - install_copilot_cli.just
+    - install_cups_canon.just
+    - install_netextender.just
+    - install_vagrant.just
+    - remove_bridge_networking.just
+    - show_bridge_networking.just
diff --git a/recipes/common-finalize.yml b/recipes/common-finalize.yml
@@ -0,0 +1,44 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
+
+modules:
+  - type: script
+    scripts:
+      - z_cleanup.sh
+
+  - type: default-flatpaks
+    configurations:
+      - notify: true
+        scope: system
+        repo:
+          url: https://flathub.org/repo/flathub.flatpakrepo
+          title: Flathub (system)
+        install:
+          - org.mozilla.Thunderbird
+          - org.mozilla.firefox
+          - org.kde.kcalc
+          - org.kde.gwenview
+          - org.kde.kontact
+          - org.kde.okular
+          - org.kde.kweather
+          - org.kde.kclock
+          - org.fkoehler.KTailctl
+          - org.kde.haruna
+          - com.github.tchx84.Flatseal
+          - com.ranfdev.DistroShelf
+          - io.github.flattool.Warehouse
+          - org.fedoraproject.MediaWriter
+          - io.missioncenter.MissionCenter
+          - org.gnome.DejaDup
+          - com.borgbase.Vorta
+          - io.github.input_leap.input-leap
+          - org.gtk.Gtk3theme.Breeze
+          - io.github.pwr_solaar.solaar
+          - org.gustavoperedo.FontDownloader
+          - org.kde.skanpage
+          - io.podman_desktop.PodmanDesktop
+          - io.github.getnf.embellish
+          - me.iepure.devtoolbox
+          - sh.loft.devpod
+
+  - type: initramfs #needed for plymouth
diff --git a/recipes/common-scripts.yml b/recipes/common-scripts.yml
@@ -0,0 +1,15 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
+
+modules:
+  - type: script
+    scripts:
+      - disable_service_tailscale.sh
+      - enable_user_ydotool.sh
+      - install_system_tools.sh
+      - reconfigure_plymouth.sh
+      - set_fix_blurry_wayland_apps.sh
+      - set_sddm_start_numlock.sh
+      - set_ssh_unprivileged_ports.sh
+
+  - type: signing # this sets up the proper policy & signing files for signed images to work fully
diff --git a/recipes/recipe-dx-hwe-nvidia.yml b/recipes/recipe-dx-hwe-nvidia.yml
@@ -2,73 +2,13 @@
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: kompassos-dx-hwe-nvidia
 description: Aurora Developer Experience Nvidia Hardware with some extra gravy.
-
-# base-image: ghcr.io/ublue-os/aurora-dx-nvidia-open
 base-image: ghcr.io/ublue-os/aurora-dx-nvidia-open
-image-version: stable # latest is also supported if you want new updates ASAP
-
-# Validate recipe
-# bluebuild validate --all-errors ./recipes/recipe-dx-hwe-nvidia.yml
-
-## Local build test
-# Download base image first to speed up local build:
-# docker pull ghcr.io/ublue-os/aurora-dx-nvidia-open:stable
-# then build locally with:
-# bluebuild build ./recipes/recipe-dx-hwe-nvidia.yml 
+image-version: stable
 
 modules:
-  - type: files
-    files:
-      - source: system
-        destination: / # copies files/system/* (* means everything inside it) into your image's root folder /
-
-  - type: justfiles
-    validate: false
-    include:
-    - configure_bridge_networking.just
-    - generate_iso.just
-    - install_claude_code.just
-    - install_copilot_cli.just
-    - install_cups_canon.just
-    - install_netextender.just
-    - install_vagrant.just
-    - remove_bridge_networking.just
-    - show_bridge_networking.just
-
-  - type: script
-    scripts:
-      - disable_service_tailscale.sh
-      - enable_user_ydotool.sh
-      - install_system_tools.sh
-      - reconfigure_plymouth.sh
-      - set_fix_blurry_wayland_apps.sh
-      - set_sddm_start_numlock.sh
-      - set_ssh_unprivileged_ports.sh
-
-  - type: signing # this sets up the proper policy & signing files for signed images to work fully
-
-  - type: dnf
-    install:
-      packages:
-        - keeperpasswordmanager
-    repos:
-      cleanup: true
-      files:
-        - keeper.repo
-
-  - type: dnf
-    install:
-      packages:
-        - https://github.com/ramboxapp/download/releases/download/v2.5.2/Rambox-2.5.2-linux-x64.rpm
-        - wezterm
-        - https://cdn.zoom.us/prod/6.7.2.6498/zoom_x86_64.rpm
-        - https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm
-        - https://github.com/PowerShell/PowerShell/releases/download/v7.5.4/powershell-7.5.4-1.rh.x86_64.rpm
-        - https://github.com/TibixDev/winboat/releases/download/v0.9.0/winboat-0.9.0-x86_64.rpm
-    repos:
-      cleanup: true
-      copr:
-        - wezfurlong/wezterm-nightly
+  - from-file: common-files.yml
+  - from-file: common-scripts.yml
+  - from-file: common-dnf.yml
 
   # Intel IPU6 Camera support (for built-in laptop webcam)
   # Dependencies: dummy kmod -> v4l2-relayd -> gstreamer plugin -> camera-bins -> camera-hal
@@ -82,54 +22,5 @@ modules:
       - https://download1.rpmfusion.org/nonfree/fedora/releases/43/Everything/x86_64/os/Packages/g/gstreamer1-plugins-icamerasrc-0.0-15.20250325git7f90219.fc43.x86_64.rpm
       - https://download1.rpmfusion.org/nonfree/fedora/releases/43/Everything/x86_64/os/Packages/i/ipu6-camera-bins-0.0-19.20250627git30e8766.fc43.x86_64.rpm
       - https://download1.rpmfusion.org/nonfree/fedora/releases/43/Everything/x86_64/os/Packages/i/ipu6-camera-hal-0.0-26.20250627gitc933525.fc43.x86_64.rpm
-    
-  - type: dnf
-    install:
-      packages:
-        - https://repo.kompassos.nl/rpm/ICAClient-rhel-25.08.0.88-0.x86_64.rpm
-    repos:
-      cleanup: true
-      files:
-        - https://repo.kompassos.nl/rpm/kompass.repo
-        - https://copr.fedorainfracloud.org/coprs/mlampe/webkit2gtk3/repo/rhel+epel-10/mlampe-webkit2gtk3-rhel+epel-10.repo # Workaround for Citrix ICAClient dependency on webkit2gtk3: https://community.citrix.com/forums/topic/258561-fedora-43-no-longer-provides-webkit2gtk3-226/
-
-  - type: script
-    scripts:
-      - z_cleanup.sh
 
-  - type: default-flatpaks
-    configurations:
-      - notify: true
-        scope: system
-        repo:
-          url: https://flathub.org/repo/flathub.flatpakrepo
-          title: Flathub (system)
-        install:
-          - org.mozilla.Thunderbird
-          - org.mozilla.firefox
-          - org.kde.kcalc
-          - org.kde.gwenview
-          - org.kde.kontact
-          - org.kde.okular
-          - org.kde.kweather
-          - org.kde.kclock
-          - org.fkoehler.KTailctl
-          - org.kde.haruna
-          - com.github.tchx84.Flatseal
-          - com.ranfdev.DistroShelf
-          - io.github.flattool.Warehouse
-          - org.fedoraproject.MediaWriter
-          - io.missioncenter.MissionCenter
-          - org.gnome.DejaDup
-          - com.borgbase.Vorta
-          - io.github.input_leap.input-leap
-          - org.gtk.Gtk3theme.Breeze
-          - io.github.pwr_solaar.solaar
-          - org.gustavoperedo.FontDownloader
-          - org.kde.skanpage
-          - io.podman_desktop.PodmanDesktop
-          - io.github.getnf.embellish
-          - me.iepure.devtoolbox
-          - sh.loft.devpod
-    
-  - type: initramfs #needed for plymouth
+  - from-file: common-finalize.yml
diff --git a/recipes/recipe-dx-hwe.yml b/recipes/recipe-dx-hwe.yml
@@ -3,118 +3,10 @@
 name: kompassos-dx-hwe
 description: Aurora Developer Experience Hardware Enablement with some extra gravy.
 base-image: ghcr.io/ublue-os/aurora-dx
-image-version: stable # latest is also supported if you want new updates ASAP
-
-# Validate recipe
-# bluebuild validate --all-errors ./recipes/recipe-dx-hwe.yml
-
-## Local build test
-# Download base image first to speed up local build:
-# docker pull ghcr.io/ublue-os/aurora-dx:stable
-# then build locally with:
-# bluebuild build ./recipes/recipe-dx-hwe.yml 
+image-version: stable
 
 modules:
-  - type: files
-    files:
-      - source: system
-        destination: / # copies files/system/* (* means everything inside it) into your image's root folder /
-  
-  - type: justfiles
-    validate: false
-    include:
-    - configure_bridge_networking.just
-    - generate_iso.just
-    - install_claude_code.just
-    - install_copilot_cli.just
-    - install_cups_canon.just
-    - install_netextender.just
-    - install_vagrant.just
-    - remove_bridge_networking.just
-    - show_bridge_networking.just
-
-  - type: script
-    scripts:
-      - disable_service_tailscale.sh
-      - enable_user_ydotool.sh
-      - install_system_tools.sh
-      - reconfigure_plymouth.sh
-      - set_fix_blurry_wayland_apps.sh
-      - set_sddm_start_numlock.sh
-      - set_ssh_unprivileged_ports.sh
-
-  - type: signing # this sets up the proper policy & signing files for signed images to work fully
-
-  - type: dnf
-    install:
-      packages:
-        - keeperpasswordmanager
-    repos:
-      cleanup: true
-      files:
-        - keeper.repo
-
-  - type: dnf
-    install:
-      packages:
-        - https://github.com/ramboxapp/download/releases/download/v2.5.2/Rambox-2.5.2-linux-x64.rpm
-        - wezterm
-        - https://cdn.zoom.us/prod/6.7.2.6498/zoom_x86_64.rpm
-        - https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm
-        - https://github.com/PowerShell/PowerShell/releases/download/v7.5.4/powershell-7.5.4-1.rh.x86_64.rpm
-        - https://github.com/TibixDev/winboat/releases/download/v0.9.0/winboat-0.9.0-x86_64.rpm
-    repos:
-      cleanup: true
-      copr:
-        - wezfurlong/wezterm-nightly
-
-  - type: dnf
-    install:
-      packages:
-        - https://repo.kompassos.nl/rpm/ICAClient-rhel-25.08.0.88-0.x86_64.rpm
-    repos:
-      cleanup: true
-      files:
-        - https://repo.kompassos.nl/rpm/kompass.repo
-        - https://copr.fedorainfracloud.org/coprs/mlampe/webkit2gtk3/repo/rhel+epel-10/mlampe-webkit2gtk3-rhel+epel-10.repo # Workaround for Citrix ICAClient dependency on webkit2gtk3: https://community.citrix.com/forums/topic/258561-fedora-43-no-longer-provides-webkit2gtk3-226/
-
-  - type: script
-    scripts:
-      - z_cleanup.sh
-
-  - type: default-flatpaks
-    configurations:
-      - notify: true
-        scope: system
-        repo:
-          url: https://flathub.org/repo/flathub.flatpakrepo
-          title: Flathub (system)
-        install:
-          - org.mozilla.Thunderbird
-          - org.mozilla.firefox
-          - org.kde.kcalc
-          - org.kde.gwenview
-          - org.kde.kontact
-          - org.kde.okular
-          - org.kde.kweather
-          - org.kde.kclock
-          - org.fkoehler.KTailctl
-          - org.kde.haruna
-          - com.github.tchx84.Flatseal
-          - com.ranfdev.DistroShelf
-          - io.github.flattool.Warehouse
-          - org.fedoraproject.MediaWriter
-          - io.missioncenter.MissionCenter
-          - org.gnome.DejaDup
-          - com.borgbase.Vorta
-          - io.github.input_leap.input-leap
-          - org.gtk.Gtk3theme.Breeze
-          - io.github.pwr_solaar.solaar
-          - org.gustavoperedo.FontDownloader
-          - org.kde.skanpage
-          - io.podman_desktop.PodmanDesktop
-          - io.github.getnf.embellish
-          - me.iepure.devtoolbox
-          - sh.loft.devpod
-
-  - type: initramfs #needed for plymouth
+  - from-file: common-files.yml
+  - from-file: common-scripts.yml
+  - from-file: common-dnf.yml
+  - from-file: common-finalize.yml
diff --git a/recipes/recipe-dx-surface.yml b/recipes/recipe-dx-surface.yml
