From b61a2c48b8710f723d4013ea6992e0c3c4260dee Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Sat, 22 Jul 2023 00:17:14 -0700
Subject: [PATCH 1/2] fix: Remove SteamVR polkit waiting more proper solution

---
 .../etc/polkit-1/rules.d/41-steamvr.rules        | 10 ----------
 .../actions/org.chimeraos.steamvr.policy         | 16 ----------------
 2 files changed, 26 deletions(-)
 delete mode 100644 system_files/desktop/etc/polkit-1/rules.d/41-steamvr.rules
 delete mode 100644 system_files/desktop/usr/share/polkit-1/actions/org.chimeraos.steamvr.policy

diff --git a/system_files/desktop/etc/polkit-1/rules.d/41-steamvr.rules b/system_files/desktop/etc/polkit-1/rules.d/41-steamvr.rules
deleted file mode 100644
index 98f40d65..00000000
--- a/system_files/desktop/etc/polkit-1/rules.d/41-steamvr.rules
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Allow members of the wheel group to execute the defined actions
- * without password authentication, similar to "sudo NOPASSWD:"
- */
-polkit.addRule(function(action, subject) {
-    if ((action.id == "org.chimeraos.steamvr.pkexec") &&
-        subject.isInGroup("wheel"))
-    {
-        return polkit.Result.YES;
-    }
-});
diff --git a/system_files/desktop/usr/share/polkit-1/actions/org.chimeraos.steamvr.policy b/system_files/desktop/usr/share/polkit-1/actions/org.chimeraos.steamvr.policy
deleted file mode 100644
index f0bf5f48..00000000
--- a/system_files/desktop/usr/share/polkit-1/actions/org.chimeraos.steamvr.policy
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-  <action id="org.chimeraos.steamvr.pkexec">
-    <message>Authentication is required to change steamvr compositor capabilities</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/setcap</annotate>
-    <annotate key="org.freedesktop.policykit.exec.argv1">CAP_SYS_NICE=eip</annotate>
-    <annotate key="org.freedesktop.policykit.exec.argv2">/home/gamer/.local/share/Steam/steamapps/common/SteamVR/bin/linux64/vrcompositor-launcher</annotate>
-  </action>
-</policyconfig>

From 75cf06aa1067c2361b1efb84aeb6dabad06e7db2 Mon Sep 17 00:00:00 2001
From: RJ Trujillo <eyecantcu@pm.me>
Date: Sat, 22 Jul 2023 06:55:19 -0600
Subject: [PATCH 2/2] fix(desktop): Use sddm.conf for autologin

kde_settings doesn't take effect otherwise making the SDDM configuration screen no-op
---
 Containerfile                                             | 5 ++---
 .../desktop/etc/{sddm.conf.d/steamos.conf => sddm.conf}   | 0
 system_files/desktop/usr/bin/plasma-autologin             | 8 ++++++++
 3 files changed, 10 insertions(+), 3 deletions(-)
 rename system_files/desktop/etc/{sddm.conf.d/steamos.conf => sddm.conf} (100%)

diff --git a/Containerfile b/Containerfile
index 4d71ffba..fe1f81d4 100644
--- a/Containerfile
+++ b/Containerfile
@@ -92,9 +92,6 @@ RUN pip install --prefix=/usr yafti && \
     systemctl disable rpm-ostreed-automatic.timer && \
     systemctl --global enable ublue-update.timer && \
     systemctl enable input-remapper.service && \
-    rm -f \
-        /usr/etc/sddm.conf \
-        /etc/sddm.conf && \
     rm -rf \
         /tmp/* \
         /var/* && \
@@ -184,11 +181,13 @@ RUN sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-hl2linux-selinux.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-obs-vkcapture.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \
+    mv /etc/sddm.conf /etc/sddm.conf.d/steamos.conf && \
     systemctl enable plasma-autologin.service && \
     systemctl enable jupiter-fan-control.service && \
     systemctl enable set-cfs-tweaks.service && \
     systemctl disable input-remapper.service && \
     systemctl --global disable ublue-update.timer && \
+    rm -f /usr/etc/sddm.conf && \
     rm -rf \
         /tmp/* \
         /var/* && \
diff --git a/system_files/desktop/etc/sddm.conf.d/steamos.conf b/system_files/desktop/etc/sddm.conf
similarity index 100%
rename from system_files/desktop/etc/sddm.conf.d/steamos.conf
rename to system_files/desktop/etc/sddm.conf
diff --git a/system_files/desktop/usr/bin/plasma-autologin b/system_files/desktop/usr/bin/plasma-autologin
index 6b5978a8..e806b10e 100755
--- a/system_files/desktop/usr/bin/plasma-autologin
+++ b/system_files/desktop/usr/bin/plasma-autologin
@@ -4,6 +4,14 @@ USER=$(id -nu 1000)
 
 # SteamOS SDDM config
 SDDM_CONF='/etc/sddm.conf.d/steamos.conf'
+if [ ! -f ${SDDM_CONF} ]; then
+    # Fallback to sddm.conf
+    SDDM_CONF = '/etc/sddm.conf'
+    KDE_SETTINGS = '/etc/sddm.conf.d/kde_settings.conf'
+    if [ -f ${KDE_SETTINGS} ]; then
+        rm -f ${KDE_SETTINGS}
+    fi
+fi
 
 # Configure autologin
 sed -i 's/.*Session=.*/Session=plasmax11.desktop/g' ${SDDM_CONF}