Skip to content

Commit

Permalink
feat: Switch to modified xone that retains full support for xpad, res…
Browse files Browse the repository at this point in the history
…olves issues with third party game controllers in previous releases.

chore: Remove unneeded amdgpu.conf thanks to fsync kernel.
  • Loading branch information
KyleGospo committed Jan 24, 2024
1 parent e43ff9e commit 6f50817
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 13 deletions.
1 change: 0 additions & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
rpm-ostree install \
/tmp/akmods-rpms/kmods/*xpadneo*.rpm \
/tmp/akmods-rpms/kmods/*xpad-noone*.rpm \
/tmp/akmods-rpms/kmods/*xone*.rpm \
/tmp/akmods-rpms/kmods/*openrazer*.rpm \
/tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \
Expand Down
25 changes: 24 additions & 1 deletion system_files/desktop/shared/usr/bin/bazzite-hardware-setup
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO)
FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO)

# SCRIPT VERSION
HWS_VER=22
HWS_VER=23
HWS_VER_FILE="/etc/bazzite/hws_version"
HWS_VER_RAN=$(cat $HWS_VER_FILE)

Expand Down Expand Up @@ -215,6 +215,29 @@ if grep -qv "graphical.target" <<< "$(systemctl get-default)"; then
systemctl set-default graphical.target
fi

# CLEAN UP
# AMDGPU settings change that the fsync kernel now handles.
if [[ -f "/etc/modprobe.d/amdgpu.conf" ]]; then
rm -f "/etc/modprobe.d/amdgpu.conf"
fi
# Controller chnages are no longer needed thanks to patched xone driver.
if [[ -f "/etc/modprobe.d/xone.conf" ]]; then
rm -f "/etc/modprobe.d/xone.conf"
fi
if [[ -f "/etc/modprobe.d/xpad-noone-blacklist.conf" ]]; then
rm -f "/etc/modprobe.d/xpad-noone-blacklist.conf"
fi
if [[ -f "/etc/modules-load.d/xpad-noone.conf" ]]; then
rm -f "/etc/modules-load.d/xpad-noone.conf"
fi
if [[ -f "/etc/modprobe.d/xpadneo.conf" ]]; then
rm -f "/etc/modprobe.d/xpadneo.conf"
fi
# Previous optional solution for zenpower3 that has been replaced with zenergy.
if [[ -f "/etc/modprobe.d/amdcpu.conf" ]]; then
rm -f "/etc/modprobe.d/amdcpu.conf"
fi

mkdir -p /etc/bazzite
echo $HWS_VER > $HWS_VER_FILE
echo $IMAGE_NAME > $KNOWN_IMAGE_NAME_FILE
Expand Down
2 changes: 0 additions & 2 deletions system_files/desktop/shared/usr/bin/bazzite-user-setup
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,9 @@ THEME_DIR="/usr/share/ublue-os/bazzite/themes"
GRADIENCE_DIR="$HOME/.var/app/com.github.GradienceTeam.Gradience/config/presets/user"
mkdir -p "$GRADIENCE_DIR"
if [[ ! -f "$GRADIENCE_DIR/vapor.json" ]]; then
rm -f "$GRADIENCE_DIR/vapor.json"
cp "$THEME_DIR/vapor.json" "$GRADIENCE_DIR/vapor.json"
fi
if [[ ! -f "$GRADIENCE_DIR/vgui2.json" ]]; then
rm -f "$GRADIENCE_DIR/vgui2.json"
cp "$THEME_DIR/vgui2.json" "$GRADIENCE_DIR/vgui2.json"
fi

Expand Down
5 changes: 0 additions & 5 deletions system_files/desktop/shared/usr/etc/modprobe.d/amdgpu.conf

This file was deleted.

1 change: 0 additions & 1 deletion system_files/desktop/shared/usr/etc/modprobe.d/xone.conf

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 6f50817

Please sign in to comment.