From fa71de62917337420ce9274fb47a97bb8beb2f24 Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Mon, 1 Apr 2019 11:05:32 -0700
Subject: [PATCH] Institude Filepath, veonim, and git-diff3-style

---
 .gitconfig |  3 +++
 .vimrc     | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 55f6ae8..b8ca019 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,6 +20,9 @@
 [diff]  
   renamelimit = 0
 
+[merge]
+  conflictstyle = diff3
+
 [color] 
   diff = auto
   interactive = auto
diff --git a/.vimrc b/.vimrc
index 85a0d10..6fdfb5a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -70,6 +70,16 @@ set t_Sb=ESC[4%dm
 let $RUST_SRC_PATH="/usr/src/rust/src/"
 
 "let g:ft_ignore_pat = '.org'
+"
+
+if exists('veonim')
+  let g:vscode_extensions = [
+        \'ms-python.python',
+        \'ms-vscode.go',
+        \]
+  set guifont=Droid\ Sans\ Mono\ Dotted:h20
+" set linespace=10
+endif
 
 " Required:
 set runtimepath+=/home/barak/.vim/bundle/repos/github.com/Shougo/dein.vim
@@ -412,6 +422,9 @@ endif
 " CD to the path of the file I'm editing.
 command Cdf :cd %:p:h
 
+" Print path of file
+command Filepath :echo expand('%:p')
+
 " Save a vim session! Useful if you want to save buffer states and so on
 command SaveSession :mksession! ~/.vim_last_session
 command LoadSession :source ~/.vim_last_session