diff --git a/git/git/config b/git/config
similarity index 100%
rename from git/git/config
rename to git/config
diff --git a/git/git/gitignore b/git/gitignore
similarity index 100%
rename from git/git/gitignore
rename to git/gitignore
diff --git a/scripts/install-pkg-arch.sh b/scripts/install-pkg-arch.sh
index 22042f7..ee1bfaf 100755
--- a/scripts/install-pkg-arch.sh
+++ b/scripts/install-pkg-arch.sh
@@ -32,10 +32,11 @@ yay -S --noconfirm --needed \
   nodejs \
   npm \
   nwg-look \
-  pcsc-controls \
+  pcsc-tools \
   starship \
   swaync \
   tmux \
+  yubikey-manger \
   zoxide \
   zsh
 
@@ -84,3 +85,6 @@ yay -S --noconfirm thunderbird
 
 # Text expander
 yay -S --noconfirm espanso-wayland-git
+
+# Yubikey support
+sudo sysetmctl enable --now pscsd.service
diff --git a/scripts/link-config b/scripts/link-config
new file mode 100755
index 0000000..b5adef0
--- /dev/null
+++ b/scripts/link-config
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+ln -sfv ~/.dotfiles/clipse ~/.config
+ln -sfv ~/.dotfiles/eza ~/.config
+ln -sfv ~/.dotfiles/ghostty ~/.config
+ln -sfv ~/.dotfiles/git ~/.config
+# TODO: Remove kitty.
+ln -sfv ~/.dotfiles/kitty ~/.config
+ln -sfv ~/.dotfiles/npm ~/.config
+ln -sfv ~/.dotfiles/nvim/lazynvim ~/.config
+ln -sfv ~/.dotfiles/starship ~/.config
+ln -sfv ~/.dotfiles/systemd ~/.config
+ln -sfv ~/.dotfiles/tree-sitter ~/.config
+ln -sfv ~/.dotfiles/walker ~/.config
+ln -sfv ~/.dotfiles/waybar ~/.config
+
+# Espanso
+espanso service stop
+rm -rf ~/.config/espanso >/dev/null 2>&1
+ln -sfV ~/.dotfiles/espanso ~/.config
+espanso service start
+
+# Hyprland
+rm -rf ~/.config/hypr >/dev/null 2>&1
+ln -sfv ~/.dotfiles/hypr ~/.config
+
+# GPG
+mkdir ~/.gnupg
+chmod 700 ~/.gnupg
+ln -sfv ~/.dotfiles/gpg/gpg-agent.conf ~/.gnupg/gpg-agent.conf
+ln -sfv ~/.dotfiles/gpg/gpg.conf ~/.gnupg/gpg.conf
+ln -sfv ~/.dotfiles/gpg/scdaemon.conf ~/.gnupg/scdaemon.conf
+
+# yazi
+mkdir ~/.config/yazi
+ln -sfv ~/.dotfiles/yazi/theme.toml ~/.config/yazi/theme.toml
+ln -sfv ~/.dotfiles/yazi/yazi.toml ~/.config/yazi/yazi.toml
+
+# tmux
+mkdir -p ~/.config/tmux/plugins
+ln -sfv ~/.dotfiles/tmux/tmux.conf ~/.config/tmux/tmux.conf
+
+# scripts
+mkdir -p ~/.local/share
+ln -sfv ~/.dotfiles/scripts/arch ~/.local/bin
+ln -sfv ~/.dotfiles/scripts/scripts ~/.local/share/scripts
+
+# zsh
+mkdir -p ~/.config/zsh/plugins
+ln -sfv ~/.dotfiles/zsh/.zshenv ~/.zshenv
+ln -sfv ~/.dotfiles/zsh/config/.zshenv ~/.config/zsh/.zshenv
+ln -sfv ~/.dotfiles/zsh/config/.zshrc ~/.config/zsh/.zshrc
+ln -sfv ~/.dotfiles/zsh/config/functions ~/.config/zsh/functions
+ln -sfv ~/.dotfiles/zsh/config/zsh-functions ~/.config/zsh/zsh-functions
+touch ~/.config/zsh/history
+chmod 600 ~/.config/zsh/history
+chsh -s $(which zsh)