diff --git a/aliases b/aliases
index 384e3a9..6a612d9 100644
--- a/aliases
+++ b/aliases
@@ -13,3 +13,6 @@ fi
 if [ -n "$DISPLAY" ] || [ -n "$WAYLAND_DISPLAY" ]; then
   alias open='xdg-open'
 fi
+
+alias vi='/usr/bin/vim'
+alias vim='/usr/bin/nvim'
diff --git a/bashrc b/bashrc
index 41e3289..318ff7e 100644
--- a/bashrc
+++ b/bashrc
@@ -1,3 +1,6 @@
+# Use gpg-agent for SSH (YubiKey support)
+export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+
 # Source prompt and aliases
 BASH_CONFIG_DIR="${BASH_SOURCE%/*}"
 source "$BASH_CONFIG_DIR/prompt"