diff --git a/.chezmoi.yaml.tmpl b/.chezmoi.yaml.tmpl
index 5bc7e7b..fcc9b97 100644
--- a/.chezmoi.yaml.tmpl
+++ b/.chezmoi.yaml.tmpl
@@ -10,12 +10,12 @@ diff:
   command: lvim
   args:
     - "-d"
-    - "{{ .Destination }}"
-    - "{{ .Target }}"
+    - "{{`{{ .Destination }}`}}"
+    - "{{`{{ .Target }}`}}"
 merge:
-  command: lvim
+  command: nvim
   args:
     - "-d"
-    - "{{ .Destination }}"
-    - "{{ .Source }}"
-    - "{{ .Target }}"
+    - "{{`{{ .Destination }}`}}"
+    - "{{`{{ .Source }}"
+    - "{{ .Target }}`}}"