diff --git a/.chezmoidata/arch-packages.toml b/.chezmoidata/arch-packages.toml
new file mode 100644
index 0000000..e4b40f8
--- /dev/null
+++ b/.chezmoidata/arch-packages.toml
@@ -0,0 +1,16 @@
+[packages.arch]
+exclude = [
+  "amd-ucode",
+  "lib32-gamemode",
+  "lib32-vkd3d",
+  "libva-mesa-driver",
+  "vkd3d",
+  "vulkan-radeon",
+  "vulkan-tools",
+  "xf86-video-amdgpu",
+  "libva-nvidia-driver-git",
+  "nvidia",
+  "nvidia-settings",
+  "xf86-video-nouveau",
+  "steamlink",
+]
diff --git a/dot_config/packages/archgirlie b/dot_config/packages/archgirlie
index 5cf95f0..4366908 100644
--- a/dot_config/packages/archgirlie
+++ b/dot_config/packages/archgirlie
@@ -16,8 +16,13 @@ bluez-utils
 browsh-bin
 btop
 catppuccin-cursors-macchiato
+catppuccin-frappe-grub-theme-git
 catppuccin-gtk-theme-macchiato
+catppuccin-latte-grub-theme-git
+catppuccin-macchiato-grub-theme-git
+catppuccin-mocha-grub-theme-git
 cheat-bin
+chezmoi
 cmake
 colord
 composer
@@ -64,6 +69,7 @@ libheif
 libmythes
 libreoffice-fresh
 libtransmission
+libva-nvidia-driver-git
 linux
 linux-firmware
 linux-firmware-qlogic
@@ -92,6 +98,8 @@ networkmanager
 nginx
 nm-connection-editor
 ntfs-3g
+nvidia
+nvidia-settings
 openrazer-daemon
 pamixer
 papirus-folders-catppuccin-git
@@ -117,7 +125,6 @@ python-pipenv
 python-pipx
 python-pynvim
 qt5-graphicaleffects
-qt5-quickcontrols2
 qt5-svg
 qt5ct
 qt6-wayland
@@ -131,6 +138,7 @@ rofi-calc
 rsync
 rust
 sddm
+sddm-theme-catppuccin-git
 shfmt
 smbclient
 starship
@@ -173,6 +181,7 @@ xclip
 xdg-desktop-portal
 xdg-desktop-portal-gtk
 xdg-desktop-portal-hyprland
+xf86-video-nouveau
 xfce4-settings
 xorg-server
 xorg-server-xephyr
diff --git a/dot_config/packages/run_onchange_after_arch-packages.fish.tmpl b/dot_config/packages/run_onchange_after_arch-packages.fish.tmpl
new file mode 100644
index 0000000..6690486
--- /dev/null
+++ b/dot_config/packages/run_onchange_after_arch-packages.fish.tmpl
@@ -0,0 +1,27 @@
+{{ if eq .chezmoi.osRelease.id "arch" -}}
+#!/usr/bin/env fish
+
+{{ range (glob ".config/packages/arch?*") -}}
+# {{ include (joinPath "dot_config/packages/" (base .)) | sha256sum }}
+{{ end -}}
+
+set file (\
+  find . -type f -iname "arch*" -print0\
+  | xargs -0 ls -tr\
+  | tail -n 1\
+  | string sub -s 3\
+)
+
+cp $file arch
+
+{{ range .packages.arch.exclude -}}
+sed -i '/{{ . }}/d' arch
+{{ end -}}
+
+if ! test "{{ .chezmoi.hostname }}" = "$file"
+    set_color yellow && echo "Package list has changed, please reinstall!"
+    copyq copy "yay -S --needed - < ~/.config/packages/arch" &>/dev/null \
+        && echo "(Command copied)"
+    set_color normal
+end
+{{ end -}}
diff --git a/dot_config/topgrade.d/01-commands.toml.tmpl b/dot_config/topgrade.d/01-commands.toml.tmpl
index fe814c2..bf3ebb3 100644
--- a/dot_config/topgrade.d/01-commands.toml.tmpl
+++ b/dot_config/topgrade.d/01-commands.toml.tmpl
@@ -11,4 +11,4 @@
 # Custom commands
 [commands]
 "Fish Shell Completions" = "fish_update_completions"
-"Update package list" = "yay -Qeq > ~/.config/packages/{{ .chezmoi.hostname }} && set_color green && printf '%s'  && set_color normal && printf '%s' ' done\n'"
+"Update package list" = "yay -Qeq > {{ joinPath .chezmoi.sourceDir "dot_config/packages/" .chezmoi.hostname }} && set_color green && printf '%s'  && set_color normal && printf '%s' ' done\n'"