Merge pull request #1 from ublue-os/main

[pull] main from ublue-os:main

Author: pull[bot]

Containerfile

@@ -190,6 +190,11 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
         glibc-all-langpacks \
         glibc-gconv-extra \
         || true && \
+    rpm-ostree override replace \
+    --experimental \
+    --from repo=updates \
+        libxcrypt \
+        || true && \
     if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
         rpm-ostree override replace \
         --experimental \
@@ -415,7 +420,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
 RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
     rpm-ostree install \
         discover-overlay \
-        sunshine-fix \
+        sunshine \
         python3-pip \
         libadwaita \
         duperemove \
@@ -436,6 +441,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
         tailscale \
         webapp-manager \
         btop \
+        duf \
         fish \
         lshw \
         xdotool \

spec_files/sunshine-fix/LICENSE spec_files/sunshine/LICENSE

@@ -1,5 +1,5 @@
-Name:           sunshine-fix
-Version:        2024.911.215655
+Name:           sunshine
+Version:        2025.101.215655
 Release:        100%{?dist}
 Summary:        Corrects a name change issue between original unofficial sunshine builds and the new official ones
 License:    	GPLv2
@@ -10,7 +10,7 @@ Source0:        LICENSE
 
 Requires:       Sunshine
 Provides:       sunshine = %{version}
-Obsoletes:      sunshine <= %{version}
+Obsoletes:      sunshine < %{version}
 
 %description
 Corrects a name change issue between original unofficial sunshine builds and the new official ones

spec_files/sunshine-fix/sunshine-fix.spec spec_files/sunshine/sunshine.spec

@@ -63,7 +63,7 @@ screens:
           description: Toggles pwfeedback on.
           default: true
           packages:
-          - Toggle password feedback: sudo -A ujust toggle-password-feedback enable
+          - Toggle password feedback: sudo -A ujust toggle-password-feedback on
         Hide GRUB Menu:
           description: Hide the GRUB menu on boot
           default: false