diff --git a/.claude/settings.local.json b/.claude/settings.local.json
new file mode 100644
index 0000000..a4af320
--- /dev/null
+++ b/.claude/settings.local.json
@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(mkdir:*)"
+    ],
+    "deny": []
+  }
+}
\ No newline at end of file
diff --git a/.local/share/fonts/aimoji.ttf b/.local/share/fonts/aimoji.ttf
new file mode 100644
index 0000000..4faf591
Binary files /dev/null and b/.local/share/fonts/aimoji.ttf differ
diff --git a/.zshrc b/.zshrc
index 2e385d9..22f3846 100644
--- a/.zshrc
+++ b/.zshrc
@@ -2,6 +2,47 @@
 # zsh configuration
 # ================================
 
+# ================================
+# Plugin Management (Zinit)
+# ================================
+
+# Initialize Zinit
+ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
+if [ ! -d "$ZINIT_HOME" ]; then
+   mkdir -p "$(dirname $ZINIT_HOME)"
+   git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME"
+fi
+source "${ZINIT_HOME}/zinit.zsh"
+
+# Load plugins
+# Arch Linux standard plugins (prefer pacman versions when available)
+# pacman -S zsh-syntax-highlighting zsh-autosuggestions
+if [[ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]]; then
+    source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+else
+    zinit light zsh-users/zsh-syntax-highlighting
+fi
+
+if [[ -f /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh ]]; then
+    source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+else
+    zinit light zsh-users/zsh-autosuggestions
+fi
+
+# Additional useful plugins
+zinit light zsh-users/zsh-completions
+zinit light Aloxaf/fzf-tab
+
+# Note: Removed dependency on syui---powerline.zsh plugin
+# Powerline functionality is now integrated directly above
+
+# Load completions
+autoload -U compinit && compinit
+
+# Plugin configurations
+ZSH_AUTOSUGGEST_STRATEGY=(history completion)
+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#666666"
+
 # History
 HISTFILE=~/.zsh_history
 HISTSIZE=10000
@@ -28,9 +69,12 @@ setopt COMPLETE_ALIASES
 bindkey -e
 bindkey '^R' history-incremental-search-backward
 
-# Prompt
-autoload -U colors && colors
-PROMPT='%{$fg[cyan]%}%n@%m%{$reset_color%}:%{$fg[yellow]%}%~%{$reset_color%}$ '
+# ================================
+# Airline.zsh Plugin
+# ================================
+
+# Load airline.zsh plugin via zinit
+zinit load syui/airline.zsh
 
 # Aliases
 alias ll='ls -la'
@@ -70,4 +114,16 @@ export LESS='-R'
 
 # Path additions
 export PATH="$PATH:$HOME/.local/bin"
-export PATH="$PATH:$HOME/bin"
\ No newline at end of file
+export PATH="$PATH:$HOME/bin"
+export PATH="/usr/local/sbin:$PATH"
+export PATH="$HOME/.cargo/bin:$PATH"
+
+case $OSTYPE in
+	darwin*)
+		export PATH="/opt/homebrew/bin:$PATH"
+		export PATH="/opt/homebrew/sbin:$PATH"
+	;;
+	linux*)
+	;;
+esac
+