From 1b22e3241a9b72e8edc1da2698240474b5790edc Mon Sep 17 00:00:00 2001
From: js0ny <json.y@outlook.com>
Date: Wed, 30 Oct 2024 19:59:18 +0000
Subject: [PATCH] Minor fix

---
 mac/.zshrc                           | 7 +++++--
 mac/Microsoft.PowerShell_profile.ps1 | 2 +-
 mac/mac_setup.sh                     | 8 +++++++-
 vscode/vscode.vimrc                  | 2 +-
 zsh/config.zsh                       | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/mac/.zshrc b/mac/.zshrc
index b768643..c5dd388 100644
--- a/mac/.zshrc
+++ b/mac/.zshrc
@@ -1,9 +1,12 @@
 # ~/.config/zsh/.zshrc
-# ln -s ~/.dotfiles/wsl/.zshrc ~/.config/zsh/.zshrc
+# ln -s ~/.dotfiles/mac/.zshrc ~/.config/zsh/.zshrc
 ### Variables ###
 
 export DOTFILES="$HOME/.dotfiles"
-source $DOTFILES/zsh/*.zsh
+export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:$PATH
+for file in $DOTFILES/zsh/*.zsh; do
+  source $file
+done
 export ARCHFLAGS="-arch arm64"
 
 ### Navigation ###
diff --git a/mac/Microsoft.PowerShell_profile.ps1 b/mac/Microsoft.PowerShell_profile.ps1
index 3d4e5d3..5bbb714 100644
--- a/mac/Microsoft.PowerShell_profile.ps1
+++ b/mac/Microsoft.PowerShell_profile.ps1
@@ -12,7 +12,7 @@ Get-ChildItem -Path $DOTFILES\powershell_private -Filter *.ps1 | ForEach-Object
 # PowerShell Equivalents #
 
 # Set-Alias "curl"  "Invoke-WebRequest"
-Set-Alias "man"   "Get-Help"
+# Set-Alias "man"   "Get-Help"
 Set-Alias "kill"  "Stop-Process"
 Set-Alias "open" "Invoke-Item" # Use ii instead of open
 
diff --git a/mac/mac_setup.sh b/mac/mac_setup.sh
index 042df7c..a10f167 100644
--- a/mac/mac_setup.sh
+++ b/mac/mac_setup.sh
@@ -40,6 +40,7 @@ defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool
 ### Dotfiles Setup ###
 export $DOTFILES="$HOME/.dotfiles"
 git clone https://www.github.com/js0ny/dotfiles.git $DOTFILES
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
 ln -s $DOTFILES/.condarc ~/.condarc
 ln -s $DOTFILES/.gitconfig ~/.gitconfig
 ln -s $DOTFILES/.haskeline ~/.haskeline
@@ -142,4 +143,9 @@ mas install 451108668 # QQ
 # Oh My Zsh
 sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 sudo rm -rf ~/.zshrc
-ln -s $DOTFILES/mac/.zshrc ~/.zshrc
\ No newline at end of file
+mkdir -p ~/.config/zsh
+ln -s $DOTFILES/zsh/.zshenv ~/.zshenv
+ln -s $DOTFILES/mac/.zshrc ~/.config/zsh/.zshrc
+source ~/.config/zsh/.zshrc
+git clone https://github.com/zsh-users/zsh-autosuggestions $ZSH/custom/plugins/zsh-autosuggestions
+git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $ZSH/custom/plugins/zsh-syntax-highlighting
\ No newline at end of file
diff --git a/vscode/vscode.vimrc b/vscode/vscode.vimrc
index c67be30..c0e0b3a 100644
--- a/vscode/vscode.vimrc
+++ b/vscode/vscode.vimrc
@@ -1,6 +1,6 @@
 " ~/.config/vscode/vscode.vimrc
 " New-Item -ItemType SymbolicLink -Path ~\.config\vscode\vscode.vimrc -Target ~\.dotfiles\vscode\vscode.vimrc
-" mkdir -p ~/.config/vscode && ln -s ~/.config/vscode/vscode.vimrc ~/.vimrc
+" mkdir -p ~/.config/vscode && ln -s ~/.dotfiles/vscode/vscode.vimrc ~/.config/vscode/vscode.vimrc
 " And go to vscode vim setting:
     "vim.vimrc.path": "$HOME/.config/vscode/vscode.vimrc",
 
diff --git a/zsh/config.zsh b/zsh/config.zsh
index 9697b09..d841ef7 100644
--- a/zsh/config.zsh
+++ b/zsh/config.zsh
@@ -1,6 +1,6 @@
 ### ZSH Config ###
 export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
-export ZSH="$HOME/.oh-my-zsh"
+export ZSH="$ZDOTDIR/ohmyzsh"
 ZSH_THEME="avit"
 # DISABLE_MAGIC_FUNCTIONS="true"
 # DISABLE_LS_COLORS="true"