From bb1d18830d104427d378c04739c22772ac7e11f2 Mon Sep 17 00:00:00 2001 From: Thomas Duckworth Date: Sat, 22 Nov 2025 11:54:09 +1100 Subject: [PATCH] Switch to plasma-login-manager, remove SDDM plasma-login-manager is in a workable state now, so it should be dogfooded on KDE Linux to ensure everything goes smoothly once it's adopted. It also fixes the issue of not being able to set a wallpaper for the login manager which was a problem on SDDM. --- mkosi.conf.d/55-packages-kde.conf | 3 +-- .../calamares/desktop/modules/displaymanager.conf | 13 ++++++++----- mkosi.extra/live/usr/lib/live-setup | 3 +-- .../lib/sddm/sddm.conf.d/x00-kde-linux-theme.conf | 7 ------- .../lib/systemd/system-preset/50-kde-linux.preset | 2 +- 5 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 mkosi.extra/usr/lib/sddm/sddm.conf.d/x00-kde-linux-theme.conf diff --git a/mkosi.conf.d/55-packages-kde.conf b/mkosi.conf.d/55-packages-kde.conf index 7101f2d..0cab86b 100644 --- a/mkosi.conf.d/55-packages-kde.conf +++ b/mkosi.conf.d/55-packages-kde.conf @@ -4,5 +4,4 @@ # Let's go bananas [Content] -Packages=sddm - kde-linux +Packages=kde-linux diff --git a/mkosi.extra/live/usr/calamares/desktop/modules/displaymanager.conf b/mkosi.extra/live/usr/calamares/desktop/modules/displaymanager.conf index 4e42c60..90c156a 100644 --- a/mkosi.extra/live/usr/calamares/desktop/modules/displaymanager.conf +++ b/mkosi.extra/live/usr/calamares/desktop/modules/displaymanager.conf @@ -1,16 +1,19 @@ # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL # SPDX-FileCopyrightText: 2018-2021 Harald Sitter -# -# Configure one or more display managers (e.g. SDDM) +# SPDX-FileCopyrightText: 2025 Thomas Duckworth + +# NB: This was switched from SDDM to plasmalogin, but things should work the same for now. + +# Configure one or more display managers (e.g. plasmalogin) # with a "best effort" approach. --- displaymanagers: - - sddm + - plasmalogin # Force plasma as default session. calamares doesn't necessarily do a good job at picking # a "smart" default. Whatever smart means anyway. defaultDesktopEnvironment: - # executable this is entirely pointless for sddm specifically, and in general + # executable this is entirely pointless for plasmalogin specifically, and in general # counterproductive https://codeberg.org/Calamares/calamares/issues/1248 # We therefore set it to /bin/true to ensure forwards/backwards # compatibility. Ideally of course the issue should get solved and we'd @@ -20,7 +23,7 @@ defaultDesktopEnvironment: # Depending on the neon edition we may opt to use wayland instead. desktopFile: "plasma" -# Only for distros where the sddm package isn't self sufficient. +# Only for distros where the plasmalogin package isn't self sufficient. basicSetup: false # Only relevant on suse. diff --git a/mkosi.extra/live/usr/lib/live-setup b/mkosi.extra/live/usr/lib/live-setup index 168a03f..85aede2 100755 --- a/mkosi.extra/live/usr/lib/live-setup +++ b/mkosi.extra/live/usr/lib/live-setup @@ -30,8 +30,7 @@ ln -s ../usr/share/zoneinfo/UTC /etc/localtime timedatectl set-timezone UTC localectl set-locale C.UTF-8 -mkdir --parents /etc/sddm.conf.d/ -cat << EOF > /etc/sddm.conf.d/live.conf +cat << EOF >> /etc/plasmalogin.conf [Autologin] User=live Session=plasma.desktop diff --git a/mkosi.extra/usr/lib/sddm/sddm.conf.d/x00-kde-linux-theme.conf b/mkosi.extra/usr/lib/sddm/sddm.conf.d/x00-kde-linux-theme.conf deleted file mode 100644 index b42f38f..0000000 --- a/mkosi.extra/usr/lib/sddm/sddm.conf.d/x00-kde-linux-theme.conf +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -# SPDX-FileCopyrightText: 2020 Jonathan Riddell - -# NOTE: something inconveniently installs default.conf so we need to do alphabetical ordering in the file name - -[Theme] -Current=breeze diff --git a/mkosi.extra/usr/lib/systemd/system-preset/50-kde-linux.preset b/mkosi.extra/usr/lib/systemd/system-preset/50-kde-linux.preset index ce8a426..57edeeb 100644 --- a/mkosi.extra/usr/lib/systemd/system-preset/50-kde-linux.preset +++ b/mkosi.extra/usr/lib/systemd/system-preset/50-kde-linux.preset @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL # SPDX-FileCopyrightText: 2023 Harald Sitter -enable sddm.service +enable plasmalogin.service enable avahi-daemon.socket # Note that both avahi socket and service are needed. Client software on the system may only talk to the daemon but # fail to do so if the daemon is not up (avahi-browse for example just errors out instead of dbus-activating)