diff --git a/config-root.yaml b/config-root.yaml index f4b22ec..ec20ac8 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -104,6 +104,12 @@ dotfiles: f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf + d_mkinitcpio.d: + src: etc/mkinitcpio.d + dst: /etc/mkinitcpio.d + f_cmdline: + src: etc/kernel/cmdline + dst: /etc/kernel/cmdline profiles: Network: dotfiles: @@ -138,6 +144,8 @@ profiles: - f_20-quiet-printk.conf - f_system.conf - f_cpupower + - d_mkinitcpio.d + - f_cmdline include: - Locale - Pacman @@ -165,4 +173,4 @@ profiles: - Pacman mko-laptop: dotfiles: - - f_cpupower + - f_cpupower diff --git a/root/boot/loader/entries/arch-busybox.conf b/root/boot/loader/entries/arch-busybox.conf deleted file mode 100755 index db073af..0000000 --- a/root/boot/loader/entries/arch-busybox.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Arch Linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -linux /vmlinuz-linux -options 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 cpuidle.governor=teo diff --git a/root/boot/loader/entries/arch-systemd.conf b/root/boot/loader/entries/arch-systemd.conf deleted file mode 100755 index 3592520..0000000 --- a/root/boot/loader/entries/arch-systemd.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Arch Linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -linux /vmlinuz-linux -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline new file mode 100644 index 0000000..7a76f4e --- /dev/null +++ b/root/etc/kernel/cmdline @@ -0,0 +1 @@ +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 diff --git a/root/etc/mkinitcpio.d/linux-lts.preset b/root/etc/mkinitcpio.d/linux-lts.preset new file mode 100644 index 0000000..f053323 --- /dev/null +++ b/root/etc/mkinitcpio.d/linux-lts.preset @@ -0,0 +1,13 @@ +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-lts" +ALL_microcode=(/boot/*-ucode.img) + +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" +fallback_options="-S autodetect --splash /usr/share/systemd/bootctl/splash-arch.bmp" diff --git a/root/etc/mkinitcpio.d/linux.preset b/root/etc/mkinitcpio.d/linux.preset new file mode 100644 index 0000000..4f1f69d --- /dev/null +++ b/root/etc/mkinitcpio.d/linux.preset @@ -0,0 +1,13 @@ +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux" +ALL_microcode=(/boot/*-ucode.img) + +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" +fallback_options="-S autodetect --splash /usr/share/systemd/bootctl/splash-arch.bmp"