From 9256c0352c88feeca4770b6348f16fca9701d00c Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Thu, 16 Mar 2023 18:32:07 +0200
Subject: [PATCH] Add cachyos repos and kernel

---
 config-root.toml                           | 20 +++++++++++++++-----
 root/etc/mkinitcpio.d/linux-cachyos.preset |  8 ++++++++
 root/etc/pacman.conf                       |  8 ++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 root/etc/mkinitcpio.d/linux-cachyos.preset

diff --git a/config-root.toml b/config-root.toml
index 7a661ce6..85934aad 100644
--- a/config-root.toml
+++ b/config-root.toml
@@ -143,9 +143,17 @@ dst = "/etc/default/cpupower"
 src = "etc/pacserve/pacserve.service.conf"
 dst = "/etc/pacserve/pacserve.service.conf"
 
-[dotfiles."d_mkinitcpio.d"]
-src = "etc/mkinitcpio.d"
-dst = "/etc/mkinitcpio.d"
+[dotfiles."f_mkinitcpio_linux.preset"]
+src = "etc/mkinitcpio.d/linux.preset"
+dst = "/etc/mkinitcpio.d/linux.preset"
+
+[dotfiles."f_mkinitcpio_linux-cachyos.preset"]
+src = "etc/mkinitcpio.d/linux-cachyos.preset"
+dst = "/etc/mkinitcpio.d/linux-cachyos.preset"
+
+[dotfiles."f_mkinitcpio_linux-zen.preset"]
+src = "etc/mkinitcpio.d/linux-zen.preset"
+dst = "/etc/mkinitcpio.d/linux-zen.preset"
 
 [dotfiles.f_cmdline]
 src = "etc/kernel/cmdline"
@@ -180,7 +188,6 @@ dotfiles = [
 [profiles.Mirkwood]
 dotfiles = [
   "d_bin",
-  "d_mkinitcpio.d",
   "f_20-quiet-printk.conf",
   "f_60-uinput-permissions.rules",
   "f_99-lowbat.rules",
@@ -195,6 +202,8 @@ dotfiles = [
   "f_ignore",
   "f_logind.conf",
   "f_mkinitcpio.conf",
+  "f_mkinitcpio_linux.preset",
+  "f_mkinitcpio_linux-cachyos.preset",
   "f_plymouthd.conf",
   "f_sshd_config",
   "f_system.conf",
@@ -206,12 +215,13 @@ include = ["Locale", "Pacman", "Network"]
 [profiles.Moria]
 include = ["Locale", "Pacman", "Network"]
 dotfiles = [
-  "d_mkinitcpio.d",
   "f_99-sysctl.conf",
   "f_cmdline",
   "f_cpupower",
   "f_doas.conf",
   "f_mkinitcpio.conf",
+  "f_mkinitcpio_linux.preset",
+  "f_mkinitcpio_linux-cachyos.preset",
   "f_plymouthd.conf",
   "f_sshd_config",
   "f_getty6conf",
diff --git a/root/etc/mkinitcpio.d/linux-cachyos.preset b/root/etc/mkinitcpio.d/linux-cachyos.preset
new file mode 100644
index 00000000..392ff60a
--- /dev/null
+++ b/root/etc/mkinitcpio.d/linux-cachyos.preset
@@ -0,0 +1,8 @@
+PRESETS=('default')
+
+ALL_config="/etc/mkinitcpio.conf"
+ALL_kver="/boot/vmlinuz-linux-cachyos"
+ALL_microcode=(/boot/*-ucode.img)
+
+default_image="/boot/initramfs-linux-cachyos.img"
+default_uki="/boot/EFI/Linux/archlinux-linux-cachyos.efi"
diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf
index 97733f89..aa238542 100755
--- a/root/etc/pacman.conf
+++ b/root/etc/pacman.conf
@@ -13,6 +13,14 @@ CleanMethod=KeepCurrent
 CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64
 {%@@ endif @@%}
 
+[cachyos-v3]
+Include = /etc/pacman.d/pacserve
+Include = /etc/pacman.d/cachyos-v3-mirrorlist
+
+[cachyos]
+Include = /etc/pacman.d/pacserve
+Include = /etc/pacman.d/cachyos-mirrorlist
+
 [korhonen_aur]
 {%@@ if profile == "Moria" @@%}
 Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch