diff --git a/zshrc.d/.env.zsh b/zshrc.d/.env.zsh
index 4223f35..9972e97 100644
--- a/zshrc.d/.env.zsh
+++ b/zshrc.d/.env.zsh
@@ -1,3 +1,11 @@
+# Configure history
+setopt APPEND_HISTORY
+setopt EXTENDED_HISTORY
+setopt HIST_FIND_NO_DUPS
+setopt HIST_SAVE_NO_DUPS
+setopt INC_APPEND_HISTORY
+setopt INC_APPEND_HISTORY_TIME
+
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 export TERM="xterm-256color"
diff --git a/zshrc.d/lib/aliases.sh b/zshrc.d/lib/aliases.sh
index 03ea491..c22821d 100644
--- a/zshrc.d/lib/aliases.sh
+++ b/zshrc.d/lib/aliases.sh
@@ -1,7 +1,13 @@
-alias up="vagrant up && vagrant ssh"
-alias stayawake="caffeinate -s -d -i"
 alias emacs="emacs -nw"
+
+# macOS
+alias stayawake="caffeinate -s -d -i"
+alias clear-dns="sudo dscacheutil -flushcache || sudo killall -HUP mDNSResponder"
+
+# History
+alias reload-history="fc -Ri"
+
+# Docker
 alias docker-login="aws ecr get-login --no-include-email --region us-east-1 | sh"
 alias docker-start="open --background /Applications/Docker.app"
-alias clear-dns="sudo dscacheutil -flushcache || sudo killall -HUP mDNSResponder"
 alias docker-top='watch -n 1 "clear && docker top $1"'