Misc MacOS tweaks

cowboy · Jun 13, 2018 · ac47832 · ac47832
1 parent 8746226
commit ac47832
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/link/.ssh/config b/link/.ssh/config
@@ -6,6 +6,12 @@ ForwardAgent yes
 # Automatically add all common hosts to the host file as they are connected to.
 StrictHostKeyChecking no
 
+# Allow MacOS to use the keychain for SSH key passphrases
+Host *
+  UseKeychain yes
+  AddKeysToAgent yes
+  IdentityFile ~/.ssh/id_rsa
+
 # For vagrant virtual machines
 # http://hakunin.com/six-ansible-practices#configure-your-ssh-client
 Host 192.168.33.* *.loc

diff --git a/source/50_editor.sh b/source/50_editor.sh
@@ -2,6 +2,12 @@
 
 export EDITOR=vim
 
+# If mvim is installed, use it instead of native vim
+if [[ "$(which mvim)" ]]; then
+    EDITOR="mvim -v"
+    alias vim="$EDITOR"
+fi
+
 if [[ ! "$SSH_TTY" ]]; then
   if [[ ! "$TMUX" ]]; then
     is_osx && EDITOR=mvim || EDITOR=gvim