diff --git a/profiles/base-user/.config/git/config.nix b/profiles/base-user/.config/git/config.nix
index 6b099f87..eaa4271b 100644
--- a/profiles/base-user/.config/git/config.nix
+++ b/profiles/base-user/.config/git/config.nix
@@ -17,7 +17,7 @@ in
   cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
 # set "nvim" as tool for merging
 [merge]
-  tool = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim
+  tool = nvim
 # automatically launch merge tool without displaying a prompt
 [mergetool]
   prompt = false