Installed wlogout

.github/workflows/build.yml

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

.gitignore

@@ -1,4 +1,3 @@
 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:linux:${IMAGE_PRETTY_NAME,}|" /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/^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

@@ -1,7 +0,0 @@
-#!/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="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
+KERNEL_VER=$(ls /lib/modules | head -n 1)
 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="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
+KERNEL_VER=$(ls /lib/modules | head -n 1)
 echo $KERNEL_VER
 
 echo "INFO: grab xpad modules"

files/scripts/regenerateinitramfs.sh

@@ -1,8 +0,0 @@
-#!/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/systemd/user/swww.service

@@ -1,15 +0,0 @@
-[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

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

recipes/components/systemd-module.yml

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

recipes/dnf/applications.yml

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

recipes/dnf/drivers.yml

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

recipes/dnf/environment.yml

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

recipes/dnf/hyprland.yml

@@ -13,7 +13,6 @@ modules:
         - hyprland-qt-support
         - hyprland-qtutils
         - xdg-desktop-portal-hyprland
-        - swww
         - matugen
         - wlogout
 

recipes/recipe.yml

@@ -17,7 +17,6 @@ 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