From 87b86ee8e09db888e5ec5c0f6b2145807efb88ad Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sat, 29 Jun 2024 12:29:42 +0300
Subject: [PATCH] Switch away from cachyos repositories and build packages for
 non-native targets

This is because shire doesn't support newer x86 instruction sets
---
 config-root.toml                           |  6 ------
 home/.config/pacman/makepkg.conf           |  4 ++--
 root/etc/mkinitcpio.d/linux-cachyos.preset |  7 -------
 root/etc/pacman.conf                       | 16 ----------------
 4 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 root/etc/mkinitcpio.d/linux-cachyos.preset

diff --git a/config-root.toml b/config-root.toml
index 18c9c38..04a8fd2 100644
--- a/config-root.toml
+++ b/config-root.toml
@@ -143,10 +143,6 @@ dst = "/etc/pacserve/pacserve.service.conf"
 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_cmdline]
 src = "etc/kernel/cmdline"
 dst = "/etc/kernel/cmdline"
@@ -196,7 +192,6 @@ dotfiles = [
   "f_logind.conf",
   "f_mkinitcpio.conf",
   "f_mkinitcpio_linux.preset",
-  "f_mkinitcpio_linux-cachyos.preset",
   "f_plymouthd.conf",
   "f_sshd_config",
   "f_system.conf",
@@ -239,7 +234,6 @@ dotfiles = [
   "f_adb.service",
   "f_mkinitcpio.conf",
   "f_mkinitcpio_linux.preset",
-  "f_mkinitcpio_linux-cachyos.preset",
   "f_plymouthd.conf",
   "f_sshd_config",
   "f_flexo.toml",
diff --git a/home/.config/pacman/makepkg.conf b/home/.config/pacman/makepkg.conf
index 0e01401..027c928 100644
--- a/home/.config/pacman/makepkg.conf
+++ b/home/.config/pacman/makepkg.conf
@@ -16,9 +16,9 @@ CARCH="x86_64"
 CHOST="x86_64-pc-linux-gnu"
 
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
+#CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
 CXXFLAGS="${CFLAGS}"
-RUSTFLAGS="-C opt-level=3 -C target-cpu=native"
+#RUSTFLAGS="-C opt-level=3 -C target-cpu=native"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 MAKEFLAGS="-j$(nproc)"
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
diff --git a/root/etc/mkinitcpio.d/linux-cachyos.preset b/root/etc/mkinitcpio.d/linux-cachyos.preset
deleted file mode 100644
index a5aaab2..0000000
--- a/root/etc/mkinitcpio.d/linux-cachyos.preset
+++ /dev/null
@@ -1,7 +0,0 @@
-PRESETS=('default')
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux-cachyos"
-
-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 569afd7..249cd2a 100755
--- a/root/etc/pacman.conf
+++ b/root/etc/pacman.conf
@@ -13,22 +13,6 @@ CleanMethod=KeepCurrent
 CacheDir= /var/www/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-core-v3]
-Include = /etc/pacman.d/pacserve
-Include = /etc/pacman.d/cachyos-v3-mirrorlist
-
-[cachyos-extra-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
-
 [core]
 Include = /etc/pacman.d/pacserve
 Include = /etc/pacman.d/mirrorlist