diff --git a/.chezmoiscripts/run_before_00-chaotic-aur.sh.tmpl b/.chezmoiscripts/run_before_00-chaotic-aur.sh.tmpl
new file mode 100644
index 0000000..6e5bef5
--- /dev/null
+++ b/.chezmoiscripts/run_before_00-chaotic-aur.sh.tmpl
@@ -0,0 +1,11 @@
+{{ if eq .chezmoi.osRelease.id "arch" -}}
+#!/usr/bin/env bash
+
+pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
+pacman-key --lsign-key 3056513887B78AEB
+pacman -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst'
+pacman -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
+
+printf '%b' "[chaotic-aur]\bInclude = /etc/pacman.d/chaotic-mirrorlist"
+sudo pacman -Sy
+{{- end -}}
diff --git a/dot_config/packages/archbaby b/dot_config/packages/archbaby
index 4e6f3cb..56946f0 100644
--- a/dot_config/packages/archbaby
+++ b/dot_config/packages/archbaby
@@ -1,3 +1,4 @@
+ -> Avoid running yay as root/sudo.
 aic94xx-firmware
 alsa-utils
 amd-ucode
@@ -143,14 +144,12 @@ qt5-svg
 qt5ct
 qt6-wayland
 razercommander
-rbw
 re2c
 redis
 reflector
 ripgrep
 rofi
 rofi-calc
-rofi-rbw
 rsync
 rust
 sddm