feat: add foot

.github/workflows/build.yml

@@ -25,6 +25,12 @@ jobs:
   build_push:
     name: Build and push image
     runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        desktop_environment:
+          - gnome
+          - hyprland
 
     permissions:
       contents: read
@@ -62,8 +68,8 @@ jobs:
         id: metadata
         with:
           tags: |
-            type=raw,value=${{ github.ref_name }}.${{ env.DEFAULT_TAG }}
-            type=raw,value=${{ github.ref_name }}.{{date 'YYYYMMDD-HHmm'}}
+            type=raw,value=${{ github.ref_name }}.${{ matrix.desktop_environment }}.${{ env.DEFAULT_TAG }}
+            type=raw,value=${{ github.ref_name }}.${{ matrix.desktop_environment }}.{{date 'YYYYMMDD-HHmm'}}
             type=sha,enable=${{ github.event_name == 'pull_request' }}
             type=ref,event=pr
           labels: |
@@ -75,7 +81,7 @@ jobs:
             org.opencontainers.image.title=${{ env.IMAGE_NAME }}
             org.opencontainers.image.url=https://github.com/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}/tree/${{ github.sha }}
             org.opencontainers.image.vendor=${{ github.repository_owner }}
-            org.opencontainers.image.version=${{ github.ref_name }}.{{date 'YYYYMMDD-HHmm'}}
+            org.opencontainers.image.version=${{ github.ref_name }}.${{ matrix.desktop_environment }}.{{date 'YYYYMMDD-HHmm'}}
             io.artifacthub.package.deprecated=false
             io.artifacthub.package.keywords=${{ env.IMAGE_KEYWORDS }}
             io.artifacthub.package.license=Apache-2.0
@@ -95,6 +101,8 @@ jobs:
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
           oci: false
+          build-args: |
+            DESKTOP_ENVIRONMENT=${{ matrix.desktop_environment }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3

Containerfile

@@ -1,11 +1,7 @@
 FROM scratch AS ctx
 COPY build_files /
 
-FROM ghcr.io/ublue-os/akmods:main-43 AS akmods
-
-FROM ghcr.io/ublue-os/akmods-nvidia-open:main-43 AS akmods_nvidia
-
-FROM ghcr.io/ublue-os/base-main:43
+FROM ghcr.io/ublue-os/base-nvidia:43
 
 RUN rm -r /opt && mkdir /opt
 
@@ -13,21 +9,20 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
     --mount=type=cache,dst=/var/cache \
     --mount=type=cache,dst=/var/log \
     --mount=type=tmpfs,dst=/tmp \
-    --mount=type=bind,from=akmods,src=/rpms/ublue-os,dst=/tmp/akmods-rpms \
-    --mount=type=bind,from=akmods,src=/kernel-rpms,dst=/tmp/kernel-rpms \
-    --mount=type=bind,from=akmods_nvidia,src=/rpms,dst=/tmp/akmods-nv-rpms \
-    /ctx/nvidia.sh
+    /ctx/01_pre_desktop.sh
+
+ARG DESKTOP_ENVIRONMENT="gnome"
 
 RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
     --mount=type=cache,dst=/var/cache \
     --mount=type=cache,dst=/var/log \
     --mount=type=tmpfs,dst=/tmp \
-    /ctx/build.sh
+    /ctx/02_${DESKTOP_ENVIRONMENT}.sh
 
 RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
     --mount=type=cache,dst=/var/cache \
     --mount=type=cache,dst=/var/log \
     --mount=type=tmpfs,dst=/tmp \
-    /ctx/initramfs.sh
+    /ctx/03_post_desktop.sh
 
 RUN bootc container lint

Makefile

@@ -1,11 +1,14 @@
 clean:
 	sudo rm -fr flathub output output-repo
 	sudo podman system prune
-	for container in $$(sudo podman container list --external --format "{{.ID}}"); do sudo podman rm $$container; done
+	for container in $$(sudo podman container list --external --format "{{.ID}}"); do sudo podman rm --force $$container; done
 
 oci:
 	sudo podman build --network=host -t podman-image .
 
+oci_hyprland:
+	sudo podman build --network=host -t podman-image-hyprland --build-arg DESKTOP_ENVIRONMENT=hyprland .
+
 CONTAINER_IMAGE=localhost/podman-image
 FILESYSTEM_TYPE=ext4
 qcow:

build_files/01_pre_desktop.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -ouex pipefail
+
+cp /ctx/bootc-fetch-apply-updates.service /usr/lib/systemd/system/bootc-fetch-apply-updates.service
+cp /ctx/os-release /usr/lib/os-release
+
+echo "LANG=de_DE.UTF-8" >> /etc/default/locale
+ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+ln -s /usr/bin/xdg-open /usr/bin/open
+
+# dnf5 update -y --setopt=install_weak_deps=False --setopt=install_deps=False
+dnf5 install -y man-pages man-db glibc-langpack-en glibc-langpack-de default-fonts-cjk plymouth git

build_files/02_gnome.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -ouex pipefail
+
+dnf5 install -y --setopt=exclude=gnome-tour,malcontent-control \
+    gnome-shell \
+    gnome-terminal \
+    gnome-bluetooth \
+    gnome-calculator \
+    gnome-disk-utility \
+    gnome-extensions-app \
+    gnome-browser-connector \
+    gnome-backgrounds \
+    gnome-shell-extension-appindicator
+dnf5 install -y  \
+    totem \
+    seahorse \
+    gstreamer1-plugin-libav
+
+git clone https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator.git /usr/share/gnome-shell/extensions/clipboard-indicator@tudmotu.com

build_files/02_hyprland.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -ouex pipefail
+
+dnf5 copr enable -y solopasha/hyprland
+dnf5 copr enable -y erikreider/SwayNotificationCenter
+dnf5 install -y \
+    hyprland \
+    hypridle \
+    hyprlock \
+    hyprshot \
+    hyprpolkitagent \
+    waybar \
+    pavucontrol \
+    cliphist \
+    SwayNotificationCenter-git \
+    foot
+
+echo 'if [[ $(ps aux | grep hyprland | wc -l) -eq 1 ]]; then cd $HOME && echo "launch hyprland?" && read && systemd-run --user --service-type=exec --unit=hyprland --description="hyprland start service" hyprland ; fi' >> /etc/profile.d/launch_hyprland.sh

build_files/03_post_desktop.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+set -ouex pipefail
+
+dnf5 install -y \
+    gnome-keyring \
+    gnome-keyring-pam \
+    evolution \
+    fzf \
+    vlc \
+    curl \
+    btop \
+    tmux \
+    make \
+    xsel \
+    7zip \
+    nvtop \
+    direnv \
+    sqlite \
+    flatpak \
+    chromium \
+    pciutils \
+    nautilus \
+    tailscale \
+    podman-compose \
+    netcat tor torbrowser-launcher \
+    ansible-core ansible-collection-community-general \
+    pandoc-common pandoc-pdf texlive-collection-langgerman \
+    hugo
+
+flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+
+systemctl enable tailscaled.service
+systemctl disable sshd.service
+
+# Install VSCode: https://packages.microsoft.com/yumrepos/vscode/
+curl -fsSLo /etc/yum.repos.d/vscode.repo https://packages.microsoft.com/yumrepos/vscode/config.repo
+rpm-ostree install code
+rm /etc/yum.repos.d/vscode.repo
+
+dnf5 install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
+                https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+dnf5 install -y --allowerasing ffmpeg x265-libs
+
+# Install Veracrypt: https://veracrypt.io/en/Downloads.html
+dnf5 install -y https://launchpad.net/veracrypt/trunk/1.26.24/+download/veracrypt-1.26.24-Fedora-40-x86_64.rpm
+
+dnf5 remove  -y rpmfusion-free-release rpmfusion-nonfree-release
+dnf5 clean all
+
+cp /ctx/login /etc/pam.d
+

build_files/build.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -ouex pipefail
-cp /ctx/bootc-fetch-apply-updates.service /usr/lib/systemd/system/bootc-fetch-apply-updates.service
-cp /ctx/os-release /usr/lib/os-release
-
-dnf5 update -y --setopt=install_weak_deps=False
-dnf5 install -y man-pages man-db glibc-langpack-en glibc-langpack-de default-fonts-cjk plymouth
-dnf5 install -y --setopt=exclude=gnome-tour,malcontent-control gnome-shell gnome-keyring gnome-keyring-pam gnome-bluetooth gnome-terminal nautilus seahorse evolution totem gstreamer1-plugin-libav gnome-extensions-app gnome-browser-connector gnome-shell-extension-appindicator
-dnf5 install -y gnome-calculator gnome-disk-utility gnome-backgrounds
-dnf5 install -y curl git btop nvtop tmux flatpak pciutils tailscale make fzf direnv xsel chromium 7zip pandoc-common pandoc-pdf texlive-collection-langgerman ansible-core ansible-collection-community-general vlc sqlite netcat tor torbrowser-launcher podman-compose hugo
-git clone https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator.git /usr/share/gnome-shell/extensions/clipboard-indicator@tudmotu.com
-flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-echo "LANG=de_DE.UTF-8" >> /etc/default/locale
-ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime
-ln -s /usr/bin/xdg-open /usr/bin/open
-systemctl enable tailscaled.service
-systemctl disable sshd.service
-# Install VSCode: https://packages.microsoft.com/yumrepos/vscode/
-curl -fsSLo /etc/yum.repos.d/vscode.repo https://packages.microsoft.com/yumrepos/vscode/config.repo
-rpm-ostree install code
-rm /etc/yum.repos.d/vscode.repo
-
-dnf5 install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
-                https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
-dnf5 install -y --allowerasing ffmpeg x265-libs
-
-# Install Veracrypt: https://veracrypt.io/en/Downloads.html
-dnf5 install -y https://launchpad.net/veracrypt/trunk/1.26.24/+download/veracrypt-1.26.24-Fedora-40-x86_64.rpm
-
-dnf5 remove  -y rpmfusion-free-release rpmfusion-nonfree-release
-dnf5 clean all

build_files/initramfs.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/bash
-
-set -eoux pipefail
-
-KERNEL_VERSION="$(rpm -q --queryformat="%{evr}.%{arch}" kernel-core)"
-
-# Ensure Initramfs is generated
-export DRACUT_NO_XATTR=1
-/usr/bin/dracut --no-hostonly --kver "${KERNEL_VERSION}" --reproducible -v --add ostree -f "/lib/modules/${KERNEL_VERSION}/initramfs.img"
-chmod 0600 "/lib/modules/${KERNEL_VERSION}/initramfs.img"

build_files/login

@@ -0,0 +1,18 @@
+#%PAM-1.0
+auth       substack     system-auth
+auth       include      postlogin
+auth       optional	pam_gnome_keyring.so
+account    required     pam_nologin.so
+account    include      system-auth
+password   include      system-auth
+# pam_selinux.so close should be the first session rule
+session    required     pam_selinux.so close
+session    required     pam_loginuid.so
+# pam_selinux.so open should only be followed by sessions to be executed in the user context
+session    required     pam_selinux.so open
+session    required     pam_namespace.so
+session    optional     pam_keyinit.so force revoke
+session    include      system-auth
+session    include      postlogin
+-session   optional     pam_ck_connector.so
+session    optional	pam_gnome_keyring.so auto_start

build_files/nvidia.sh

@@ -1,103 +0,0 @@
-#!/bin/bash
-
-set -ouex pipefail
-
-FRELEASE="$(rpm -E %fedora)"
-: "${AKMODNV_PATH:=/tmp/akmods-nv-rpms}"
-
-
-# this is only to aid in human understanding of any issues in CI
-find "${AKMODNV_PATH}"/
-
-if ! command -v dnf5 >/dev/null; then
-    echo "Requires dnf5... Exiting"
-    exit 1
-fi
-
-# Check if any rpmfusion repos exist before trying to disable them
-if dnf5 repolist --all | grep -q rpmfusion; then
-    dnf5 config-manager setopt "rpmfusion*".enabled=0
-fi
-
-# Always try to disable cisco repo (or add similar check)
-dnf5 config-manager setopt fedora-cisco-openh264.enabled=0
-
-## nvidia install steps
-dnf5 install -y "${AKMODNV_PATH}"/ublue-os/ublue-os-nvidia-addons-*.rpm
-
-# Install MULTILIB packages from negativo17-multimedia prior to disabling repo
-
-MULTILIB=(
-    mesa-dri-drivers.i686
-    mesa-filesystem.i686
-    mesa-libEGL.i686
-    mesa-libGL.i686
-    mesa-libgbm.i686
-    mesa-va-drivers.i686
-    mesa-vulkan-drivers.i686
-)
-
-dnf5 install -y "${MULTILIB[@]}"
-
-# enable repos provided by ublue-os-nvidia-addons (not enabling fedora-nvidia-lts)
-dnf5 config-manager setopt fedora-nvidia.enabled=1 nvidia-container-toolkit.enabled=1
-
-# Disable Multimedia
-NEGATIVO17_MULT_PREV_ENABLED=N
-if dnf5 repolist --enabled | grep -q "fedora-multimedia"; then
-    NEGATIVO17_MULT_PREV_ENABLED=Y
-    echo "disabling negativo17-fedora-multimedia to ensure negativo17-fedora-nvidia is used"
-    dnf5 config-manager setopt fedora-multimedia.enabled=0
-fi
-
-# Enable staging for supergfxctl if repo file exists
-if [[ -f /etc/yum.repos.d/_copr_ublue-os-staging.repo ]]; then
-    sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-staging.repo
-else
-    # Otherwise, retrieve the repo file for staging
-    curl -Lo /etc/yum.repos.d/_copr_ublue-os-staging.repo https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FRELEASE}"/ublue-os-staging-fedora-"${FRELEASE}".repo
-fi
-
-source "${AKMODNV_PATH}"/kmods/nvidia-vars
-
-dnf5 install -y \
-    libnvidia-fbc \
-    libnvidia-ml.i686 \
-    libva-nvidia-driver \
-    nvidia-driver \
-    nvidia-driver-cuda \
-    nvidia-driver-cuda-libs.i686 \
-    nvidia-driver-libs.i686 \
-    nvidia-settings \
-    nvidia-container-toolkit \
-    "${AKMODNV_PATH}"/kmods/kmod-nvidia-"${KERNEL_VERSION}"-"${NVIDIA_AKMOD_VERSION}"."${DIST_ARCH}".rpm
-
-# Ensure the version of the Nvidia module matches the driver
-KMOD_VERSION="$(rpm -q --queryformat '%{VERSION}' kmod-nvidia)"
-DRIVER_VERSION="$(rpm -q --queryformat '%{VERSION}' nvidia-driver)"
-if [ "$KMOD_VERSION" != "$DRIVER_VERSION" ]; then
-    echo "Error: kmod-nvidia version ($KMOD_VERSION) does not match nvidia-driver version ($DRIVER_VERSION)"
-    exit 1
-fi
-
-## nvidia post-install steps
-# disable repos provided by ublue-os-nvidia-addons
-dnf5 config-manager setopt fedora-nvidia.enabled=0 fedora-nvidia-lts.enabled=0 nvidia-container-toolkit.enabled=0
-
-# Disable staging
-sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-staging.repo
-
-systemctl enable ublue-nvctk-cdi.service
-semodule --verbose --install /usr/share/selinux/packages/nvidia-container.pp
-
-# Universal Blue specific Initramfs fixes
-cp /etc/modprobe.d/nvidia-modeset.conf /usr/lib/modprobe.d/nvidia-modeset.conf
-# we must force driver load to fix black screen on boot for nvidia desktops
-sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf
-# as we need forced load, also mustpre-load intel/amd iGPU else chromium web browsers fail to use hardware acceleration
-sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf
-
-# re-enable negativo17-mutlimedia since we disabled it
-if [[ "${NEGATIVO17_MULT_PREV_ENABLED}" = "Y" ]]; then
-    dnf5 config-manager setopt fedora-multimedia.enabled=1
-fi