Split build and pr test build to allow building with rechunk on github

Reviewed-on: #49
Co-authored-by: Eriq Taing <eriq12@protonmail.com>
Co-committed-by: Eriq Taing <eriq12@protonmail.com>

.github/workflows/build-pr-test.yml

@@ -1,6 +1,11 @@
-name: bluebuild-nvidia
+name: bluebuild test pr
 on:
+  pull_request:
   workflow_dispatch: # allow manually triggering builds
+concurrency:
+  # only run one build at a time
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
 jobs:
   bluebuild:
     name: Build Custom Image
@@ -14,8 +19,9 @@ jobs:
       matrix:
         recipe:
           # !! Add your recipes here
-          - recipe_nvidia.yml
+          - recipe.yml
     steps:
+      
       # the build is fully handled by the reusable github action
       - name: Build Custom Image
         uses: blue-build/github-action@v1.8
@@ -27,4 +33,4 @@ jobs:
           pr_event_number: ${{ github.event.number }}
 
           # enabled by default, disable if your image is small and you want faster builds
-          maximize_build_space: true
+          maximize_build_space: true

.github/workflows/build.yml

@@ -9,12 +9,11 @@ on:
       - main
     paths-ignore: # don't rebuild if only documentation has changed
       - "**.md"
-      - ".github/workflows/build-nvidia.yml"
-      - "files/scripts/nvidia/**"
-      - "recipes/components/nvidia-module.yml"
-      - "recipes/recipe_nvidia.yml"
-  pull_request:
   workflow_dispatch: # allow manually triggering builds
+concurrency:
+  # only run one build at a time
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
 jobs:
   bluebuild:
     name: Build Custom Image

files/scripts/nvidia/installtoolkitpolicy.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell build process to exit if there are any errors.
-set -oue pipefail
-
-semodule --verbose --install /usr/share/selinux/packages/nvidia-container.pp

files/scripts/nvidia/removeunusedrepos.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell build process to exit if there are any errors.
-set -oue pipefail
-
-rm -f /etc/yum.repos.d/negativo17-fedora-nvidia.repo
-rm -f /etc/yum.repos.d/negativo17-fedora-multimedia.repo
-rm -f /etc/yum.repos.d/eyecantcu-supergfxctl.repo
-rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo
-rm -f /etc/yum.repos.d/nvidia-container-toolkit.repo

files/scripts/nvidia/setdrmvariables.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell build process to exit if there are any errors.
-set -oue pipefail
-
-
-echo '
-
-# Nvidia modesetting support. Set to 0 or comment to disable kernel modesetting
-# support. This must be disabled in case of SLI Mosaic.
-
-options nvidia-drm modeset=1 fbdev=1
-
-' > /usr/lib/modprobe.d/nvidia-modeset.conf
-
-cp /usr/lib/modprobe.d/nvidia-modeset.conf /etc/modprobe.d/nvidia-modeset.conf

files/scripts/nvidia/setearlyloading.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell build process to exit if there are any errors.
-set -oue pipefail
-
-sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf
-sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf

files/systemd/user/hyprpanel.service

@@ -1,6 +1,5 @@
 [Unit]
 Description=A panel bar branched from AGS maintained by Hyprland devs.
-Documentation=man:waybar(5)
 # order startup after WM
 After=graphical-session.target
 

files/systemd/user/quickshell.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=A panel bar branched from AGS maintained by Hyprland devs.
+# order startup after WM
+After=graphical-session.target
+
+[Service]
+Type=exec
+# Repurpose XDG Autostart filtering
+ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
+ExecStart=/usr/bin/quickshell
+Restart=on-failure
+Slice=app-graphical.slice
+
+[Install]
+WantedBy=graphical-session.target
+# Alternatively can be wanted by specific WMs' targets
+# Should also be duplicated in 'After=' to avoid ordering loop
+#WantedBy=wayland-session@hyprland.desktop.target

recipes/components/nvidia-module.yml

@@ -1,16 +0,0 @@
-modules:
-  - type: containerfile
-    snippets:
-      - COPY --from=ghcr.io/ublue-os/akmods-nvidia:main-42 /rpms/ /tmp/rpms
-      - RUN find /tmp/rpms
-      - RUN rpm-ostree install /tmp/rpms/ublue-os/ublue-os-nvidia*.rpm
-      - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo
-      - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo   
-      - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm libnvidia-fbc libva-nvidia-driver nvidia-driver nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-container-toolkit 
-    
-  - type: script
-    scripts:
-      - nvidia/installtoolkitpolicy.sh
-      - nvidia/removeunusedrepos.sh
-      - nvidia/setearlyloading.sh
-      - nvidia/setdrmvariables.sh

recipes/components/systemd-module.yml

@@ -9,4 +9,5 @@ modules:
         - flatpak-user-update.timer
         - swww.service
         - hyprpanel.service
+        # - quickshell.service
         - hyprpolkitagent.service

recipes/dnf/hyprland.yml

@@ -3,13 +3,21 @@ modules:
     repos:
       copr:
         - solopasha/hyprland
+        - errornointernet/quickshell
     install:
       packages:
         - aquamarine
         - hyprland-git
-        - hyprpanel
         - hyprpolkitagent
         - hyprshot
         - hyprland-qt-support
         - hyprland-qtutils
-        - xdg-desktop-portal-hyprland
+        - xdg-desktop-portal-hyprland
+        - swww
+        - matugen
+
+        # hyprpanel
+        - hyprpanel
+
+        # quickshell
+        - quickshell

recipes/dnf/sddm.yml

@@ -9,6 +9,19 @@ modules:
         - qt5-qtquickcontrols2
         - qt5-qtsvg
 
+        # added libraries for quickshell
+        - qt5-qtimageformats
+        - qt5-qtmultimedia
+        - qt6-qtquickcontrols2
+        - qt6-qtsvg
+        - qt6-qtimageformats
+        - qt6-qtmultimedia
+        - qt6-qt5compat
+
+        # added for editing quickshell (qmlls)
+        - qt5-qtdeclarative-devel
+        - qt6-qtdeclarative-devel
+
       # password keeper
         - kf6-kwallet
         - kwalletmanager

recipes/recipe_nvidia.yml

@@ -1,25 +0,0 @@
----
-# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
-# image will be published to ghcr.io/<user>/<name>
-name: hydro-os-nvidia
-# description will be included in the image's metadata
-description: This is my personal OS image.
-
-# the base image to build on top of (FROM) and the version tag to use
-base-image: quay.io/fedora-ostree-desktops/base-atomic
-image-version: 42 # latest is also supported if you want new updates ASAP
-
-# module configuration, executed in order
-# you can include multiple instances of the same module
-modules:
-  - from-file: components/dnf-module.yml
-  - from-file: components/script-module.yml
-  - from-file: components/sys-files-module.yml
-  - from-file: components/systemd-module.yml
-  - from-file: components/nvidia-module.yml
-  - from-file: components/default-flatpak.yml
-  - from-file: components/chezmoi-module.yml
-  - type: initramfs
-
-  - type: signing
-