diff --git a/tmux.conf b/tmux.conf
index df29f6f..a47e8b3 100755
--- a/tmux.conf
+++ b/tmux.conf
@@ -2,6 +2,7 @@ set -g default-terminal "screen-256color"
 set -g mouse on
 set -g set-clipboard external
 set -g escape-time 10 # https://www.johnhawthorn.com/2012/09/vi-escape-delays/
+set -g history-limit 10000
 set-option -g status-position top
 set-window-option -g allow-rename off
 set -g allow-rename off
diff --git a/zsh/zshrc b/zsh/zshrc
index 59ed118..868293c 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -5,3 +5,7 @@ then
   autoload -Uz compinit
   compinit
 fi
+
+setopt appendhistory # Append history to the history file (no overwriting)
+setopt incappendhistory # Immediately append to the history file, not just when a term is killed
+setopt histignoredups