From 95ca40885a4825956df46188000b566aefbfc277 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Fri, 27 Dec 2024 12:45:41 +0100
Subject: [PATCH] Fix history settings.

---
 config/zsh/.zshenv |  4 ----
 config/zsh/.zshrc  | 14 +++++++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/config/zsh/.zshenv b/config/zsh/.zshenv
index 209ab42..2f83654 100644
--- a/config/zsh/.zshenv
+++ b/config/zsh/.zshenv
@@ -6,11 +6,7 @@ export XDG_CONFIG_HOME="${HOME}/.config"
 export XDG_DATA_HOME="${HOME}/.local/share"
 export XDG_STATE_HOME="${HOME}/.local/state"
 export ZDOTDIR="${XDG_CONFIG_HOME}/zsh"
-export HISTFILE="${XDG_DATA_HOME}/zsh/history"
-export HISTSIZE=10000
-export SAVEHIST=$HISTSIZE
 
-rm -rf "${ZDOTDIR}/.zsh_history" && ln -sf "${XDG_DATA_HOME}/zsh/history" "${ZDOTDIR}/.zsh_history"
 # clean home - needs to be here for Docker Desktop
 export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker"
 export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc
index b530188..68f9997 100644
--- a/config/zsh/.zshrc
+++ b/config/zsh/.zshrc
@@ -9,13 +9,21 @@ fi
 mkdir -p "${XDG_CACHE_HOME}/zsh"
 mkdir -p "${XDG_DATA_HOME}/zsh"
 
-# global exports and options
+# history settings
 export HISTFILE="${XDG_DATA_HOME}/zsh/history"
+export HISTSIZE=10000
+export SAVEHIST=$HISTSIZE
+setopt EXTENDED_HISTORY
+setopt HIST_EXPIRE_DUPS_FIRST
+setopt HIST_FIND_NO_DUPS
 setopt HIST_IGNORE_ALL_DUPS
-setopt HIST_SAVE_NO_DUPS
+setopt HIST_IGNORE_DUPS
+setopt HIST_IGNORE_SPACE
 setopt HIST_REDUCE_BLANKS
-setopt SHARE_HISTORY
+setopt HIST_SAVE_NO_DUPS
 setopt INC_APPEND_HISTORY
+setopt SHARE_HISTORY
+rm -rf "${ZDOTDIR}/.zsh_history" && ln -sf "${XDG_DATA_HOME}/zsh/history" "${ZDOTDIR}/.zsh_history"
 
 # set path
 path=(~/.local/bin "${path[@]}")