From fe75d1d74fb593dbb0430a3be38d9d292ec31eb0 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Wed, 1 Nov 2023 16:15:29 -0700
Subject: [PATCH 1/5] fix(f39): Restore evdi (#628)

Co-authored-by: Jorge O. Castro <jorge.castro@gmail.com>
---
 Containerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Containerfile b/Containerfile
index 0d0a0f0e5e4..96291a8e661 100644
--- a/Containerfile
+++ b/Containerfile
@@ -47,10 +47,9 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
             /tmp/akmods-rpms/kmods/*openrazer*.rpm \
             /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \
             /tmp/akmods-rpms/kmods/*wl*.rpm \
-    ; else \
-        rpm-ostree install \
-            /tmp/akmods-rpms/kmods/*evdi*.rpm \
     ; fi && \
+    rpm-ostree install \
+        /tmp/akmods-rpms/kmods/*evdi*.rpm && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
     mkdir -p /etc/akmods-rpms/ && \
     mv /tmp/akmods-rpms/kmods/*steamdeck*.rpm /etc/akmods-rpms/steamdeck.rpm

From 827a2a05546dd548545bf319bcf98b49db053b2e Mon Sep 17 00:00:00 2001
From: "Jorge O. Castro" <jorge.castro@gmail.com>
Date: Fri, 3 Nov 2023 09:48:31 -0400
Subject: [PATCH 2/5] feat(yafti): add podman desktop (#636)

---
 usr/etc/yafti.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/etc/yafti.yml b/usr/etc/yafti.yml
index 9ad42cdbbea..b7bd0b3b8e2 100644
--- a/usr/etc/yafti.yml
+++ b/usr/etc/yafti.yml
@@ -22,6 +22,11 @@ screens:
           packages:
           - Discord: com.discordapp.Discord
           - Slack: com.slack.Slack
+        Development Tools:
+          description: Start your cloud-native journey here!
+          default: false
+          packages:
+          - Podman Desktop: io.podman_desktop.PodmanDesktop
         Gaming:
           description: "Rock and Stone!"
           default: false

From ee0fe47c125012f2b4ce6687b23adf0b0fe3b44c Mon Sep 17 00:00:00 2001
From: bobslept <38557801+bobslept@users.noreply.github.com>
Date: Fri, 3 Nov 2023 15:08:09 +0100
Subject: [PATCH 3/5] chore: steamdeck rpm cleanup (#637)

---
 Containerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Containerfile b/Containerfile
index 96291a8e661..c0b3ab80e65 100644
--- a/Containerfile
+++ b/Containerfile
@@ -50,9 +50,7 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
     ; fi && \
     rpm-ostree install \
         /tmp/akmods-rpms/kmods/*evdi*.rpm && \
-    sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
-    mkdir -p /etc/akmods-rpms/ && \
-    mv /tmp/akmods-rpms/kmods/*steamdeck*.rpm /etc/akmods-rpms/steamdeck.rpm
+    sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo
 
 # Starship Shell Prompt
 RUN curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-gnu.tar.gz" && \

From 9e9c10cd67b17e2ea752a7b50a987c2f404eeb47 Mon Sep 17 00:00:00 2001
From: bobslept <38557801+bobslept@users.noreply.github.com>
Date: Fri, 3 Nov 2023 15:18:08 +0100
Subject: [PATCH 4/5] chore(just): add docker description (#638)

---
 just/custom.just | 1 +
 1 file changed, 1 insertion(+)

diff --git a/just/custom.just b/just/custom.just
index a2f30dd4ec5..5192c70c5f7 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -236,6 +236,7 @@ zsh:
   sudo usermod $USER --shell /usr/bin/zsh 
   printf "${USER}'s shell is now %s." "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
 
+# Enable docker on the system
 docker:
   sudo systemctl enable --now docker
   sudo usermod -aG docker $USER

From b184c510dff63479859fcbc9b66682fd18a7af5b Mon Sep 17 00:00:00 2001
From: bobslept <38557801+bobslept@users.noreply.github.com>
Date: Sat, 4 Nov 2023 22:36:45 +0100
Subject: [PATCH 5/5] fix: exclude evdi on asus (#640)

---
 Containerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Containerfile b/Containerfile
index c0b3ab80e65..f0aa0517ab8 100644
--- a/Containerfile
+++ b/Containerfile
@@ -48,8 +48,11 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
             /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \
             /tmp/akmods-rpms/kmods/*wl*.rpm \
     ; fi && \
-    rpm-ostree install \
-        /tmp/akmods-rpms/kmods/*evdi*.rpm && \
+    # Don't install evdi on asus because of conflicts
+    if grep -qv "asus" <<< "${AKMODS_FLAVOR}"; then \
+        rpm-ostree install \
+            /tmp/akmods-rpms/kmods/*evdi*.rpm \
+    ; fi && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo
 
 # Starship Shell Prompt