diff --git a/home/private_dot_config/khard/khard.conf.tmpl b/home/private_dot_config/khard/khard.conf.tmpl
index 710479d4..ce5114a6 100644
--- a/home/private_dot_config/khard/khard.conf.tmpl
+++ b/home/private_dot_config/khard/khard.conf.tmpl
@@ -1,13 +1,20 @@
 [addressbooks]
+{{- if eq .chezmoi.os "darwin" }}
 [[work]]
 path = ~/.contacts/default/
+{{- else }}
+[[bapt.name]]
+path = ~/.config/khard/contacts/bapt.name/
+[[personal]]
+path = ~/.config/khard/contacts/personal/
+{{- end }}
 
 [general]
 debug = no
 default_action = list
 # These are either strings or comma seperated lists
-editor = vim, -i, NONE
-merge_editor = vimdiff
+editor = nvim
+merge_editor = nvim, -d
 
 [contact table]
 # display names by first or last name: first_name / last_name / formatted_name
@@ -36,6 +43,6 @@ preferred_email_address_type = pref, work, home
 # preferred vcard version: 3.0 / 4.0
 preferred_version = 3.0
 # Look into source vcf files to speed up search queries: yes / no
-search_in_source_files = no
+search_in_source_files = yes
 # skip unparsable vcard files: yes / no
 skip_unparsable = no