diff --git a/.path b/.path
index d1403bbe..80f75053 100644
--- a/.path
+++ b/.path
@@ -6,6 +6,6 @@ export NVM_DIR="$HOME/.nvm"
 export PATH="/usr/local/opt/llvm/bin:$PATH"
 export PATH="$HOME/pyenv/bin:$PATH"
 export PATH="$HOME/Library/Python/3.9/bin:$PATH"
-export GIT_EDITOR="/usr/local/bin/nvim"
+export GIT_EDITOR="/opt/homebrew/bin/nvim"
 export TERM=xterm-256color
 export LANG=en_US.UTF-8
diff --git a/makefiles/editors.mk b/makefiles/editors.mk
index eb0961a7..40177422 100644
--- a/makefiles/editors.mk
+++ b/makefiles/editors.mk
@@ -1,9 +1,15 @@
 # Editor configuration setups
 
+.PHONY: nvim
+
 nvim: ## Setup Neovim configuration by linking dotfiles
 	@$(call mkdir_safe,${XDG_CONFIG_HOME}/nvim)
-	@for file in $(DOTFILES)/nvim/*; do \
-		ln -f $$file ${XDG_CONFIG_HOME}/nvim/; \
+	@for item in $(DOTFILES)/nvim/*; do \
+		if [ -d "$$item" ]; then \
+			ln -sfn $$item ${XDG_CONFIG_HOME}/nvim/; \
+		else \
+			ln -sf $$item ${XDG_CONFIG_HOME}/nvim/; \
+		fi; \
 	done
 
 vim: ## Setup Vim configuration and update submodules
@@ -23,4 +29,4 @@ ideavim: ## Setup IdeaVim configuration by linking .ideavimrc
 	$(call symlink,.ideavimrc,${HOME}/.ideavimrc)
 
 gvim: ## Setup GVim configuration by linking .gvimrc
-	$(call symlink,.gvimrc,${HOME}/.gvimrc)
+	$(call symlink,.gvimrc,${HOME}/.gvimrc)
\ No newline at end of file
diff --git a/makefiles/targets.mk b/makefiles/targets.mk
index bfb5a15d..7e42050b 100644
--- a/makefiles/targets.mk
+++ b/makefiles/targets.mk
@@ -4,4 +4,6 @@
 personal: vim vscodevim ideavim gvim nvim vsvim bash zsh personal-git yamllint continue
 
 # Setup work environment
-work: vim vscodevim ideavim gvim nvim vsvim bash zsh work-git yamllint continue
\ No newline at end of file
+work: vim vscodevim ideavim gvim nvim vsvim bash zsh work-git yamllint continue
+
+PHONY: nvim