Revert to no env

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

.github/workflows/build.yml

@@ -18,7 +18,7 @@ concurrency:
 jobs:
   bluebuild:
     name: Build Custom Image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
@@ -42,4 +42,5 @@ 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"
+          rechunk: "true"

.gitignore

@@ -1,3 +1,4 @@
 cosign.key
 cosign.private
 /Containerfile
+/.bluebuild-scripts_*

files/scripts/addimageinfo.sh

@@ -31,7 +31,7 @@ sed -i "s|^HOME_URL=.*|HOME_URL=\"$HOME_URL\"|" /usr/lib/os-release
 sed -i "s|^DOCUMENTATION_URL=.*|DOCUMENTATION_URL=\"$DOCUMENTATION_URL\"|" /usr/lib/os-release
 sed -i "s|^SUPPORT_URL=.*|SUPPORT_URL=\"$SUPPORT_URL\"|" /usr/lib/os-release
 sed -i "s|^BUG_REPORT_URL=.*|BUG_REPORT_URL=\"$BUG_SUPPORT_URL\"|" /usr/lib/os-release
-sed -i "s|^CPE_NAME=\"cpe:/o:fedoraproject:fedora|CPE_NAME=\"cpe:/o:wayblue:${IMAGE_PRETTY_NAME,}|" /usr/lib/os-release
+sed -i "s|^CPE_NAME=\"cpe:/o:fedoraproject:fedora|CPE_NAME=\"cpe:/o:linux:${IMAGE_PRETTY_NAME,}|" /usr/lib/os-release
 sed -i "s/^DEFAULT_HOSTNAME=.*/DEFAULT_HOSTNAME=\"${IMAGE_PRETTY_NAME,}\"/" /usr/lib/os-release
 sed -i "s/^ID=fedora/ID=\"${IMAGE_LIKE,}\"\nID_LIKE=\"${IMAGE_PRETTY_NAME,}\"/" /usr/lib/os-release
 sed -i "/^REDHAT_BUGZILLA_PRODUCT=/d; /^REDHAT_BUGZILLA_PRODUCT_VERSION=/d; /^REDHAT_SUPPORT_PRODUCT=/d; /^REDHAT_SUPPORT_PRODUCT_VERSION=/d" /usr/lib/os-release

files/scripts/buildakmods.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -oue pipefail
+
+QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
+
+sudo akmods --kernels $QUALIFIED_KERNEL

files/scripts/installrazermodule.sh

@@ -4,7 +4,7 @@
 set -oue pipefail
 
 echo "INFO: grab kernel module"
-KERNEL_VER=$(ls /lib/modules | head -n 1)
+KERNEL_VER="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
 echo $KERNEL_VER
 
 echo "INFO: grab open razer modules"

files/scripts/installxpadneomodule.sh

@@ -4,7 +4,7 @@
 set -oue pipefail
 
 echo "INFO: grab kernel module"
-KERNEL_VER=$(ls /lib/modules | head -n 1)
+KERNEL_VER="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
 echo $KERNEL_VER
 
 echo "INFO: grab xpad modules"

files/scripts/regenerateinitramfs.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Obtained from wayblue project https://github.com/wayblueorg/wayblue/blob/live/files/scripts/regenerateinitramfs.sh
+
+set -oue pipefail
+
+QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
+/usr/bin/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
+chmod 0600 "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"

files/system/sddm.conf.d/theme.conf

@@ -1,2 +0,0 @@
-[Theme]
-Current=maldives

files/systemd/user/swww.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=Background service
+# 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/swww-daemon
+Restart=on-failure
+Slice=app-graphical.slice
+
+[Install]
+WantedBy=graphical-session.target

recipes/components/cleanup-usr-etc.yml

@@ -0,0 +1,5 @@
+modules:
+  - type: script
+    snippets:
+      - "sudo cp -n -r /usr/etc /etc"
+      - "sudo rm -rf /usr/etc"

recipes/components/dnf-module.yml

@@ -1,6 +1,6 @@
 modules:
   - from-file: dnf/multimedia.yml
-  - from-file: dnf/sddm.yml
+  - from-file: dnf/greeter.yml
   - from-file: dnf/hyprland.yml
   - from-file: dnf/environment.yml
   - from-file: dnf/applications.yml

recipes/components/systemd-module.yml

@@ -4,8 +4,10 @@ modules:
       enabled:
         - bootc-fetch-updates.timer
         - flatpak-system-update.timer
+        - lactd.service
     user:
       enabled:
         - flatpak-user-update.timer
         - quickshell.service
-        - hyprpolkitagent.service
+        - hyprpolkitagent.service
+        - swww.service

recipes/dnf/applications.yml

@@ -2,6 +2,8 @@ modules:
   - type: dnf
     repos:
       nonfree: rpmfusion
+      copr:
+        - ilyaz/LACT
     install:
       packages:
       # applications
@@ -12,9 +14,8 @@ modules:
         - fuzzel
       
         # file manager
-        - nautilus
+        - dolphin
-        - file-roller
+        - ark
-        - file-roller-nautilus
 
         - ffmpegthumbnailer
 
@@ -23,14 +24,6 @@ modules:
 
         # text editor
         - neovim
-      
-        # software store
-        - gnome-software
-
-        # disk management
-        - gnome-disk-utility
-
-        - qdirstat
 
         # kdeconnect
         - kde-connect
@@ -42,6 +35,19 @@ modules:
 
         # gtk
         - nwg-look
+      
+        # software store
+        - gnome-software
+
+        # disk management
+        - gnome-disk-utility
+
+        # diagnostics
+        - qdirstat
+
+        - lact
+
+        - btop
 
       # zsh
         - zsh

recipes/dnf/drivers.yml

@@ -1,15 +1,12 @@
 modules:
   - type: dnf
     repos:
-      files:
+      copr:
-        - https://negativo17.org/repos/fedora-steam.repo
+        - atim/xpadneo
     install:
       packages:
-        - dkms
+        - xpadneo
-        - repo: fedora-steam
-          packages:
-            - dkms-xpadneo
 
   - type: script
     scripts:
-      - installxpadneomodule.sh
+      - buildakmods.sh

recipes/dnf/environment.yml

@@ -35,7 +35,7 @@ modules:
         # xdg-desktop-portals
         - xdg-desktop-portal
         - xdg-desktop-portal-gtk
-        - xdg-desktop-portal-gnome
+        - xdg-desktop-portal-kde
 
         # polkit
         - polkit

recipes/dnf/greeter.yml

@@ -5,11 +5,9 @@ modules:
       # sddm
         - sddm
         - sddm-themes
-        - qt5-qtgraphicaleffects
-        - qt5-qtquickcontrols2
-        - qt5-qtsvg
 
         # added libraries for quickshell
+        - qt5-qtgraphicaleffects
         - qt5-qtimageformats
         - qt5-qtmultimedia
         - qt6-qtquickcontrols2

recipes/dnf/hyprland.yml

@@ -13,7 +13,9 @@ modules:
         - hyprland-qt-support
         - hyprland-qtutils
         - xdg-desktop-portal-hyprland
+        - swww
         - matugen
+        - wlogout
 
         # quickshell
         - quickshell-git

recipes/recipe.yml

@@ -17,6 +17,7 @@ modules:
   - from-file: components/sys-files-module.yml
   - from-file: components/systemd-module.yml
   - from-file: components/chezmoi-module.yml
+  - from-file: components/cleanup-usr-etc.yml
 
   - type: signing