diff --git a/README.md b/README.md
index d3585e9..baea98a 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,24 @@ which was used to test out using fish as my login shell before committing.
 
 ## First-Time Setup
 
+### GPG makes me want to toss the computer out the window
+
+```fish
+gpg --full-gen-key
+# kind of key: 4
+# key size: 4096
+# expiration: 0 && y
+# real name: punkfairie
+# email: 23287005+punkfairie@users.noreply.github.com
+
+sudo -k
+chown -R (whoami) "$HOME/.gnupg/"
+find "$HOME/.gnupg" -type f -exec chmod 600 {} \;
+find "$HOME/.gnupg" -type d -exec chmod 700 {} \;
+
+chezmoi init --apply punkfairie
+```
+
 ### Arch
 
 ```fish
@@ -25,14 +43,15 @@ cd ..
 rm -rf yay-bin
 
 yay -Syu
-yay -S --needed - < ~/.config/packages/<list>
+yay -S --needed - < ~/.config/packages/arch
+
+gpg --armor --export (get-gpg-key) | copyq copy -
 ```
 
-Make sure to edit the list first (copy and rename to current hostname) if needed
-to remove unneeded GPU drivers!
-
 ### General
 
+Go to <https://github.com/settings/keys> and add the copied key to your account.
+
 ```fish
 volta install node
 topgrade
@@ -62,40 +81,3 @@ cd tty
 Edit `/etc/default/grub` and append copied content to `GRUB_CMDLINE_LINUX`.
 
 `sudo grub-mkconfig -o /boot/grub/grub.cfg`
-
-## How to setup GPG because it makes me want to toss the computer out the window
-
-```fish
-gpg --full-gen-key
-# kind of key: 4
-# key size: 4096
-# expiration: 0 && y
-# real name: punkfairie
-# email: 23287005+punkfairie@users.noreply.github.com
-
-sudo -k
-chown -R (whoami) "$HOME/.gnupg/"
-find "$HOME/.gnupg" -type f -exec chmod 600 {} \;
-find "$HOME/.gnupg" -type d -exec chmod 700 {} \;
-
-set key (\
-    gpg --list-secret-keys --keyid-format SHORT\
-    | grep 'rsa4096'\
-    | sed 's/sec   rsa4096\///'\
-    | awk '{print $1}'\
-)
-copyq copy "$key"
-```
-
-```toml
-# ~/.config/chezmoi/chezmoi.toml
-
-[data]
-gpgKey = # PASTE HERE
-```
-
-```fish
-gpg --armor --export $key | copyq copy -
-```
-
-Go to <https://github.com/settings/keys> and add the copied key to your account.
diff --git a/tags b/tags
index b60f798..6acc5f0 100644
--- a/tags
+++ b/tags
@@ -87,10 +87,10 @@ Copy mode	dot_config/tmux/tmux.conf	/^bind -T copy-mode-vi -N 'Copy mode: switch
 Copy mode	dot_config/tmux/tmux.conf	/^bind -T copy-mode-vn -N 'Copy mode: Switch to pane (right)' C-l if-shell "${IS_VIM} || ${IS_FZF}/;"	k
 Copy mode	dot_config/tmux/tmux.conf	/^bind -T copy-mode-vn -N 'Copy mode: Switch to pane (up)'    C-k if-shell "${IS_VIM} || ${IS_FZF}/;"	k
 First-Time Setup	README.md	/^## First-Time Setup$/;"	s	chapter:mar does dotfiles
+GPG makes me want to toss the computer out the window	README.md	/^### GPG makes me want to toss the computer out the window$/;"	S	section:mar does dotfiles""First-Time Setup
 GRUB	README.md	/^### GRUB$/;"	S	section:mar does dotfiles""Themes
 General	README.md	/^### General$/;"	S	section:mar does dotfiles""First-Time Setup
 General	dot_config/openrazer/razer.conf	/^[General]$/;"	s
-How to setup GPG because it makes me want to toss the computer out the window	README.md	/^## How to setup GPG because it makes me want to toss the computer out the window$/;"	s	chapter:mar does dotfiles
 IO2049F50104914	dot_config/openrazer/persistence.conf	/^[IO2049F50104914]$/;"	s
 IS_FZF	dot_config/tmux/tmux.conf	/^IS_FZF="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\\\S+\\\\\/)?fzf$'"$/;"	k
 IS_VIM	dot_config/tmux/tmux.conf	/^IS_VIM="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\\\S+\\\\\/)?g?(view|n?/;"	k