From b78814d8a7e72a4088c4171bf5691806c3588fe9 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Thu, 27 Mar 2025 14:26:59 -0500
Subject: [PATCH] Update Shire configs after new Arch install

---
 config-root.toml         |  7 ++++++-
 root/etc/kernel/cmdline  |  2 +-
 root/etc/mkinitcpio.conf |  2 +-
 root/etc/pacman.conf     | 13 -------------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/config-root.toml b/config-root.toml
index 04a8fd24..2d1615d6 100644
--- a/config-root.toml
+++ b/config-root.toml
@@ -1,3 +1,6 @@
+[actions]
+mkinitcpio = "mkinitcpio -P"
+
 [config]
 backup = true
 banner = true
@@ -118,6 +121,7 @@ dst = "/.ignore"
 [dotfiles."f_mkinitcpio.conf"]
 src = "etc/mkinitcpio.conf"
 dst = "/etc/mkinitcpio.conf"
+actions = ["mkinitcpio"]
 
 [dotfiles."f_vconsole.conf"]
 src = "etc/vconsole.conf"
@@ -146,6 +150,7 @@ dst = "/etc/mkinitcpio.d/linux.preset"
 [dotfiles.f_cmdline]
 src = "etc/kernel/cmdline"
 dst = "/etc/kernel/cmdline"
+actions = ["mkinitcpio"]
 
 [dotfiles."f_timesyncd.conf"]
 src = "etc/systemd/timesyncd.conf"
@@ -222,7 +227,7 @@ dotfiles = [
   "f_sshd_config",
   "f_system.conf",
 ]
-include = ["Locale"]
+include = ["Locale", "Pacman"]
 
 [profiles.Moria]
 include = ["Locale", "Pacman"]
diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline
index ed9106e0..decce6e3 100644
--- a/root/etc/kernel/cmdline
+++ b/root/etc/kernel/cmdline
@@ -3,5 +3,5 @@ cryptdevice=UUID=ddc8cabe-f726-4287-8407-3a0323ec6037:cryptroot:allow-discards r
 {%@@ elif profile == "Moria" @@%}
 cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3
 {%@@ elif profile == "Shire" @@%}
-cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot resume=/dev/mapper/cryptroot resume_offset=1908736 intel_idle.max_cstate=1 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3
+cryptdevice=UUID=8898d32c-d150-4258-ad0f-96b5afca4718:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root resume_offset=2106624 intel_idle.max_cstate=1 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3
 {%@@ endif @@%}
diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf
index 487401ca..546045a8 100644
--- a/root/etc/mkinitcpio.conf
+++ b/root/etc/mkinitcpio.conf
@@ -16,5 +16,5 @@ HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesy
 {%@@ elif profile == 'Moria' @@%}
 HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck)
 {%@@ elif profile == 'Shire' @@%}
-HOOKS=(base udev kms keyboard keymap autodetect microcode modconf block unl0kr encrypt plymouth filesystems resume fsck)
+HOOKS=(base udev kms keyboard keymap autodetect microcode modconf block bluetooth unl0kr encrypt plymouth filesystems resume fsck)
 {%@@ endif @@%}
diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf
index 249cd2a9..3fd79bdd 100755
--- a/root/etc/pacman.conf
+++ b/root/etc/pacman.conf
@@ -8,10 +8,6 @@ SigLevel = Required DatabaseOptional
 Architecture = auto
 LocalFileSigLevel = Optional
 CacheDir = /var/cache/pacman/pkg
-{%@@ if profile == "Moria" @@%}
-CleanMethod=KeepCurrent
-CacheDir= /var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64
-{%@@ endif @@%}
 
 [core]
 Include = /etc/pacman.d/pacserve
@@ -24,12 +20,3 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/pacserve
 Include = /etc/pacman.d/mirrorlist
-
-[korhonen_aur]
-{%@@ if profile == "Moria" @@%}
-Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch
-{%@@ else @@%}
-Include = /etc/pacman.d/pacserve
-Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch
-{%@@ endif @@%}
-