From b238f54ca359beffc542904b6d3af470ef730dab Mon Sep 17 00:00:00 2001
From: Tri Vo Khac <33442340+vokhactri@users.noreply.github.com>
Date: Tue, 15 Apr 2025 15:22:57 +0700
Subject: [PATCH] feat: update zsh aliases and options for improved
 functionality

- Modify `ls` and `la` aliases for better compatibility with `lsd`
- Add `gs` alias for a concise git status command
- Reinstate history settings in zsh options for consistent behavior
- Ensure history management options are clearly defined
---
 zsh/.config/zsh/.zshrc           | 1 -
 zsh/.config/zsh/snippets/aliases | 6 +++---
 zsh/.config/zsh/snippets/options | 9 +++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index df26069..50fdf08 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -36,4 +36,3 @@ zinit is-snippet id-as for \
     $ZDOTDIR/snippets/aliases \
     $ZDOTDIR/snippets/options \
     $ZDOTDIR/snippets/bin
-
diff --git a/zsh/.config/zsh/snippets/aliases b/zsh/.config/zsh/snippets/aliases
index 81129f2..76d3a99 100644
--- a/zsh/.config/zsh/snippets/aliases
+++ b/zsh/.config/zsh/snippets/aliases
@@ -2,15 +2,15 @@
 
 # Modern alternatives to traditional commands
 alias cat='bat'
-alias ls='lsd'
-alias ll='lsd -l'
-alias la='lsd -la'
+alias ls='lsd -A'
+alias la='lsd -lA'
 alias tree='lsd --tree'
 alias nano='micro'
 alias fetch='fastfetch'
 
 # Git shortcuts
 alias g='git'
+alias gs='git status -sb'
 alias ga='git add'
 alias gc='git commit'
 alias gp='git push'
diff --git a/zsh/.config/zsh/snippets/options b/zsh/.config/zsh/snippets/options
index 5ac36a2..fba4995 100644
--- a/zsh/.config/zsh/snippets/options
+++ b/zsh/.config/zsh/snippets/options
@@ -8,11 +8,8 @@ setopt MENU_COMPLETE
 setopt EXTENDED_GLOB
 setopt INTERACTIVE_COMMENTS
 setopt APPEND_HISTORY
+setopt PUSHD_IGNORE_DUPS
 
-HISTFILE="${ZDOTDIR:-$HOME}/.zsh_history"
-HISTSIZE=5000000
-SAVEHIST=5000000
-HIST_STAMPS="dd.mm.yyyy"
 setopt BANG_HIST                 # Treat the '!' character specially during expansion.
 setopt EXTENDED_HISTORY          # Write the history file in the ":start:elapsed;command" format.
 setopt INC_APPEND_HISTORY        # Write to the history file immediately, not when the shell exits.
@@ -26,4 +23,8 @@ setopt HIST_SAVE_NO_DUPS         # Don't write duplicate entries in the history
 setopt HIST_REDUCE_BLANKS        # Remove superfluous blanks before recording entry.
 setopt HIST_VERIFY               # Don't execute immediately upon history expansion.
 
+HISTFILE="${ZDOTDIR:-$HOME}/.zsh_history"
+HISTSIZE=5000000
+SAVEHIST=5000000
+
 zstyle ':fzf-tab:complete:cd:*' fzf-preview 'lsd -1 --color=always --icon=always $realpath'