install: split SDDM static config from autologin
This commit is contained in:
+18
-26
@@ -1,38 +1,30 @@
|
|||||||
# Install omarchy SDDM theme
|
# Install omarchy SDDM theme
|
||||||
omarchy-refresh-sddm
|
rm -rf /usr/share/sddm/themes/omarchy
|
||||||
|
mkdir -p /usr/share/sddm/themes
|
||||||
|
cp -r "$OMARCHY_PATH/default/sddm/omarchy" /usr/share/sddm/themes/omarchy
|
||||||
|
|
||||||
# Setup SDDM login service
|
# Setup SDDM login service
|
||||||
sudo mkdir -p /usr/local/share/wayland-sessions
|
mkdir -p /usr/local/share/wayland-sessions
|
||||||
sudo cp "$OMARCHY_PATH/default/wayland-sessions/omarchy.desktop" /usr/local/share/wayland-sessions/omarchy.desktop
|
cp -f "$OMARCHY_PATH/default/wayland-sessions/omarchy.desktop" /usr/local/share/wayland-sessions/omarchy.desktop
|
||||||
sudo cp "$OMARCHY_PATH/default/sddm/hyprland.lua" /usr/share/sddm/hyprland.lua
|
cp -f "$OMARCHY_PATH/default/sddm/hyprland.lua" /usr/share/sddm/hyprland.lua
|
||||||
sudo rm -f /usr/share/sddm/hyprland.conf
|
rm -rf /usr/share/sddm/hyprland.conf
|
||||||
|
|
||||||
sudo mkdir -p /etc/sddm.conf.d
|
mkdir -p /etc/sddm.conf.d
|
||||||
cat <<EOF | sudo tee /etc/sddm.conf.d/10-wayland.conf >/dev/null
|
autologin_conf=/etc/sddm.conf.d/autologin.conf
|
||||||
[General]
|
if [[ ! -f $autologin_conf ]]; then
|
||||||
DisplayServer=wayland
|
cat > "$autologin_conf" <<EOF
|
||||||
|
|
||||||
[Wayland]
|
|
||||||
CompositorCommand=start-hyprland -- --config /usr/share/sddm/hyprland.lua
|
|
||||||
EOF
|
|
||||||
|
|
||||||
if [[ ! -f /etc/sddm.conf.d/autologin.conf ]]; then
|
|
||||||
cat <<EOF | sudo tee /etc/sddm.conf.d/autologin.conf
|
|
||||||
[Autologin]
|
[Autologin]
|
||||||
User=$USER
|
User=${OMARCHY_INSTALL_USER:-${USER:-}}
|
||||||
Session=omarchy
|
Session=omarchy
|
||||||
|
|
||||||
[Theme]
|
|
||||||
Current=omarchy
|
|
||||||
EOF
|
EOF
|
||||||
else
|
else
|
||||||
sudo sed -i 's/^Session=hyprland-uwsm$/Session=omarchy/' /etc/sddm.conf.d/autologin.conf
|
sed -i 's/^Session=hyprland-uwsm$/Session=omarchy/' "$autologin_conf"
|
||||||
|
sed -i '/^\[Theme\]$/,/^$/d' "$autologin_conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Prevent password-based SDDM logins from creating an encrypted login keyring
|
# Prevent password-based SDDM logins from creating an encrypted login keyring
|
||||||
# (which conflicts with the passwordless Default_keyring used for auto-unlock)
|
# (which conflicts with the passwordless Default_keyring used for auto-unlock)
|
||||||
sudo sed -i '/-auth.*pam_gnome_keyring\.so/d' /etc/pam.d/sddm
|
if [[ -f /etc/pam.d/sddm ]]; then
|
||||||
sudo sed -i '/-password.*pam_gnome_keyring\.so/d' /etc/pam.d/sddm
|
sed -i '/-auth.*pam_gnome_keyring\.so/d' /etc/pam.d/sddm
|
||||||
|
sed -i '/-password.*pam_gnome_keyring\.so/d' /etc/pam.d/sddm
|
||||||
# Don't use chrootable here as --now will cause issues for manual installs
|
fi
|
||||||
sudo systemctl enable sddm.service
|
|
||||||
|
|||||||
Reference in New Issue
Block a user