From ef88e46e8ee5e6002555e544b055ea226f2afe62 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sat, 21 Jun 2025 21:09:28 -0400
Subject: [PATCH 01/23] Utilize build from xpadneo, rebuild dracut with
 initramfs

---
 files/scripts/install-xpadneo.sh      | 12 ++++++++++++
 recipes/components/dnf-module.yml     |  6 +++---
 recipes/components/xpadneo-module.yml |  4 ++++
 recipes/recipe.yml                    |  2 ++
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 files/scripts/install-xpadneo.sh
 create mode 100644 recipes/components/xpadneo-module.yml

diff --git a/files/scripts/install-xpadneo.sh b/files/scripts/install-xpadneo.sh
new file mode 100644
index 0000000..83bd9fe
--- /dev/null
+++ b/files/scripts/install-xpadneo.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+dnf install dkms make bluez bluez-tools kernel-devel-`uname -r` kernel-headers
+
+git clone https://github.com/atar-axis/xpadneo.git /tmp/xpadneo/
+
+cd /tmp/xpadneo
+
+./install.sh --verbose
\ No newline at end of file
diff --git a/recipes/components/dnf-module.yml b/recipes/components/dnf-module.yml
index 18739dd..f74132e 100644
--- a/recipes/components/dnf-module.yml
+++ b/recipes/components/dnf-module.yml
@@ -4,7 +4,6 @@ modules:
       copr:
         - ublue-os/packages
         - solopasha/hyprland
-        - atim/xpadneo
         - peterwu/rendezvous
       nonfree: rpmfusion
     install:
@@ -121,8 +120,9 @@ modules:
         - gamescope
         # for performance view
         - mangohud
-        # controller
-        - xpadneo
+        # dependencies for xpadneo
+        - dkms
+        - kernel-devel
 
     remove:
       packages:
diff --git a/recipes/components/xpadneo-module.yml b/recipes/components/xpadneo-module.yml
new file mode 100644
index 0000000..a44cf01
--- /dev/null
+++ b/recipes/components/xpadneo-module.yml
@@ -0,0 +1,4 @@
+modules:
+  - type: script
+    scripts:
+      - install-xpadneo.sh
\ No newline at end of file
diff --git a/recipes/recipe.yml b/recipes/recipe.yml
index 7042d1c..83283e1 100644
--- a/recipes/recipe.yml
+++ b/recipes/recipe.yml
@@ -14,10 +14,12 @@ image-version: 42 # latest is also supported if you want new updates ASAP
 modules:
   - from-file: components/dnf-module.yml
   - from-file: components/script-module.yml
+  - from-file: components/xpadneo-module.yml
   - from-file: components/sys-files-module.yml
   - from-file: components/systemd-module.yml
   - from-file: components/default-flatpak.yml
   - from-file: components/chezmoi-module.yml
+  - type: initramfs
 
   - type: signing
 
-- 
2.39.5


From 34fd1b89e097d2fdb348548d35f5f4c352df5c1c Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sat, 21 Jun 2025 22:19:21 -0400
Subject: [PATCH 02/23] Remove extra installation calls

---
 files/scripts/install-xpadneo.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/files/scripts/install-xpadneo.sh b/files/scripts/install-xpadneo.sh
index 83bd9fe..c9dbb40 100644
--- a/files/scripts/install-xpadneo.sh
+++ b/files/scripts/install-xpadneo.sh
@@ -3,8 +3,6 @@
 # Tell build process to exit if there are any errors.
 set -oue pipefail
 
-dnf install dkms make bluez bluez-tools kernel-devel-`uname -r` kernel-headers
-
 git clone https://github.com/atar-axis/xpadneo.git /tmp/xpadneo/
 
 cd /tmp/xpadneo
-- 
2.39.5


From d38ec81a9b624aad06b11293234c01ebcec15430 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sat, 21 Jun 2025 22:50:15 -0400
Subject: [PATCH 03/23] Attempt to use the latest cli

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b51e455..542f09b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,3 +42,4 @@ jobs:
 
           # enabled by default, disable if your image is small and you want faster builds
           maximize_build_space: true
+          use_unstable_cli: true
-- 
2.39.5


From 526c72dbf036791d053f1c876a0c2ca9b532f529 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sun, 22 Jun 2025 12:05:48 -0400
Subject: [PATCH 04/23] Attempt to use a fedora container to build

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 542f09b..591d190 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ on:
 jobs:
   bluebuild:
     name: Build Custom Image
-    runs-on: ubuntu-latest
+    runs-on: fedora-latest
     permissions:
       contents: read
       packages: write
-- 
2.39.5


From 408f479d97ec05f1522d48db7b3b5f77309ab46d Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sun, 22 Jun 2025 12:49:21 -0400
Subject: [PATCH 05/23] Install awk to go though "get ubuntu version"

---
 .github/workflows/build.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 591d190..76308ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,6 +30,10 @@ jobs:
           # !! Add your recipes here
           - recipe.yml
     steps:
+      - name: Install some required packages
+        shell: bash
+        run: |
+          sudo dnf install -y gawk
       # the build is fully handled by the reusable github action
       - name: Build Custom Image
         uses: blue-build/github-action@v1.8
-- 
2.39.5


From 37fc4416d36b12f9a277be0c276bc36bd4b11733 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sun, 22 Jun 2025 12:54:50 -0400
Subject: [PATCH 06/23] Attempting to use custom build with fedora

---
 .github/workflows/build.yml | 74 +++++++++++++++++++++++++++++--------
 1 file changed, 59 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 76308ee..1a7443f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,20 +30,64 @@ jobs:
           # !! Add your recipes here
           - recipe.yml
     steps:
-      - name: Install some required packages
-        shell: bash
-        run: |
-          sudo dnf install -y gawk
-      # the build is fully handled by the reusable github action
-      - name: Build Custom Image
-        uses: blue-build/github-action@v1.8
+      - uses: sigstore/cosign-installer@v3.9.0
         with:
-          recipe: ${{ matrix.recipe }}
-          cosign_private_key: ${{ secrets.SIGNING_SECRET }}
-          registry: 'git.hydrosaber.com'
-          registry_token: ${{ secrets.PACKAGE_BUILDER_TOKEN }}
-          pr_event_number: ${{ github.event.number }}
+          install-dir: /usr/bin
+          use-sudo: true
 
-          # enabled by default, disable if your image is small and you want faster builds
-          maximize_build_space: true
-          use_unstable_cli: true
+      # clones user's repo
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Determine Vars
+        id: build_vars
+        shell: bash
+        env:
+          RECIPE: ${{ matrix.recipe }}
+        run: |
+          if [[ "${{ inputs.use_unstable_cli }}" == "true" && -z "${{ inputs.cli_version }}" ]]; then
+            CLI_VERSION_TAG="main"
+          elif [ -n "${{ inputs.cli_version }}" ]; then
+            CLI_VERSION_TAG="${{ inputs.cli_version }}"
+          else
+            CLI_VERSION_TAG="v0.9"
+          fi
+          echo "cli_version=${CLI_VERSION_TAG}" >> ${GITHUB_OUTPUT}
+
+          RECIPE_PATH=""
+          if [ -f "./config/${RECIPE}" ]; then
+            RECIPE_PATH="./config/${RECIPE}"
+          else
+            RECIPE_PATH="./recipes/${RECIPE}"
+          fi
+          echo "recipe_path=${RECIPE_PATH}" >> ${GITHUB_OUTPUT}
+      
+      - name: Install BlueBuild
+        shell: bash
+        env:
+          CLI_VERSION_TAG: ${{ steps.build_vars.outputs.cli_version }}
+        run: |
+          sudo docker create \
+            --name blue-build-installer \
+            ghcr.io/blue-build/cli:${{ env.CLI_VERSION_TAG }}-installer
+          sudo docker cp blue-build-installer:/out/bluebuild /usr/bin/bluebuild
+          sudo docker rm blue-build-installer
+          bluebuild --version
+        
+      # blue-build/cli does the heavy lifting
+      - name: Build Image
+        shell: bash
+        working-directory: ${{ inputs.working_directory }}
+        env:
+          COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }}
+          GH_TOKEN: ${{ secrets.PACKAGE_BUILDER_TOKEN }}
+          BB_PASSWORD: ${{ inputs.registry_token }}
+          BB_USERNAME: ${{ github.repository_owner }}
+          BB_REGISTRY: 'git.hydrosaber.com'
+          BB_REGISTRY_NAMESPACE: ${{ github.repository_owner }}
+          GH_PR_EVENT_NUMBER: ${{ github.event.number }}
+          BB_CACHE_LAYERS: false
+          RECIPE_PATH: ${{ steps.build_vars.outputs.recipe_path }}
+          RUST_LOG_STYLE: always
+          CLICOLOR_FORCE: "1"
+        run: |
+          sudo -E bluebuild build -v --push ${RECIPE_PATH}
-- 
2.39.5


From 036d4bb7ba9119588d0d03adfc2c89adb8a1e903 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sun, 22 Jun 2025 12:57:58 -0400
Subject: [PATCH 07/23] Install nodejs package

---
 .github/workflows/build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1a7443f..492b85f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,6 +30,11 @@ jobs:
           # !! Add your recipes here
           - recipe.yml
     steps:
+      - name: Install packages
+        shell: bash
+        run: |
+          sudo dnf install -y nodejs
+         
       - uses: sigstore/cosign-installer@v3.9.0
         with:
           install-dir: /usr/bin
-- 
2.39.5


From 2011cec1f76958a850c41709e42fe2b103a41e03 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sun, 22 Jun 2025 13:01:49 -0400
Subject: [PATCH 08/23] add docker and containerd to packages

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 492b85f..32e4986 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Install packages
         shell: bash
         run: |
-          sudo dnf install -y nodejs
+          sudo dnf install -y nodejs docker-cli containerd
          
       - uses: sigstore/cosign-installer@v3.9.0
         with:
-- 
2.39.5


From 868e4a24e3b27ff4b7fa0b2a856a9e887fd12e8e Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sun, 22 Jun 2025 13:10:41 -0400
Subject: [PATCH 09/23] Add buildx

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 32e4986..d360cd6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Install packages
         shell: bash
         run: |
-          sudo dnf install -y nodejs docker-cli containerd
+          sudo dnf install -y nodejs docker-cli containerd docker-buildx
          
       - uses: sigstore/cosign-installer@v3.9.0
         with:
-- 
2.39.5


From 5858fc1958c86d0b69426df90596f5a1f86d680d Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sun, 22 Jun 2025 16:31:48 -0400
Subject: [PATCH 10/23] Revert attempt to use fedora image

---
 .github/workflows/build.yml | 76 ++++++-------------------------------
 1 file changed, 11 insertions(+), 65 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d360cd6..b51e455 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ on:
 jobs:
   bluebuild:
     name: Build Custom Image
-    runs-on: fedora-latest
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
@@ -30,69 +30,15 @@ jobs:
           # !! Add your recipes here
           - recipe.yml
     steps:
-      - name: Install packages
-        shell: bash
-        run: |
-          sudo dnf install -y nodejs docker-cli containerd docker-buildx
-         
-      - uses: sigstore/cosign-installer@v3.9.0
+      # the build is fully handled by the reusable github action
+      - name: Build Custom Image
+        uses: blue-build/github-action@v1.8
         with:
-          install-dir: /usr/bin
-          use-sudo: true
+          recipe: ${{ matrix.recipe }}
+          cosign_private_key: ${{ secrets.SIGNING_SECRET }}
+          registry: 'git.hydrosaber.com'
+          registry_token: ${{ secrets.PACKAGE_BUILDER_TOKEN }}
+          pr_event_number: ${{ github.event.number }}
 
-      # clones user's repo
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Determine Vars
-        id: build_vars
-        shell: bash
-        env:
-          RECIPE: ${{ matrix.recipe }}
-        run: |
-          if [[ "${{ inputs.use_unstable_cli }}" == "true" && -z "${{ inputs.cli_version }}" ]]; then
-            CLI_VERSION_TAG="main"
-          elif [ -n "${{ inputs.cli_version }}" ]; then
-            CLI_VERSION_TAG="${{ inputs.cli_version }}"
-          else
-            CLI_VERSION_TAG="v0.9"
-          fi
-          echo "cli_version=${CLI_VERSION_TAG}" >> ${GITHUB_OUTPUT}
-
-          RECIPE_PATH=""
-          if [ -f "./config/${RECIPE}" ]; then
-            RECIPE_PATH="./config/${RECIPE}"
-          else
-            RECIPE_PATH="./recipes/${RECIPE}"
-          fi
-          echo "recipe_path=${RECIPE_PATH}" >> ${GITHUB_OUTPUT}
-      
-      - name: Install BlueBuild
-        shell: bash
-        env:
-          CLI_VERSION_TAG: ${{ steps.build_vars.outputs.cli_version }}
-        run: |
-          sudo docker create \
-            --name blue-build-installer \
-            ghcr.io/blue-build/cli:${{ env.CLI_VERSION_TAG }}-installer
-          sudo docker cp blue-build-installer:/out/bluebuild /usr/bin/bluebuild
-          sudo docker rm blue-build-installer
-          bluebuild --version
-        
-      # blue-build/cli does the heavy lifting
-      - name: Build Image
-        shell: bash
-        working-directory: ${{ inputs.working_directory }}
-        env:
-          COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }}
-          GH_TOKEN: ${{ secrets.PACKAGE_BUILDER_TOKEN }}
-          BB_PASSWORD: ${{ inputs.registry_token }}
-          BB_USERNAME: ${{ github.repository_owner }}
-          BB_REGISTRY: 'git.hydrosaber.com'
-          BB_REGISTRY_NAMESPACE: ${{ github.repository_owner }}
-          GH_PR_EVENT_NUMBER: ${{ github.event.number }}
-          BB_CACHE_LAYERS: false
-          RECIPE_PATH: ${{ steps.build_vars.outputs.recipe_path }}
-          RUST_LOG_STYLE: always
-          CLICOLOR_FORCE: "1"
-        run: |
-          sudo -E bluebuild build -v --push ${RECIPE_PATH}
+          # enabled by default, disable if your image is small and you want faster builds
+          maximize_build_space: true
-- 
2.39.5


From 23ac1ad3f9748d769ed8d78724b3906fcf6a2ca3 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sun, 22 Jun 2025 17:17:41 -0400
Subject: [PATCH 11/23] Attempt force toggle

---
 files/scripts/install-xpadneo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/scripts/install-xpadneo.sh b/files/scripts/install-xpadneo.sh
index c9dbb40..b0cb4eb 100644
--- a/files/scripts/install-xpadneo.sh
+++ b/files/scripts/install-xpadneo.sh
@@ -7,4 +7,4 @@ git clone https://github.com/atar-axis/xpadneo.git /tmp/xpadneo/
 
 cd /tmp/xpadneo
 
-./install.sh --verbose
\ No newline at end of file
+./install.sh --verbose --force
\ No newline at end of file
-- 
2.39.5


From 576aa5a1233d4340e9ef80e6866d1725d048366d Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sun, 22 Jun 2025 20:11:35 -0400
Subject: [PATCH 12/23] Add nodejs to container for install

---
 .github/workflows/build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b51e455..88f04b4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,6 +30,11 @@ jobs:
           # !! Add your recipes here
           - recipe.yml
     steps:
+      - name: Install needed packages
+        shell: bash
+        run: |
+          sudo apt-get -y install nodejs
+      
       # the build is fully handled by the reusable github action
       - name: Build Custom Image
         uses: blue-build/github-action@v1.8
-- 
2.39.5


From d227b9c14614f356e7c82140a6a056ca318ca3f5 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sun, 22 Jun 2025 20:35:03 -0400
Subject: [PATCH 13/23] use apt instead of apt-get

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 88f04b4..c9290db 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Install needed packages
         shell: bash
         run: |
-          sudo apt-get -y install nodejs
+          sudo apt -y install nodejs
       
       # the build is fully handled by the reusable github action
       - name: Build Custom Image
-- 
2.39.5


From f9c5abdde72b53697fc64cf57d43f9f5d1541600 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sun, 22 Jun 2025 22:07:55 -0400
Subject: [PATCH 14/23] Removed install call as missing node issue was fixed

---
 .github/workflows/build.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c9290db..f18f61a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,10 +30,6 @@ jobs:
           # !! Add your recipes here
           - recipe.yml
     steps:
-      - name: Install needed packages
-        shell: bash
-        run: |
-          sudo apt -y install nodejs
       
       # the build is fully handled by the reusable github action
       - name: Build Custom Image
-- 
2.39.5


From 0a0df0b320de96ee81d9cac8a6ac65d95a66233b Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sun, 22 Jun 2025 23:19:43 -0400
Subject: [PATCH 15/23] Utilize rpm-ostree instead to install xpadneo

---
 recipes/components/dnf-module.yml     |  4 ++--
 recipes/components/xpadneo-module.yml | 12 +++++++++---
 recipes/recipe.yml                    |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/recipes/components/dnf-module.yml b/recipes/components/dnf-module.yml
index f74132e..4aba53e 100644
--- a/recipes/components/dnf-module.yml
+++ b/recipes/components/dnf-module.yml
@@ -121,8 +121,8 @@ modules:
         # for performance view
         - mangohud
         # dependencies for xpadneo
-        - dkms
-        - kernel-devel
+        #- dkms
+        #- kernel-devel
 
     remove:
       packages:
diff --git a/recipes/components/xpadneo-module.yml b/recipes/components/xpadneo-module.yml
index a44cf01..e2161a5 100644
--- a/recipes/components/xpadneo-module.yml
+++ b/recipes/components/xpadneo-module.yml
@@ -1,4 +1,10 @@
 modules:
-  - type: script
-    scripts:
-      - install-xpadneo.sh
\ No newline at end of file
+  #- type: script
+  #  scripts:
+  #    - install-xpadneo.sh
+  - type: rpm-ostree
+    repos:
+      - https://copr.fedorainfracloud.org/coprs/atim/xpadneo/repo/fedora-%OS_VERSION%/atim-xpadneo-fedora-%OS_VERSION%.repo
+    install:
+      - xpadneo
+      - xpadneo-kmod
\ No newline at end of file
diff --git a/recipes/recipe.yml b/recipes/recipe.yml
index 83283e1..28c5cc7 100644
--- a/recipes/recipe.yml
+++ b/recipes/recipe.yml
@@ -19,7 +19,7 @@ modules:
   - from-file: components/systemd-module.yml
   - from-file: components/default-flatpak.yml
   - from-file: components/chezmoi-module.yml
-  - type: initramfs
+  #- type: initramfs
 
   - type: signing
 
-- 
2.39.5


From 89d0aa7a602abd194a1a1943af7fda3de423741c Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Mon, 23 Jun 2025 14:07:09 -0400
Subject: [PATCH 16/23] Use negativo17 repos instead and pull their dkms
 xpadneo package.

---
 recipes/components/dnf-module.yml | 9 ++++-----
 recipes/recipe.yml                | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/recipes/components/dnf-module.yml b/recipes/components/dnf-module.yml
index 4aba53e..6e8011f 100644
--- a/recipes/components/dnf-module.yml
+++ b/recipes/components/dnf-module.yml
@@ -5,7 +5,7 @@ modules:
         - ublue-os/packages
         - solopasha/hyprland
         - peterwu/rendezvous
-      nonfree: rpmfusion
+      nonfree: negativo17
     install:
       skip-unavailable: true
       packages:
@@ -120,9 +120,8 @@ modules:
         - gamescope
         # for performance view
         - mangohud
-        # dependencies for xpadneo
-        #- dkms
-        #- kernel-devel
+        # xpadneo
+        - https://negativo17.org/repos/steam/fedora-%OS_VERSION%/x86_64/dkms-xpadneo-0.9.7-2.fc%OS_VERSION%.noarch.rpm
 
     remove:
       packages:
@@ -131,7 +130,7 @@ modules:
         - firefox-langpacks
     
     replace:
-      - from-repo: rpmfusion-nonfree
+      - from-repo: fedora-multimedia
         packages:
           - libheif
           - libva
diff --git a/recipes/recipe.yml b/recipes/recipe.yml
index 28c5cc7..d5fcc52 100644
--- a/recipes/recipe.yml
+++ b/recipes/recipe.yml
@@ -14,12 +14,12 @@ image-version: 42 # latest is also supported if you want new updates ASAP
 modules:
   - from-file: components/dnf-module.yml
   - from-file: components/script-module.yml
-  - from-file: components/xpadneo-module.yml
+  # - from-file: components/xpadneo-module.yml
   - from-file: components/sys-files-module.yml
   - from-file: components/systemd-module.yml
   - from-file: components/default-flatpak.yml
   - from-file: components/chezmoi-module.yml
-  #- type: initramfs
+  - type: initramfs
 
   - type: signing
 
-- 
2.39.5


From 02180ff9c0c34e14c0b5145a975dd23bc14b296d Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Mon, 23 Jun 2025 14:36:39 -0400
Subject: [PATCH 17/23] Attempt remove initramfs

---
 recipes/recipe.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/recipe.yml b/recipes/recipe.yml
index d5fcc52..b48fc47 100644
--- a/recipes/recipe.yml
+++ b/recipes/recipe.yml
@@ -19,7 +19,7 @@ modules:
   - from-file: components/systemd-module.yml
   - from-file: components/default-flatpak.yml
   - from-file: components/chezmoi-module.yml
-  - type: initramfs
+  #- type: initramfs
 
   - type: signing
 
-- 
2.39.5


From 1163caaeee2e54deed33e6f641c4bfcc586f3902 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Mon, 23 Jun 2025 15:47:22 -0400
Subject: [PATCH 18/23] Changed from url, added script to make sure dkms module
 is built and install

---
 files/scripts/install-xpadneo.sh  | 13 ++++++++++---
 recipes/components/dnf-module.yml | 10 +++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/files/scripts/install-xpadneo.sh b/files/scripts/install-xpadneo.sh
index b0cb4eb..50dcc3e 100644
--- a/files/scripts/install-xpadneo.sh
+++ b/files/scripts/install-xpadneo.sh
@@ -3,8 +3,15 @@
 # Tell build process to exit if there are any errors.
 set -oue pipefail
 
-git clone https://github.com/atar-axis/xpadneo.git /tmp/xpadneo/
+echo "INFO: kernel module"
+dnf list --installed | grep kernel.x86_64
 
-cd /tmp/xpadneo
+echo "INFO: uname -r output:"
+uname -r
 
-./install.sh --verbose --force
\ No newline at end of file
+echo "INFO: xpad modules in /usr/src"
+ls /usr/src | grep xpad
+
+echo "INFO: build and install xpadneo"
+sudo dkms build -m xpadneo/0.9.7
+sudo dkms install -m xpadneo/0.9.7
\ No newline at end of file
diff --git a/recipes/components/dnf-module.yml b/recipes/components/dnf-module.yml
index 6e8011f..5d6e33a 100644
--- a/recipes/components/dnf-module.yml
+++ b/recipes/components/dnf-module.yml
@@ -7,7 +7,6 @@ modules:
         - peterwu/rendezvous
       nonfree: negativo17
     install:
-      skip-unavailable: true
       packages:
       # sddm
         - sddm
@@ -121,7 +120,8 @@ modules:
         # for performance view
         - mangohud
         # xpadneo
-        - https://negativo17.org/repos/steam/fedora-%OS_VERSION%/x86_64/dkms-xpadneo-0.9.7-2.fc%OS_VERSION%.noarch.rpm
+        - dkms-xpadneo
+        #- https://negativo17.org/repos/steam/fedora-%OS_VERSION%/x86_64/akmod-xpadneo-0.9.7-2.fc%OS_VERSION%.noarch.rpm
 
     remove:
       packages:
@@ -142,4 +142,8 @@ modules:
           - mesa-libgbm
           - mesa-va-drivers
           - mesa-vulkan-drivers
-          - gstreamer1-plugin-libav
\ No newline at end of file
+          - gstreamer1-plugin-libav
+
+  - type: script
+    scripts:
+      - install-xpadneo.sh
\ No newline at end of file
-- 
2.39.5


From d645f1e5b52995ae51e9fcedd5487a53833bbd16 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Mon, 23 Jun 2025 17:10:27 -0400
Subject: [PATCH 19/23] Attempt dkms build and install with hard-coded kernel
 version

---
 files/scripts/install-xpadneo.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/scripts/install-xpadneo.sh b/files/scripts/install-xpadneo.sh
index 50dcc3e..efa8c9d 100644
--- a/files/scripts/install-xpadneo.sh
+++ b/files/scripts/install-xpadneo.sh
@@ -13,5 +13,5 @@ echo "INFO: xpad modules in /usr/src"
 ls /usr/src | grep xpad
 
 echo "INFO: build and install xpadneo"
-sudo dkms build -m xpadneo/0.9.7
-sudo dkms install -m xpadneo/0.9.7
\ No newline at end of file
+sudo dkms build -m xpadneo/0.9.7 -k 6.14.11-300
+sudo dkms install -m xpadneo/0.9.7 -k 6.14.11-300
\ No newline at end of file
-- 
2.39.5


From cc7b6eee4f4dd0b657db9f0907d9aaca357ccb3e Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Mon, 23 Jun 2025 17:22:31 -0400
Subject: [PATCH 20/23] add info to list lib modules and use particular version
 given

---
 files/scripts/install-xpadneo.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/files/scripts/install-xpadneo.sh b/files/scripts/install-xpadneo.sh
index efa8c9d..3893928 100644
--- a/files/scripts/install-xpadneo.sh
+++ b/files/scripts/install-xpadneo.sh
@@ -9,9 +9,12 @@ dnf list --installed | grep kernel.x86_64
 echo "INFO: uname -r output:"
 uname -r
 
+echo "INFO: list /lib/modules/"
+ls /lib/modules
+
 echo "INFO: xpad modules in /usr/src"
 ls /usr/src | grep xpad
 
 echo "INFO: build and install xpadneo"
-sudo dkms build -m xpadneo/0.9.7 -k 6.14.11-300
-sudo dkms install -m xpadneo/0.9.7 -k 6.14.11-300
\ No newline at end of file
+sudo dkms build -m xpadneo/0.9.7 -k 6.14.11-300.fc42.x86_64
+sudo dkms install -m xpadneo/0.9.7 -k 6.14.11-300.fc42.x86_64
\ No newline at end of file
-- 
2.39.5


From 3fc537ef5e6023a332574126e743a79efb3cd20f Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Mon, 23 Jun 2025 21:40:41 -0400
Subject: [PATCH 21/23] Change from hard coded versions to hopefully find what
 is needed to build

---
 files/scripts/install-xpadneo.sh | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/files/scripts/install-xpadneo.sh b/files/scripts/install-xpadneo.sh
index 3893928..0994751 100644
--- a/files/scripts/install-xpadneo.sh
+++ b/files/scripts/install-xpadneo.sh
@@ -3,18 +3,14 @@
 # Tell build process to exit if there are any errors.
 set -oue pipefail
 
-echo "INFO: kernel module"
-dnf list --installed | grep kernel.x86_64
+echo "INFO: grab kernel module"
+KERNEL_VER=${ls /lib/modules | head -n 1}
+echo $KERNEL_VER
 
-echo "INFO: uname -r output:"
-uname -r
-
-echo "INFO: list /lib/modules/"
-ls /lib/modules
-
-echo "INFO: xpad modules in /usr/src"
-ls /usr/src | grep xpad
+echo "INFO: grab xpad modules"
+MODULE_VER=${ls /usr/src | grep xpadneo |  sed 's/-/\//'}
+echo $MODULE_VER
 
 echo "INFO: build and install xpadneo"
-sudo dkms build -m xpadneo/0.9.7 -k 6.14.11-300.fc42.x86_64
-sudo dkms install -m xpadneo/0.9.7 -k 6.14.11-300.fc42.x86_64
\ No newline at end of file
+sudo dkms build -m $MODULE_VER -k $KERNEL_VER
+sudo dkms install -m $MODULE_VER -k $KERNEL_VER
\ No newline at end of file
-- 
2.39.5


From 6435c67377628ff483b861c24adac0a042f265a4 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Mon, 23 Jun 2025 21:51:10 -0400
Subject: [PATCH 22/23] Use proper containing characters

---
 files/scripts/install-xpadneo.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/scripts/install-xpadneo.sh b/files/scripts/install-xpadneo.sh
index 0994751..a6c8930 100644
--- a/files/scripts/install-xpadneo.sh
+++ b/files/scripts/install-xpadneo.sh
@@ -4,11 +4,11 @@
 set -oue pipefail
 
 echo "INFO: grab kernel module"
-KERNEL_VER=${ls /lib/modules | head -n 1}
+KERNEL_VER=$(ls /lib/modules | head -n 1)
 echo $KERNEL_VER
 
 echo "INFO: grab xpad modules"
-MODULE_VER=${ls /usr/src | grep xpadneo |  sed 's/-/\//'}
+MODULE_VER=$(ls /usr/src | grep xpadneo |  sed 's/-/\//')
 echo $MODULE_VER
 
 echo "INFO: build and install xpadneo"
-- 
2.39.5


From bf6b44fc0d5e306c0ba1be9948237fccd0cd6d65 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Mon, 23 Jun 2025 22:22:29 -0400
Subject: [PATCH 23/23] Cleanup

---
 recipes/components/dnf-module.yml     |  1 -
 recipes/components/xpadneo-module.yml | 10 ----------
 recipes/recipe.yml                    |  2 --
 3 files changed, 13 deletions(-)
 delete mode 100644 recipes/components/xpadneo-module.yml

diff --git a/recipes/components/dnf-module.yml b/recipes/components/dnf-module.yml
index 5d6e33a..524299c 100644
--- a/recipes/components/dnf-module.yml
+++ b/recipes/components/dnf-module.yml
@@ -121,7 +121,6 @@ modules:
         - mangohud
         # xpadneo
         - dkms-xpadneo
-        #- https://negativo17.org/repos/steam/fedora-%OS_VERSION%/x86_64/akmod-xpadneo-0.9.7-2.fc%OS_VERSION%.noarch.rpm
 
     remove:
       packages:
diff --git a/recipes/components/xpadneo-module.yml b/recipes/components/xpadneo-module.yml
deleted file mode 100644
index e2161a5..0000000
--- a/recipes/components/xpadneo-module.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-modules:
-  #- type: script
-  #  scripts:
-  #    - install-xpadneo.sh
-  - type: rpm-ostree
-    repos:
-      - https://copr.fedorainfracloud.org/coprs/atim/xpadneo/repo/fedora-%OS_VERSION%/atim-xpadneo-fedora-%OS_VERSION%.repo
-    install:
-      - xpadneo
-      - xpadneo-kmod
\ No newline at end of file
diff --git a/recipes/recipe.yml b/recipes/recipe.yml
index b48fc47..7042d1c 100644
--- a/recipes/recipe.yml
+++ b/recipes/recipe.yml
@@ -14,12 +14,10 @@ image-version: 42 # latest is also supported if you want new updates ASAP
 modules:
   - from-file: components/dnf-module.yml
   - from-file: components/script-module.yml
-  # - from-file: components/xpadneo-module.yml
   - from-file: components/sys-files-module.yml
   - from-file: components/systemd-module.yml
   - from-file: components/default-flatpak.yml
   - from-file: components/chezmoi-module.yml
-  #- type: initramfs
 
   - type: signing
 
-- 
2.39.5