From 5c400f42ad42a64fe730cb042856b249c4d6bf9d Mon Sep 17 00:00:00 2001
From: myve <forge@myve.lan>
Date: Thu, 6 Aug 2026 08:48:01 +0000
Subject: [PATCH] Change systemd mkinitcpio hook back to udev if using the
 encrypt hook.

---
 arch.sh           | 19 +++++++++++++++++--
 functions/desktop |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/arch.sh b/arch.sh
index ee3ee4d..06ca92d 100755
--- a/arch.sh
+++ b/arch.sh
@@ -359,7 +359,13 @@ function encryptHook
 			# Pacman hook
 			install /dev/stdin /mnt/opt/local/hooks/mkinitcpio.conf <<- hook
 			#!/usr/bin/env bash
-			grep '^HOOKS' /etc/mkinitcpio.conf | sed -e "s/filesystems/zfs &/" -e "s/ fsck//" -e "s/block/& ${1}/" >/etc/mkinitcpio.conf.d/zz-hooks.conf
+			grep '^HOOKS' /etc/mkinitcpio.conf |\\
+			sed -e "s/filesystems/zfs &/" \\
+			    -e "s/ fsck//" \\
+			    -e "s/block/& ${1}/" \\
+			    -e "s/systemd/udev/" \\
+			    -e "s/sd-vconsole/consolefont/" \\
+			>/etc/mkinitcpio.conf.d/zz-hooks.conf
 
 			sed -e "s|%PKGBASE%|${linux_kernel}|g" \\
 			    -e "s/^fallback/#&/g" \\
@@ -372,7 +378,11 @@ function encryptHook
 			# Pacman hook
 			install /dev/stdin /mnt/opt/local/hooks/mkinitcpio.conf <<- hook
 			#!/usr/bin/env bash
-			grep '^HOOKS' /etc/mkinitcpio.conf | sed "s/block/& ${1}/" >/etc/mkinitcpio.conf.d/zz-hooks.conf
+			grep '^HOOKS' /etc/mkinitcpio.conf |\\
+			sed -e "s/block/& ${1}/" \\
+			    -e "s/systemd/udev/" \\
+			    -e "s/sd-vconsole/consolefont/" \\
+			>/etc/mkinitcpio.conf.d/zz-hooks.conf
 
 			sed -e "s|%PKGBASE%|${linux_kernel}|g" \\
 			    -e "s/^fallback/#&/g" \\
@@ -382,6 +392,11 @@ function encryptHook
 		;;
 	esac
 
+	# Remove systemd hook
+	sed -e "s/systemd/udev/" \
+		-e "s/sd-vconsole/consolefont/" \
+		-i /mnt/etc/mkinitcpio.conf.d/zz-hooks.conf
+
 	cat >/mnt/etc/pacman.d/hooks/85-mkinitcpio.hook <<- mkinitcpio
 	[Trigger]
 	Operation = Install
diff --git a/functions/desktop b/functions/desktop
index f9b5510..7935d64 100755
--- a/functions/desktop
+++ b/functions/desktop
@@ -550,7 +550,7 @@ case ${desktop_choice} in
 		swayidle
 
 		# Config
-		curl --silent --fail https://raw.githubusercontent.com/hyprwm/Hyprland/refs/heads/main/example/hyprland.conf |\
+		curl --silent --fail https://raw.githubusercontent.com/hyprwm/Hyprland/refs/heads/main/example/hyprland.lua |\
 		sed -e '/Autostart/i exec-once = /usr/lib/polkit-kde-authentication-agent-1' \
 			-e '/Autostart/i exec-once = waybar -c ~/.config/waybar/waybar.conf' \
 			-e '/Autostart/i exec-once = ~/.config/hypr/scripts/sleep.sh' \