From 74f2900db1e8913e741b649e1b6114e7d7dcaec9 Mon Sep 17 00:00:00 2001 From: Stefan Gruendel Date: Tue, 23 Sep 2025 06:40:56 +0200 Subject: [PATCH 1/6] Add thunderbolt module in omarchy hook. --- install/login/limine-snapper.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/login/limine-snapper.sh b/install/login/limine-snapper.sh index 2d9dc292..d2bdd5ae 100644 --- a/install/login/limine-snapper.sh +++ b/install/login/limine-snapper.sh @@ -1,5 +1,6 @@ if command -v limine &>/dev/null; then sudo tee /etc/mkinitcpio.conf.d/omarchy_hooks.conf </dev/null +MODULES=(thunderbolt) HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs) EOF From e39269f9f0c961413fee13851b3cee8ad38a6ccd Mon Sep 17 00:00:00 2001 From: Stefan Gruendel Date: Tue, 23 Sep 2025 20:52:17 +0200 Subject: [PATCH 2/6] add migration script --- migrations/1758455816.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 migrations/1758455816.sh diff --git a/migrations/1758455816.sh b/migrations/1758455816.sh new file mode 100644 index 00000000..6a5aec2c --- /dev/null +++ b/migrations/1758455816.sh @@ -0,0 +1,24 @@ +echo "Adding thunderbolt module to mkinitcpio" + +OMARCHY_HOOKS="/etc/mkinitcpio.conf.d/omarchy_hooks.conf" +RUN_MKINITCPIO=false + +if ! grep -q '^MODULES=' $OMARCHY_HOOKS; then + # Add a new MODULES line with thunderbolt + sudo sed -i '1iMODULES=(thunderbolt)' $OMARCHY_HOOKS + RUN_MKINITCPIO=true +elif grep -q '^MODULES=' $OMARCHY_HOOKS && ! grep -qE "^MODULES=.*(\bthunderbolt\b)" $OMARCHY_HOOKS; then + # Add thunderbolt inside the existing MODULES=(...) list (before the closing paren) + sudo sed -i -E "s/^(MODULES=\([^)]*)\)/\1 thunderbolt)/" $OMARCHY_HOOKS + RUN_MKINITCPIO=true +fi + +if [ "$RUN_MKINITCPIO" = true ]; then + echo "Regenerating initramfs with thunderbolt module included" + # From omarchy-refresh-plymouth + if command -v limine-mkinitcpio &>/dev/null; then + sudo limine-mkinitcpio + else + sudo mkinitcpio -P + fi +fi \ No newline at end of file From d6dc1c7b86c1b7ea06b32b521b9e2084e28cd433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Gr=C3=BCndel?= Date: Sat, 27 Sep 2025 13:55:46 +0200 Subject: [PATCH 3/6] add bolt to omarchy base packages --- install/omarchy-base.packages | 1 + 1 file changed, 1 insertion(+) diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages index 7d408e22..99d7f0c3 100644 --- a/install/omarchy-base.packages +++ b/install/omarchy-base.packages @@ -9,6 +9,7 @@ avahi bash-completion bat blueberry +bolt brightnessctl btop cargo From 0a9e7205c34e90551a7027a68df48c6482e99ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Gr=C3=BCndel?= Date: Mon, 1 Dec 2025 13:34:24 +0100 Subject: [PATCH 4/6] add bolt to omarchy base packages --- install/omarchy-base.packages | 1 + 1 file changed, 1 insertion(+) diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages index 8a55e7d0..52bb44c5 100644 --- a/install/omarchy-base.packages +++ b/install/omarchy-base.packages @@ -9,6 +9,7 @@ avahi bash-completion bat bluetui +bolt brightnessctl btop clang From 457b954db58490109bc7f69f8b06613becd72f84 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sun, 14 Dec 2025 15:19:25 -0500 Subject: [PATCH 5/6] Move module to a separate file --- install/login/limine-snapper.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install/login/limine-snapper.sh b/install/login/limine-snapper.sh index 917d6cdc..8ea46e90 100644 --- a/install/login/limine-snapper.sh +++ b/install/login/limine-snapper.sh @@ -2,8 +2,10 @@ if command -v limine &>/dev/null; then sudo pacman -S --noconfirm --needed limine-snapper-sync limine-mkinitcpio-hook sudo tee /etc/mkinitcpio.conf.d/omarchy_hooks.conf </dev/null -MODULES=(thunderbolt) HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs) +EOF + sudo tee /etc/mkinitcpio.conf.d/thunderbolt_module.conf </dev/null +MODULES+=(thunderbolt) EOF [[ -f /boot/EFI/limine/limine.conf ]] || [[ -f /boot/EFI/BOOT/limine.conf ]] && EFI=true From 906baa8fee6bc33d9fb5fe20b99a3ebca2d8dbe8 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sun, 14 Dec 2025 15:19:35 -0500 Subject: [PATCH 6/6] Rework migration --- migrations/1758455816.sh | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/migrations/1758455816.sh b/migrations/1758455816.sh index 6a5aec2c..e9114e1b 100644 --- a/migrations/1758455816.sh +++ b/migrations/1758455816.sh @@ -1,24 +1,11 @@ -echo "Adding thunderbolt module to mkinitcpio" +echo "Add thunderbolt support to boot image" -OMARCHY_HOOKS="/etc/mkinitcpio.conf.d/omarchy_hooks.conf" -RUN_MKINITCPIO=false +omarchy-pkg-add bolt -if ! grep -q '^MODULES=' $OMARCHY_HOOKS; then - # Add a new MODULES line with thunderbolt - sudo sed -i '1iMODULES=(thunderbolt)' $OMARCHY_HOOKS - RUN_MKINITCPIO=true -elif grep -q '^MODULES=' $OMARCHY_HOOKS && ! grep -qE "^MODULES=.*(\bthunderbolt\b)" $OMARCHY_HOOKS; then - # Add thunderbolt inside the existing MODULES=(...) list (before the closing paren) - sudo sed -i -E "s/^(MODULES=\([^)]*)\)/\1 thunderbolt)/" $OMARCHY_HOOKS - RUN_MKINITCPIO=true +if [[ ! -f /etc/mkinitcpio.conf.d/thunderbolt_module.conf ]]; then + sudo tee /etc/mkinitcpio.conf.d/thunderbolt_module.conf </dev/null +MODULES+=(thunderbolt) +EOF fi -if [ "$RUN_MKINITCPIO" = true ]; then - echo "Regenerating initramfs with thunderbolt module included" - # From omarchy-refresh-plymouth - if command -v limine-mkinitcpio &>/dev/null; then - sudo limine-mkinitcpio - else - sudo mkinitcpio -P - fi -fi \ No newline at end of file +sudo limine-update