diff --git a/zshenv b/zshenv
index 97fda03..e8b94eb 100644
--- a/zshenv
+++ b/zshenv
@@ -8,9 +8,6 @@ fpath+=(~/.zsh/completions)
 # Setup cargo
 [[ -s ~/.cargo/env ]] && source ~/.cargo/env
 
-# Source machine-specific environment
-[[ -s ~/.zshenv.local ]] && source ~/.zshenv.local
-
 # Local gems
 if (( $+commands[ruby] )); then
   local gem_bin_path="$(ruby -r rubygems -e 'puts Gem.user_dir')/bin"
diff --git a/zshrc b/zshrc
index 2eabaa3..5907c49 100644
--- a/zshrc
+++ b/zshrc
@@ -1,6 +1,9 @@
 # Option adjustments
 unsetopt nomatch
 
+# Swap CAPSLOCK and ESC
+setxkbmap -option caps:swapescape
+
 # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
 # Initialization code that may require console input (password prompts, [y/n]
 # confirmations, etc.) must go above this block; everything else may go below.