From 28983537eb362f91607cc23f1ab3d3cc9cd95f1c Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Sun, 28 Jan 2024 11:41:52 -0800
Subject: [PATCH] fix: Remove fontconfig change

---
 Containerfile                                          | 7 +------
 system_files/desktop/shared/usr/bin/bazzite-user-setup | 7 ++++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Containerfile b/Containerfile
index bf503b1c..9a313de4 100644
--- a/Containerfile
+++ b/Containerfile
@@ -177,7 +177,6 @@ RUN rpm-ostree override replace \
         || true
 
 # Install Valve's patched Mesa, Pipewire and Bluez
-# Install ublue patched power-profiles-daemon and fontconfig
 RUN rpm-ostree override replace \
     --experimental \
     --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \
@@ -201,11 +200,7 @@ RUN rpm-ostree override replace \
         bluez-cups \
         bluez-libs \
         bluez-obexd \
-        xorg-x11-server-Xwayland && \
-    rpm-ostree override replace \
-    --experimental \
-    --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
-        fontconfig
+        xorg-x11-server-Xwayland
 
 # Remove unneeded packages
 RUN rpm-ostree override remove \
diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup
index b4d3eef3..20de322e 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup
@@ -11,7 +11,7 @@ BAZZITE_CONFIG_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/bazzite"
 mkdir -p "$BAZZITE_CONFIG_DIR"
 
 # SCRIPT VERSION
-USER_SETUP_VER=24
+USER_SETUP_VER=25
 USER_SETUP_VER_FILE="$BAZZITE_CONFIG_DIR/version"
 USER_SETUP_FEDORA_VER_FILE="$BAZZITE_CONFIG_DIR/fedora_version"
 
@@ -44,6 +44,11 @@ flatpak remote-modify --user --enable flathub
 # Handle privileged tasks
 pkexec /usr/libexec/bazzite-privileged-user-setup
 
+# Refresh fontconfig
+if [[ -f "$HOME/.config/fontconfig" ]]; then
+  rm -rf "$HOME/.config/fontconfig"
+fi
+
 # Set up optional Gradience themes
 THEME_DIR="/usr/share/ublue-os/bazzite/themes"
 GRADIENCE_DIR="$HOME/.var/app/com.github.GradienceTeam.Gradience/config/presets/user"