Add packages that ubulue usually adds

.gitlab-ci.yml

@@ -76,4 +76,4 @@ build-images:
       - RECIPE:
           - jp-desktop-nvidia.yml
           - jp-laptop.yml
-        # BB_BUILD_PUSH: 'true'
+        BB_BUILD_PUSH: 'true'

files/scripts/installnvidiapackages.sh

@@ -41,10 +41,10 @@ if [[ "$kmod_version" != "$negativo_version" ]]; then
     exit 1
 fi
 
-# curl -L https://raw.githubusercontent.com/NVIDIA/dgx-selinux/master/bin/RHEL9/nvidia-container.pp \
+curl -L https://raw.githubusercontent.com/NVIDIA/dgx-selinux/master/bin/RHEL9/nvidia-container.pp \
-#     -o nvidia-container.pp
+    -o nvidia-container.pp
-# semodule -i nvidia-container.pp
+semodule -i nvidia-container.pp
 
-# rm -f nvidia-container.pp
+rm -f nvidia-container.pp
 rm -f /etc/yum.repos.d/negativo17-fedora-nvidia.repo
 rm -f /etc/yum.repos.d/nvidia-container-toolkit.repo

recipes/base-combo-nvidia.yml

@@ -8,4 +8,10 @@ modules:
   - from-file: base/common.yml
   - from-file: base/cosmic.yml
   - from-file: base/kinoite.yml
+  - type: systemd
+    system:
+      enabled:
+        - sddm
+      disabled:
+        - cosmic-greeter
   - from-file: base/post-build.yml

recipes/base-combo.yml

@@ -8,4 +8,10 @@ modules:
   - from-file: base/common.yml
   - from-file: base/cosmic.yml
   - from-file: base/kinoite.yml
+  - type: systemd
+    system:
+      enabled:
+        - sddm
+      disabled:
+        - cosmic-greeter
   - from-file: base/post-build.yml

recipes/base/common.yml

@@ -7,22 +7,132 @@ modules:
         destination: /usr/lib/systemd/system
       - source: base
         destination: /
-  - type: script
-    env:
-      CSFG: /usr/lib/systemd/system-generators/coreos-sulogin-force-generator
-    snippets:
-      - systemctl set-default graphical.target
-      # use CoreOS' generator for emergency/rescue boot
-      # see detail: https://github.com/ublue-os/main/issues/653
-      - curl -sSLo ${CSFG} https://raw.githubusercontent.com/coreos/fedora-coreos-config/refs/heads/stable/overlay.d/05core/usr/lib/systemd/system-generators/coreos-sulogin-force-generator
-      - chmod +x ${CSFG}
-  - type: dnf
-    install:
-      packages:
-        - sbsign
   - type: systemd
     system:
       masked:
         - rpm-ostreed-automatic.timer
       enabled:
         - bootc-fetch-apply-updates.timer
+
+  # - type: dnf
+  #   repos:
+  #     cleanup: true
+  #     copr:
+  #       - ublue-os/packages
+  #       - ublue-os/staging
+  #   install:
+  #     packages:
+
+  - type: dnf
+    repos:
+      cleanup: true
+      nonfree: negativo17
+      copr:
+        - ublue-os/packages
+        - ublue-os/staging
+    install:
+      packages:
+        - ublue-os-just
+        - ublue-os-luks
+        - ublue-os-udev-rules
+        - fedora-repos-archive
+        - zstd
+        - sbsign
+        - alsa-firmware
+        - android-udev-rules
+        - apr
+        - apr-util
+        - distrobox
+        - fdk-aac
+        - ffmpeg
+        - ffmpeg-libs
+        - ffmpegthumbnailer
+        - flatpak-spawn
+        - fuse
+        - fzf
+        - grub2-tools-extra
+        - google-noto-sans-balinese-fonts
+        - google-noto-sans-cjk-fonts
+        - google-noto-sans-javanese-fonts
+        - google-noto-sans-sundanese-fonts
+        - heif-pixbuf-loader
+        - htop
+        - intel-vaapi-driver
+        - just
+        - libavcodec
+        - libcamera
+        - libcamera-tools
+        - libcamera-gstreamer
+        - libcamera-ipa
+        - libfdk-aac
+        - libheif
+        - libimobiledevice-utils
+        - libratbag-ratbagd
+        - libva-utils
+        - lshw
+        - mesa-libxatracker
+        - net-tools
+        - nvme-cli
+        - nvtop
+        - openrgb-udev-rules
+        - openssl
+        - oversteer-udev
+        - pam-u2f
+        - pam_yubico
+        - pamu2fcfg
+        - pipewire-libs-extra
+        - pipewire-plugin-libcamera
+        - powerstat
+        - smartmontools
+        - solaar-udev
+        - squashfs-tools
+        - symlinks
+        - tcpdump
+        - tmux
+        - traceroute
+        - usbmuxd
+        - vim
+        - wireguard-tools
+        - wl-clipboard
+        - xhost
+        - xorg-x11-xauth
+        - yubikey-manager
+        - intel-gmmlib
+        - libva-intel-media-driver
+    remove:
+      packages:
+        - fedora-flathub-remote
+        - fedora-third-party
+    replace:
+      # mitigate upstream packaging bug: https://bugzilla.redhat.com/show_bug.cgi?id=2332429
+      # swap the incorrectly installed OpenCL-ICD-Loader for ocl-icd, the expected package
+      - from-repo: fedora
+        packages:
+          - new: ocl-icd
+            old: OpenCL-ICD-Loader
+
+      # use override to replace mesa and others with less crippled versions
+      - from-repo: fedora-multimedia
+        packages:
+          - libva
+          - intel-vpl-gpu-rt
+          - intel-mediasdk
+          - mesa-dri-drivers
+          - mesa-filesystem
+          - mesa-libEGL
+          - mesa-libGL
+          - mesa-libgbm
+          - mesa-va-drivers
+          - mesa-vulkan-drivers
+
+
+  - type: script
+    env:
+      CSFG: /usr/lib/systemd/system-generators/coreos-sulogin-force-generator
+    snippets:
+      - dnf5 versionlock add kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra libva intel-gmmlib intel-vpl-gpu-rt intel-mediasdk libva-intel-media-driver mesa-dri-drivers mesa-filesystem mesa-libEGL mesa-libGL mesa-libgbm mesa-va-drivers mesa-vulkan-drivers
+      - systemctl set-default graphical.target
+      # use CoreOS' generator for emergency/rescue boot
+      # see detail: https://github.com/ublue-os/main/issues/653
+      - curl -sSLo ${CSFG} https://raw.githubusercontent.com/coreos/fedora-coreos-config/refs/heads/stable/overlay.d/05core/usr/lib/systemd/system-generators/coreos-sulogin-force-generator
+      - chmod +x ${CSFG}

recipes/base/kinoite.yml

@@ -3,6 +3,31 @@ modules:
     group-install:
       packages:
         - kde-desktop
+    install:
+      packages:
+        - fcitx5-qt
+        - fcitx5-gtk
+        - fcitx5-chinese-addons
+        - fcitx5-hangul
+        - fcitx5-libthai
+        - fcitx5-mozc
+        - fcitx5-sayura
+        - fcitx5-unikey
+        - fcitx5-configtool
+        - kcm-fcitx5
+        - icoutils
+        - kate
+        - kf6-kimageformats
+        - kio-admin
+        - ksshaskpass
+        - qt6-qtimageformats
+    remove:
+      packages:
+        - ffmpegthumbnailer
+        - plasma-discover-rpm-ostree
+  - type: script
+    snippets:
+      - dnf5 versionlock add "qt6-*"
   - type: systemd
     system:
       enabled:

recipes/common/gaming.yml

@@ -6,9 +6,11 @@ modules:
       - source: steam-firewall
         destination: /
   - type: dnf
+    repos:
+      nonfree: negativo17
     optfix:
       - r2modman
     install:
       packages:
         - https://github.com/ebkr/r2modmanPlus/releases/download/v3.2.3/r2modman-3.2.3.x86_64.rpm
-        # - steam
+        - steam