From ac0a2dbc209d12b2a406fef20d4c30b901ee6243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sun, 14 May 2017 18:16:26 +0100
Subject: [PATCH] VSCode settings for mac (#98)

---
 .config/Code/User/settings.json.mac | 11 +++++++++++
 macosx/configure_fresh_system.sh    | 11 +++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 .config/Code/User/settings.json.mac

diff --git a/.config/Code/User/settings.json.mac b/.config/Code/User/settings.json.mac
new file mode 100644
index 00000000..2cdb8088
--- /dev/null
+++ b/.config/Code/User/settings.json.mac
@@ -0,0 +1,11 @@
+{
+    "window.zoomLevel": 1,
+    "extensions.autoUpdate": true,
+    "editor.cursorStyle": "block",
+    "rust.rustLangSrcPath": "/Users/cyryl/dev/rust/src",
+    "rust.racerPath":       "/Users/cyryl/.cargo/bin/racer",
+    "rust.rustfmtPath":     "/Users/cyryl/.cargo/bin/rustfmt",
+    "rust.rustsymPath":     "/Users/cyryl/.cargo/bin/rustsym",
+    "rust.cargoPath":       "/Users/cyryl/.cargo/bin/cargo",
+    "rust.cargoHome":       "/Users/cyryl/.cargo/"
+}
diff --git a/macosx/configure_fresh_system.sh b/macosx/configure_fresh_system.sh
index 1ae3a59d..8b944620 100755
--- a/macosx/configure_fresh_system.sh
+++ b/macosx/configure_fresh_system.sh
@@ -10,7 +10,6 @@ set -e
 brew update
 brew upgrade
 
-echo "Installing basic console utils"
 brew install vim
 brew install aria2
 brew install \
@@ -47,9 +46,9 @@ brew install --force \
   pinentry-mac \
   socat \
   unrar \
-  wget
+  wget \
+  fontconfig
 
-echo "Installing programmming tools"
 brew install \
   carthage \
   cmake \
@@ -88,9 +87,13 @@ echo "Configuring NVRAM"
 sudo nvram SystemAudioVolume=%80
 
 DIR="$DIR/../"
+DIR=`realpath "$DIR"`
 if [[ -z $CONTINUOUS_INTEGRATION ]]; then
     echo "Invoking common configuration scripts"
     DIR="$DIR" $DIR/common/configure_fresh_system.sh
 fi
-ln -vfs "$DIR/.gitconfig.mac" ~/.gitconfig
+ln -vfs "$DIR/.gitconfig.mac" $HOME/.gitconfig
+
+mkdir -p "$HOME/Library/Application Support/Code/User/"
+ln -vfs "$DIR/.config/Code/User/settings.json.mac" "$HOME/Library/Application Support/Code/User/settings.json"