mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Login and UKI updates (#2242)
* Change DM to SDDM * Move to custom named UKI * Skip creation on Mac * Add entry to make sure VSCode uses gnome keyring * Fix order for UKI generation * Limine only * BTRFS only * Add checks for possible issues * Remove * Add verification to omarchy-pkg-add and speed up installs * Use omarchy-pkg-add * Update files to include dirs * Fix relaunch
This commit is contained in:
57
migrations/1758487660_change_dm_to_sddm.sh
Executable file
57
migrations/1758487660_change_dm_to_sddm.sh
Executable file
@@ -0,0 +1,57 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
error_exit() {
|
||||
echo -e "\033[31mERROR: Migration failed! Manual intervention required.\033[0m" >&2
|
||||
echo -e "\033[31mDO NOT REBOOT - System may be in inconsistent state until the error is fixed.\033[0m" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
trap error_exit ERR
|
||||
|
||||
echo "Change display manager to SDDM"
|
||||
|
||||
omarchy-pkg-add sddm libsecret gnome-keyring || error_exit
|
||||
|
||||
sudo mkdir -p /etc/sddm.conf.d
|
||||
|
||||
cat <<EOF | sudo tee /etc/sddm.conf.d/autologin.conf
|
||||
[Autologin]
|
||||
User=$USER
|
||||
Session=hyprland-uwsm
|
||||
|
||||
[Theme]
|
||||
Current=breeze
|
||||
EOF
|
||||
|
||||
sudo systemctl disable omarchy-seamless-login.service
|
||||
sudo systemctl unmask plymouth-quit-wait.service
|
||||
sudo systemctl enable getty@tty1.service
|
||||
sudo systemctl enable sddm.service
|
||||
sudo systemctl daemon-reload
|
||||
|
||||
if systemctl is-enabled omarchy-seamless-login.service >/dev/null 2>&1; then
|
||||
echo -e "\033[31mError: omarchy-seamless-login.service is still enabled\033[0m" >&2
|
||||
error_exit
|
||||
fi
|
||||
|
||||
if systemctl is-masked plymouth-quit-wait.service >/dev/null 2>&1; then
|
||||
echo -e "\033[31mError: plymouth-quit-wait.service is still masked\033[0m" >&2
|
||||
error_exit
|
||||
fi
|
||||
|
||||
if ! systemctl is-enabled getty@tty1.service >/dev/null 2>&1; then
|
||||
echo -e "\033[31mError: getty@tty1.service is not enabled\033[0m" >&2
|
||||
error_exit
|
||||
fi
|
||||
|
||||
if ! systemctl is-enabled sddm.service >/dev/null 2>&1; then
|
||||
echo -e "\033[31mError: sddm.service is not enabled\033[0m" >&2
|
||||
error_exit
|
||||
fi
|
||||
|
||||
sudo rm -f /usr/local/bin/seamless-login
|
||||
sudo rm -f /etc/systemd/system/plymouth-quit.service.d/wait-for-graphical.conf
|
||||
sudo rm -f /etc/systemd/system/omarchy-seamless-login.service
|
||||
|
||||
echo "Migration completed successfully"
|
||||
38
migrations/1758487662_move_to_custom_uki.sh
Normal file
38
migrations/1758487662_move_to_custom_uki.sh
Normal file
@@ -0,0 +1,38 @@
|
||||
echo "Update UKI to custom named entry"
|
||||
|
||||
if command -v limine &>/dev/null && [[ -f /etc/default/limine ]]; then
|
||||
if grep -q "^ENABLE_UKI=yes" /etc/default/limine; then
|
||||
if ! grep -q "^CUSTOM_UKI_NAME=" /etc/default/limine; then
|
||||
sudo sed -i '/^ENABLE_UKI=yes/a CUSTOM_UKI_NAME="omarchy"' /etc/default/limine
|
||||
fi
|
||||
|
||||
# Remove the archinstall-created Limine entry
|
||||
while IFS= read -r bootnum; do
|
||||
sudo efibootmgr -b "$bootnum" -B >/dev/null 2>&1
|
||||
done < <(efibootmgr | grep -E "^Boot[0-9]{4}\*? Arch Linux Limine" | sed 's/^Boot\([0-9]\{4\}\).*/\1/')
|
||||
|
||||
sudo limine-update
|
||||
|
||||
uki_file=$(find /boot/EFI/Linux/ -name "omarchy*.efi" -printf "%f\n" 2>/dev/null | head -1)
|
||||
|
||||
if [[ -n "$uki_file" ]]; then
|
||||
while IFS= read -r bootnum; do
|
||||
sudo efibootmgr -b "$bootnum" -B >/dev/null 2>&1
|
||||
done < <(efibootmgr | grep -E "^Boot[0-9]{4}\*? Omarchy" | sed 's/^Boot\([0-9]\{4\}\).*/\1/')
|
||||
|
||||
# Skip EFI entry creation on Apple hardware
|
||||
if ! cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "Apple"; then
|
||||
sudo efibootmgr --create \
|
||||
--disk "$(findmnt -n -o SOURCE /boot | sed 's/p\?[0-9]*$//')" \
|
||||
--part "$(findmnt -n -o SOURCE /boot | grep -o 'p\?[0-9]*$' | sed 's/^p//')" \
|
||||
--label "Omarchy" \
|
||||
--loader "\\EFI\\Linux\\$uki_file"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
echo "Not using UKI. Not making any changes."
|
||||
fi
|
||||
else
|
||||
echo "Boot config is non-standard. Not making any changes."
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user