From 137736dcd8acc7cb740d8e51f6ce19bb1ce125cc Mon Sep 17 00:00:00 2001
From: Morgan Wattiez <morgan.wattiez@collibra.com>
Date: Fri, 1 Mar 2019 12:59:54 +0100
Subject: [PATCH] give priority to chezmoi over mackup

---
 dot_zshrc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dot_zshrc b/dot_zshrc
index ae79bb4..d0d6092 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -98,4 +98,6 @@ export SDKMAN_DIR="$HOME/.sdkman"
 [[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
 sdk use java 8.0.202-zulu
 eval "$(fasd --init auto)"
-
+unlink "$HOME/Library/Application Support/Code/User/settings.json"
+ln -s "$HOME/.config/Code/User/settings.json" "$HOME/Library/Application Support/Code/User/settings.json"
+cm apply