From 833ef8f70ed746c5b3e88dcc0831f712d78ec7d4 Mon Sep 17 00:00:00 2001
From: Tri Vo Khac <33442340+vokhactri@users.noreply.github.com>
Date: Fri, 6 Dec 2024 15:50:33 +0700
Subject: [PATCH] feat: enhance configuration with new aliases and local bin
 setup

---
 zsh/.config/zsh/.zshrc      |  3 ++-
 zsh/.config/zsh/aliases.zsh |  6 ++++--
 zsh/.config/zsh/bin.zsh     | 10 ++++++++++
 zsh/.config/zsh/zinit.zsh   |  5 +++++
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 zsh/.config/zsh/bin.zsh

diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 13b6ccf..8e193fd 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -24,7 +24,7 @@ zinit as"command" wait lucid light-mode from"gh-r" for \
     extract"!" lsd-rs/lsd \
     extract"!" zyedidia/micro \
     extract"!" cp"autocomplete/bat.zsh -> _bat" @sharkdp/bat \
-    extract"!" atclone="cp usr/bin/fastfetch .; rm -rf usr" \
+    extract"!" atclone="cp usr/bin/fastfetch .; rm -rf usr" atpull"%atclone" \
         fastfetch-cli/fastfetch \
     atclone"./zoxide init zsh > init.zsh" atpull"%atclone" src"init.zsh" \
         ajeetdsouza/zoxide \
@@ -36,3 +36,4 @@ zinit as"command" wait lucid light-mode from"gh-r" for \
 source $ZDOTDIR/exports.zsh
 source $ZDOTDIR/aliases.zsh
 source $ZDOTDIR/options.zsh
+source $ZDOTDIR/bin.zsh
diff --git a/zsh/.config/zsh/aliases.zsh b/zsh/.config/zsh/aliases.zsh
index e149715..05c37ee 100644
--- a/zsh/.config/zsh/aliases.zsh
+++ b/zsh/.config/zsh/aliases.zsh
@@ -1,4 +1,6 @@
 #!/usr/bin/env zsh
 
-alias cat="bat"
-alias ls="lsd"
+alias cat=bat
+alias ls=lsd
+alias nano=micro
+alias fetch=fastfetch
diff --git a/zsh/.config/zsh/bin.zsh b/zsh/.config/zsh/bin.zsh
new file mode 100644
index 0000000..dabfec5
--- /dev/null
+++ b/zsh/.config/zsh/bin.zsh
@@ -0,0 +1,10 @@
+#!/usr/bin/env zsh
+
+export LOCAL_BIN="$HOME/.local/bin"
+if ! [ -d "$LOCAL_BIN" ]; then
+    mkdir -p "$LOCAL_BIN"
+fi
+case ":$PATH:" in
+    *":$LOCAL_BIN:"*) ;;
+    *) export PATH="$LOCAL_BIN:$PATH" ;;
+esac
diff --git a/zsh/.config/zsh/zinit.zsh b/zsh/.config/zsh/zinit.zsh
index 53081ce..6098fc5 100644
--- a/zsh/.config/zsh/zinit.zsh
+++ b/zsh/.config/zsh/zinit.zsh
@@ -3,4 +3,9 @@
 ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
 [ ! -d $ZINIT_HOME ] && mkdir -p "$(dirname $ZINIT_HOME)"
 [ ! -d $ZINIT_HOME/.git ] && git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME"
+
+# not to use aliases: zi or zini
+declare -A ZINIT
+export ZINIT[NO_ALIASES]=1
+
 source "${ZINIT_HOME}/zinit.zsh"