aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/khard/khard.conf15
1 files changed, 8 insertions, 7 deletions
diff --git a/.config/khard/khard.conf b/.config/khard/khard.conf
index ecfe627..ad15cc1 100644
--- a/.config/khard/khard.conf
+++ b/.config/khard/khard.conf
@@ -1,13 +1,12 @@
[general]
editor = /usr/bin/vim
+merge_editor = /usr/bin/vimdiff
default_country = Germany
default_action = list
+show_nicknames = yes
[addressbooks]
#SLEEPMAP
-[[akt]]
-path = ~/.contacts/akt/
-
[[bands]]
path = ~/.contacts/bands/
@@ -26,10 +25,12 @@ path = ~/.contacts/unixpool/
[[venues]]
path = ~/.contacts/venues/
-#AKT
+#TU-BERLIN
+[[exteam]]
+path = ~/.contacts/exteam
+
[[studio]]
path = ~/.contacts/studio/
-[[ak]]
-#path = ~/.contacts/tu_shared_by_mvoigt/
-path = ~/.contacts/ak/
+[[team]]
+path = ~/.contacts/team