Skip to content

Commit 4ecf880

Browse files
committed
displaymanager: Switch to sddm on the ISO
Signed-off-by: Peter Jung <admin@ptr1337.dev>
1 parent b13da0a commit 4ecf880

10 files changed

Lines changed: 36 additions & 36 deletions

File tree

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[Autologin]
2+
User=liveuser
3+
Session=plasma.desktop
4+
Relogin=false
5+
6+
[Users]
7+
MinimumUid=100
8+
MaximumUid=60000
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[Autologin]
2+
User=liveuser
3+
Session=plasma.desktop
4+
Relogin=false
5+
6+
[Users]
7+
MinimumUid=100
8+
MaximumUid=60000

archiso/airootfs/etc/sddm.conf.d/autologin.conf

Lines changed: 0 additions & 15 deletions
This file was deleted.

archiso/airootfs/usr/local/bin/calamares-online.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ main() {
4545
EOF
4646

4747
sudo cp "/usr/share/calamares/settings_${mode}.conf" /etc/calamares/settings.conf
48-
sudo -E dbus-launch calamares -D6 >> $log &
48+
exec pkexec-wrapper calamares -D6 >> $log
4949
}
5050

5151
main "$@"

archiso/airootfs/usr/local/bin/dmcheck

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ package=ly
1919
if pacman -Qs $package > /dev/null ; then
2020
ln -sf /usr/lib/systemd/system/ly.service /etc/systemd/system/display-manager.service
2121
fi
22+
package=plasma-login-manager
23+
if pacman -Qs $package > /dev/null ; then
24+
ln -sf /usr/lib/systemd/system/plasmalogin.service /etc/systemd/system/display-manager.service
25+
fi
2226
package=sddm
2327
if pacman -Qs $package > /dev/null ; then
2428
ln -sf /usr/lib/systemd/system/sddm.service /etc/systemd/system/display-manager.service
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env sh
2+
exec pkexec env \
3+
DISPLAY="$DISPLAY" \
4+
HOME="$HOME" \
5+
KDE_SESSION_VERSION="$KDE_SESSION_VERSION" \
6+
WAYLAND_DISPLAY="$WAYLAND_DISPLAY" \
7+
XDG_CURRENT_DESKTOP="$XDG_CURRENT_DESKTOP" \
8+
XDG_SESSION_TYPE="$XDG_SESSION_TYPE" \
9+
XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" \
10+
dbus-launch "$@"

archiso/airootfs/usr/local/bin/removeun-online

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ _clean_packages() {
1717
# for xxx in "${_toberemoved_packages[@]}"; do pacman -Rs "$xxx" --noconfirm; done
1818

1919
rm /etc/sddm.conf || true
20+
rm /etc/plasmalogin.conf || true
2021
}
2122

2223
_pacman_fix() {

archiso/packages_desktop.x86_64

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ cachyos-keyring
2424
cachyos-mirrorlist
2525
cachyos-rate-mirrors
2626
cachyos-settings
27-
cachyos-themes-sddm
2827
cachyos-v3-mirrorlist
2928
cachyos-v4-mirrorlist
3029
chwd
@@ -143,7 +142,6 @@ plasma-integration
143142
plasma-nm
144143
plasma-pa
145144
plasma-workspace
146-
plasma-x11-session
147145
polkit
148146
polkit-kde-agent
149147
power-profiles-daemon
@@ -155,7 +153,7 @@ rp-pppoe
155153
rsync
156154
rtkit
157155
rxvt-unicode-terminfo
158-
sddm
156+
plasma-login-manager
159157
sdparm
160158
sg3_utils
161159
smartmontools
@@ -191,22 +189,7 @@ wpa_supplicant
191189
wvdial
192190
xdg-user-dirs-gtk
193191
xdg-utils
194-
xf86-input-elographics
195-
xf86-input-evdev
196-
xf86-input-libinput
197-
xf86-input-synaptics
198-
xf86-input-vmmouse
199-
xf86-input-void
200-
xf86-video-amdgpu
201-
xf86-video-fbdev
202-
xf86-video-nouveau
203-
xf86-video-qxl
204-
xf86-video-vmware
205192
xfsprogs
206193
xl2tpd
207-
xorg-server
208-
xorg-xinit
209-
xorg-xkill
210-
xorg-xrandr
211-
xorg-xrdb
194+
yad
212195
zfs-utils

archiso/profiledef.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ file_permissions=(
3333
["/usr/local/bin/removeun-online"]="0:0:755"
3434
["/usr/local/bin/prepare-live-desktop.sh"]="0:0:755"
3535
["/usr/local/bin/nvidia-module-loader"]="0:0:755"
36+
["/usr/local/bin/pkexec-wrapper"]="0:0:755"
3637
)

util-iso.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ prepare_profile(){
140140
rm -f ${src_dir}/archiso/airootfs/etc/systemd/system/display-manager.service
141141
if [ "$profile" == "desktop" ]; then
142142
cp ${src_dir}/archiso/packages_desktop.x86_64 ${src_dir}/archiso/packages.x86_64
143-
ln -sf /usr/lib/systemd/system/sddm.service ${src_dir}/archiso/airootfs/etc/systemd/system/display-manager.service
143+
ln -sf /usr/lib/systemd/system/plasmalogin.service ${src_dir}/archiso/airootfs/etc/systemd/system/display-manager.service
144144
else
145145
die "Unknown profile: [%s]" "${profile}"
146146
fi

0 commit comments

Comments
 (0)