diff --git a/.config/conda/condarc.yaml b/.config/conda/condarc.yaml
index 9965c1b..5788ada 100644
--- a/.config/conda/condarc.yaml
+++ b/.config/conda/condarc.yaml
@@ -1,5 +1,7 @@
 # $XDG_CONFIG_HOME/conda/condarc.yaml
-# New-Item -ItemType SymbolicLink -Path ~\.condarc -Target ~\.dotfiles\.config\conda\condarc.yaml
+# ==================================================================
+# New-Item -ItemType SymbolicLink -Path $Env:XDG_CONFIG_HOME\conda\.condarc -Target $DOTFILES\.config\conda\condarc.yaml
 #  ln -s $DOTFILES/.config/conda/condarc.yaml $XDG_CONFIG_HOME/conda/.condarc
-# Reference: https://docs.conda.io/projects/conda/en/latest/user-guide/configuration/use-condarc.html
-auto_activate_base: false 
\ No newline at end of file
+# ==================================================================
+# https://docs.conda.io/projects/conda/en/latest/user-guide/configuration/use-condarc.html
+auto_activate_base: false
diff --git a/.config/nvim/README.md b/.config/nvim/README.md
index a5ea7b9..9de6f77 100644
--- a/.config/nvim/README.md
+++ b/.config/nvim/README.md
@@ -4,5 +4,5 @@
 - `j->e`, `k->n`, `h->h`, `l->i`
 
 ```sh
-ln -s $DOTFILES/.config/nvim/ ~/.config/nvim
+ln -sf $DOTFILES/.config/nvim/ $XDG_CONFIG_HOME/nvim
 ```
\ No newline at end of file
diff --git a/mac/.zshrc b/mac/.zshrc
index 43f0e9d..afefec8 100644
--- a/mac/.zshrc
+++ b/mac/.zshrc
@@ -1,5 +1,5 @@
-# ~/.config/zsh/.zshrc
-# ln -s $DOTFILES/mac/.zshrc ~/.config/zsh/.zshrc
+# $XDG_CONFIG_HOME/zsh/.zshrc
+# ln -s $DOTFILES/mac/.zshrc $XDG_CONFIG_HOME/zsh/.zshrc
 ### Variables ###
 
 export DOTFILES="$HOME/.dotfiles"
diff --git a/mac/Microsoft.PowerShell_profile.ps1 b/mac/Microsoft.PowerShell_profile.ps1
index 5bbb714..a54d167 100644
--- a/mac/Microsoft.PowerShell_profile.ps1
+++ b/mac/Microsoft.PowerShell_profile.ps1
@@ -1,3 +1,5 @@
+# $XDG_CONFIG_HOME/powershell/Microsoft.PowerShell_profile.ps1
+# ln -sf $DOTFILES/mac/Microsoft.PowerShell_profile.ps1 $XDG_CONFIG_HOME/powershell/Microsoft.PowerShell_profile.ps1
 ### Variables ###
 
 $DOTFILES = "$HOME\.dotfiles"
diff --git a/mac/mac_setup.sh b/mac/mac_setup.sh
index 93903e4..a0b79a4 100644
--- a/mac/mac_setup.sh
+++ b/mac/mac_setup.sh
@@ -60,7 +60,7 @@ git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $ZSH/custom/p
 source $XDG_CONFIG_HOME/zsh/.zshrc
 
 echo [INFO] Setting Up dotfiles
-mkdir -p $XDG_CONFIG_HOME/conda $XDG_CONFIG_HOME/nvim $XDG_CONFIG_HOME/git $XDG_CONFIG_HOME/ideavim $XDG_CONFIG_HOME/markdownlint $XDG_CONFIG_HOME/pip $XDG_CONFIG_HOME/neovide $XDG_CONFIG_HOME/powershell $XDG_CONFIG_HOME/vscode
+mkdir -p $XDG_CONFIG_HOME/conda $XDG_CONFIG_HOME/git $XDG_CONFIG_HOME/ideavim $XDG_CONFIG_HOME/markdownlint $XDG_CONFIG_HOME/pip $XDG_CONFIG_HOME/neovide $XDG_CONFIG_HOME/powershell $XDG_CONFIG_HOME/vscode
 mkdir -p ~/.config/zellij # Not support XDG_CONFIG_HOME but same directory
 ln -sf $DOTFILES/.config/conda/condarc.yaml $XDG_CONFIG_HOME/conda/.condarc
 ln -sf $DOTFILES/.config/git/config $XDG_CONFIG_HOME/git/config
@@ -74,6 +74,7 @@ ln -sf $DOTFILES/.config/pip/pip.conf $XDG_CONFIG_HOME/pip/pip.conf
 ln -sf $DOTFILES/mac/neovide.toml $XDG_CONFIG_HOME/neovide/config.toml
 ln -sf $DOTFILES/mac/Microsoft.PowerShell_profile.ps1 $XDG_CONFIG_HOME/powershell/Microsoft.PowerShell_profile.ps1
 ln -sf $DOTFILES/vscode/vscode.vimrc $XDG_CONFIG_HOME/vscode.vimrc
+ln -sf $DOTFILES/.config/nvim/ $XDG_CONFIG_HOME/nvim
 
 # Brew
 echo [INFO] Installing Homebrew
diff --git a/vscode/vscode.vimrc b/vscode/vscode.vimrc
index 11b8c20..6d0821b 100644
--- a/vscode/vscode.vimrc
+++ b/vscode/vscode.vimrc
@@ -1,6 +1,6 @@
-" ~/.config/vscode/vscode.vimrc
+" $XDG_CONFIG_HOME/vscode/vscode.vimrc
 " New-Item -ItemType SymbolicLink -Path ~\.config\vscode\vscode.vimrc -Target ~\.dotfiles\vscode\vscode.vimrc
-" ln -sf $DOTFILES/vscode/vscode.vimrc ~/.config/vscode/vscode.vimrc
+" ln -sf $DOTFILES/vscode/vscode.vimrc $XDG_CONFIG_HOME/vscode/vscode.vimrc
 " And go to vscode vim setting:
     "vim.vimrc.path": "$HOME/.config/vscode/vscode.vimrc",
 
diff --git a/wsl/.zshrc b/wsl/.zshrc
index cb85f8a..04bbafe 100644
--- a/wsl/.zshrc
+++ b/wsl/.zshrc
@@ -1,5 +1,5 @@
-# ~/.config/zsh/.zshrc
-# ln -s $DOTFILES/wsl/.zshrc ~/.config/zsh/.zshrc
+# $XDG_CONFIG_HOME/zsh/.zshrc
+# ln -s $DOTFILES/wsl/.zshrc $XDG_CONFIG_HOME/zsh/.zshrc
 ### Variables ###
 
 export DOTFILES="$HOME/.dotfiles"
diff --git a/zsh/alias.zsh b/zsh/alias.zsh
index 9d0ae14..a37837c 100644
--- a/zsh/alias.zsh
+++ b/zsh/alias.zsh
@@ -13,7 +13,7 @@ alias bashcfg="nvim ~/.bashrc"
 alias zshcfg="nvim ~/.zshrc"
 alias shcfg=zshcfg
 alias reload="source ~/.zshrc"
-alias nvimrc="nvim ~/.config/nvim/"
+alias nvimrc="nvim $XDG_CONFIG_HOME/nvim/"
 alias ohmyzsh="code ~/.oh-my-zsh"
 alias pulldots="cd $DOTFILES && git pull"