Merge pull request #53 from ublue-os/presets

feat(desktop): Modify Steam Deck KDE presets for desktop use
This commit is contained in:
Kyle Gospodnetich 2023-07-18 20:35:05 -07:00 committed by GitHub
commit 6192e3b544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 124 additions and 93 deletions

View File

@ -32,7 +32,7 @@ RUN rpm-ostree install \
python3-pip \
libadwaita \
distrobox \
steamdeck-kde-themes \
steamdeck-kde-presets-desktop \
sddm-sugar-steamOS \
wallpaper-engine-kde-plugin \
duperemove \
@ -80,6 +80,9 @@ 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/* && \
@ -114,8 +117,8 @@ RUN rpm-ostree override remove system76-scheduler
RUN rm -f /etc/systemd/user/com.system76.Scheduler.dbusproxy.service
RUN rm -f /usr/bin/system76-scheduler-dbus-proxy
# Remove steamdeck-kde-themes
RUN rpm-ostree override remove steamdeck-kde-themes
# Remove steamdeck-kde-presets-desktop
RUN rpm-ostree override remove steamdeck-kde-presets-desktop
# Remove ublue-os-wallpapers
RUN rpm-ostree override remove ublue-os-wallpapers

View File

@ -93,7 +93,7 @@ Ported SteamOS and ChimeraOS packages, among others used by Bazzite, are built o
|sddm-sugar-steamOS|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/sddm-sugar-steamOS/status_image/last_build.png?)|
|sdgyrodsu|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/sdgyrodsu/status_image/last_build.png?)|
|steamdeck-kde-presets|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/steamdeck-kde-presets/status_image/last_build.png?)|
|steamdeck-kde-themes|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/steamdeck-kde-themes/status_image/last_build.png?)|
|steamdeck-kde-presets-desktop|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/steamdeck-kde-presets-desktop/status_image/last_build.png?)|
|udisks2|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/udisks2/status_image/last_build.png?)|
Additionally, the following packages are used from other Copr repos:

View File

@ -0,0 +1,11 @@
diff --git a/etc/xdg/kscreenlockerrc b/etc/xdg/kscreenlockerrc
index 8a52bc5..081de18 100644
--- a/etc/xdg/kscreenlockerrc
+++ b/etc/xdg/kscreenlockerrc
@@ -1,3 +1,3 @@
-[Daemon]
-Autolock=false
-LockOnResume=false
+[Greeter][Wallpaper][org.kde.image][General]
+Image=/usr/share/wallpapers/Steam Deck Logo Default.jpg
+PreviewImage=/usr/share/wallpapers/Steam Deck Logo Default.jpg

View File

@ -0,0 +1,20 @@
diff --git a/etc/xdg/kdeglobals b/etc/xdg/kdeglobals
index 19fff81..42b336f 100644
--- a/etc/xdg/kdeglobals
+++ b/etc/xdg/kdeglobals
@@ -2,15 +2,6 @@
LookAndFeelPackage=com.valve.vapor.desktop
SingleClick=false
-[KDE Action Restrictions][$i]
-action/switch_user=false
-action/start_new_session=false
-action/lock_screen=false
-
-[KDE Control Module Restrictions][$i]
-kcm_sddm.desktop=false
-kcm_plymouth.desktop=false
-
[General]
font=Noto Sans,11,-1,5,50,0,0,0,0,0
menuFont=Noto Sans,11,-1,5,50,0,0,0,0,0

View File

@ -0,0 +1,86 @@
Name: steamdeck-kde-presets-desktop
Version: {{{ git_dir_version }}}
Release: 1%{?dist}
Summary: KDE Presets from Valve's SteamOS 3.0 for desktops
License: GPLv2
URL: https://github.com/ublue-os/bazzite
Source: https://gitlab.com/evlaV/steamdeck-kde-presets/-/archive/master/steamdeck-kde-presets-master.tar.gz
Patch0: multiuser.patch
Patch1: lockscreen.patch
BuildArch: noarch
Requires: kde-filesystem
Conflicts: steamdeck-kde-presets
%description
KDE Presets from Valve's SteamOS 3.0 for desktops
# Disable debug packages
%define debug_package %{nil}
%prep
%autosetup -p1 -n steamdeck-kde-presets-master
%build
%install
mkdir -p %{buildroot}%{_datadir}/
mkdir -p %{buildroot}%{_sysconfdir}/
cp -rv usr/share/* %{buildroot}%{_datadir}
cp -rv etc/* %{buildroot}%{_sysconfdir}
mv %{buildroot}%{_sysconfdir}/skel %{buildroot}%{_sysconfdir}/skel.d
# Remove unneeded files
rm %{buildroot}%{_datadir}/applications/org.mozilla.firefox.desktop
rm %{buildroot}%{_datadir}/kservices5/ServiceMenus/steam.desktop
rm %{buildroot}%{_datadir}/X11/xorg.conf.d/99-pointer.conf
rm %{buildroot}%{_sysconfdir}/profile.d/kde.sh
rm %{buildroot}%{_sysconfdir}/sddm.conf.d/steamdeck.conf
rm %{buildroot}%{_sysconfdir}/skel.d/Desktop/Return.desktop
rm %{buildroot}%{_sysconfdir}/X11/Xsession.d/50rotate-screen
rm %{buildroot}%{_sysconfdir}/xdg/autostart/ibus.desktop
rm %{buildroot}%{_sysconfdir}/xdg/autostart/jupiter-plasma-bootstrap.desktop
rm %{buildroot}%{_sysconfdir}/xdg/autostart/steam.desktop
rm %{buildroot}%{_sysconfdir}/xdg/kcminputrc
rm %{buildroot}%{_sysconfdir}/xdg/kwinrc
rm %{buildroot}%{_sysconfdir}/xdg/kwinrulesrc
rm %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env/ibus.sh
rm %{buildroot}%{_sysconfdir}/xdg/powermanagementprofilesrc
# Do post-installation
%post
# Do before uninstallation
%preun
# Do after uninstallation
%postun
# This lists all the files that are included in the rpm package and that
# are going to be installed into target system where the rpm is installed.
%files
%{_datadir}/color-schemes/Vapor.colors
%{_datadir}/color-schemes/VGUI.colors
%{_datadir}/icons/*
%{_datadir}/konsole/*
%{_datadir}/plasma/avatars/*
%{_datadir}/plasma/desktoptheme/*
%{_datadir}/plasma/kickeractions/steam.desktop
%{_datadir}/plasma/look-and-feel/com.valve.vapor.desktop/*
%{_datadir}/plasma/look-and-feel/com.valve.vgui.desktop/*
%{_datadir}/themes/*
%{_datadir}/wallpapers/*
%{_sysconfdir}/xdg/gtk-2.0/gtkrc
%{_sysconfdir}/xdg/gtk-3.0/settings.ini
%{_sysconfdir}/xdg/baloofilerc
%{_sysconfdir}/xdg/kdeglobals
%{_sysconfdir}/xdg/kscreenlockerrc
%{_sysconfdir}/xdg/ktrashrc
%{_sysconfdir}/xdg/plasma-nm
# Finally, changes from the latest release of your application are generated from
# your project's Git history. It will be empty until you make first annotated Git tag.
%changelog
{{{ git_dir_changelog }}}

View File

@ -1,63 +0,0 @@
%define packagename steamdeck-kde-presets
Name: steamdeck-kde-themes
Version: {{{ git_dir_version }}}
Release: 1%{?dist}
Summary: KDE Themes from Valve's SteamOS 3.0
License: GPLv2
URL: https://github.com/ublue-os/bazzite
Source: https://gitlab.com/evlaV/%{packagename}/-/archive/master/%{packagename}-master.tar.gz
BuildArch: noarch
Requires: kde-filesystem
Conflicts: steamdeck-kde-presets
%description
KDE Themes from Valve's SteamOS 3.0
# Disable debug packages
%define debug_package %{nil}
%prep
%setup -n %{packagename}-master
%build
%install
mkdir -p %{buildroot}%{_datadir}/
cp -rv usr/share/* %{buildroot}%{_datadir}
# Remove unneeded files
rm %{buildroot}%{_datadir}/applications/org.mozilla.firefox.desktop
rm -rf %{buildroot}%{_datadir}/kservices5
rm -rf %{buildroot}%{_datadir}/X11
rm -rf %{buildroot}%{_datadir}/plasma/kickeractions
# Do post-installation
%post
# Do before uninstallation
%preun
# Do after uninstallation
%postun
# This lists all the files that are included in the rpm package and that
# are going to be installed into target system where the rpm is installed.
%files
%{_datadir}/color-schemes/*
%{_datadir}/icons/*
%{_datadir}/konsole/*
# %%{_datadir}/kservices5/*
%{_datadir}/plasma/avatars/*
%{_datadir}/plasma/desktoptheme/*
%{_datadir}/plasma/look-and-feel/com.valve.vapor.desktop/*
%{_datadir}/plasma/look-and-feel/com.valve.vgui.desktop/*
%{_datadir}/themes/*
%{_datadir}/wallpapers/*
# Finally, changes from the latest release of your application are generated from
# your project's Git history. It will be empty until you make first annotated Git tag.
%changelog
{{{ git_dir_changelog }}}

View File

@ -8,8 +8,3 @@ SDDM_CONF='/etc/sddm.conf.d/steamos.conf'
# Configure autologin
sed -i 's/.*Session=.*/Session=gamescope-session.desktop/g' ${SDDM_CONF}
sed -i 's/.*User=.*/User='${USER}'/g' ${SDDM_CONF}
# Remove sddm.conf if it exists
if [ -f '/etc/sddm.conf' ]; then
rm -f /etc/sddm.conf
fi

View File

@ -83,11 +83,6 @@ screens:
default: true
packages:
- Create Steam shortcuts: just --unstable create-steam-shortcuts
Theme:
description: Set the default KDE theme
default: true
packages:
- Setup Theme: just setup-theme
Use EXT4 for SD Cards:
description: Disable BTRFS support for SD cards for direct compatibility with SD cards formatted on stock SteamOS (Not recommended).
default: false

View File

@ -27,9 +27,6 @@ install-nix: _auth
remove-nix: _auth
sudo curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/uninstaller-scripts/silverblue-nix-uninstaller.sh | bash
setup-theme:
lookandfeeltool -a com.valve.vapor.desktop
get-greenlight:
echo 'Retrieving Greenlight'
wget https://github.com/unknownskl/greenlight/releases/download/v2.0.0-beta8/Greenlight-2.0.0-beta8.AppImage -O ~/Desktop/Greenlight.AppImage

View File

@ -8,8 +8,3 @@ SDDM_CONF='/etc/sddm.conf.d/steamos.conf'
# Configure autologin
sed -i 's/.*Session=.*/Session=plasmax11.desktop/g' ${SDDM_CONF}
sed -i 's/.*User=.*/User='${USER}'/g' ${SDDM_CONF}
# Remove sddm.conf if it exists
if [ -f '/etc/sddm.conf' ]; then
rm -f /etc/sddm.conf
fi

View File

@ -64,11 +64,6 @@ screens:
default: true
packages:
- Enable System76 Scheduler: just --unstable enable-system76-scheduler
Theme:
description: Set the default KDE theme
default: true
packages:
- Setup Theme: just setup-theme
Wallpaper Engine:
description: Enables Wallpaper Engine
default: true

View File

@ -19,9 +19,6 @@ install-nix: _auth
remove-nix: _auth
sudo curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/uninstaller-scripts/silverblue-nix-uninstaller.sh | bash
setup-theme:
lookandfeeltool -a com.valve.vapor.desktop
enable-big-picture:
systemctl enable --now plasma-autologin
sed -i 's@/usr/bin/steam-runtime -silent %U@/usr/bin/steam-runtime -bigpicture %U@g' ~/.config/autostart/bazzite-arch-steam-silent.desktop

View File

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 70 KiB