From 865dad1de36dcbcc512bac43c97c0c9d7395d7b9 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 2 Nov 2022 16:07:33 +0200
Subject: [PATCH] Configure gdm and plymouth

---
 config-root.toml                       | 1 -
 home/etc/plymouth/plymouthd.conf       | 4 ++++
 root/etc/kernel/cmdline                | 2 +-
 root/etc/mkinitcpio.conf               | 2 +-
 root/etc/mkinitcpio.d/linux-lts.preset | 1 -
 root/etc/mkinitcpio.d/linux.preset     | 1 -
 6 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 home/etc/plymouth/plymouthd.conf

diff --git a/config-root.toml b/config-root.toml
index 59bfb0c7..698f0cec 100644
--- a/config-root.toml
+++ b/config-root.toml
@@ -188,7 +188,6 @@ dotfiles = [
   "f_doas.conf",
   "f_fonts.conf",
   "f_freetype2.sh",
-  "f_getty.conf",
   "f_ignore",
   "f_logind.conf",
   "f_mkinitcpio.conf",
diff --git a/home/etc/plymouth/plymouthd.conf b/home/etc/plymouth/plymouthd.conf
new file mode 100644
index 00000000..328ce5b5
--- /dev/null
+++ b/home/etc/plymouth/plymouthd.conf
@@ -0,0 +1,4 @@
+[Daemon]
+Theme=arch-logo-gnomish
+ShowDelay=0
+DeviceTimeout=8
diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline
index 31a5a75e..012af40d 100644
--- a/root/etc/kernel/cmdline
+++ b/root/etc/kernel/cmdline
@@ -1,5 +1,5 @@
 {%@@ if profile == "Mirkwood" @@%}
-cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait amdgpu.ppfeaturemask=0xffffffff bgrt_disable
+cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw idle=nomwait amdgpu.ppfeaturemask=0xffffffff quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3
 {%@@ elif profile == "Moria" @@%}
 cryptdevice=UUID=d99b4607-f836-4305-82f3-448a8ea7c1e6:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vga=current bgrt_disable video=HDMI-A-2:d video=HDMI-A-3:d
 {%@@ endif @@%}
diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf
index ce7a725e..a4fe8484 100644
--- a/root/etc/mkinitcpio.conf
+++ b/root/etc/mkinitcpio.conf
@@ -4,7 +4,7 @@ FILES=()
 
 {%@@ if profile == "Mirkwood" @@%}
 BINARIES=("/usr/bin/btrfs")
-HOOKS=(colors consolefont welcomemessage base udev keyboard autodetect modconf block filesystems btrfs encrypt fsck)
+HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs plymouth-encrypt fsck)
 
 {%@@ else @@%}
 BINARIES=()
diff --git a/root/etc/mkinitcpio.d/linux-lts.preset b/root/etc/mkinitcpio.d/linux-lts.preset
index f053323c..5f686d2a 100644
--- a/root/etc/mkinitcpio.d/linux-lts.preset
+++ b/root/etc/mkinitcpio.d/linux-lts.preset
@@ -6,7 +6,6 @@ PRESETS=('default' 'fallback')
 
 default_image="/boot/initramfs-linux-lts.img"
 default_efi_image="/boot/EFI/Linux/archlinux-linux-lts.efi"
-default_options="--splash /usr/share/systemd/bootctl/splash-arch.bmp"
 
 fallback_image="/boot/initramfs-linux-lts-fallback.img"
 fallback_efi_image="/boot/EFI/Linux/archlinux-linux-lts-fallback.efi"
diff --git a/root/etc/mkinitcpio.d/linux.preset b/root/etc/mkinitcpio.d/linux.preset
index 4f1f69d9..4533ef75 100644
--- a/root/etc/mkinitcpio.d/linux.preset
+++ b/root/etc/mkinitcpio.d/linux.preset
@@ -6,7 +6,6 @@ PRESETS=('default' 'fallback')
 
 default_image="/boot/initramfs-linux.img"
 default_efi_image="/boot/EFI/Linux/archlinux-linux.efi"
-default_options="--splash /usr/share/systemd/bootctl/splash-arch.bmp"
 
 fallback_image="/boot/initramfs-linux-fallback.img"
 fallback_efi_image="/boot/EFI/Linux/archlinux-linux-fallback.efi"