From 9e337a1e266ca6786ac136483af39c3eaf233d3f Mon Sep 17 00:00:00 2001
From: Dan Barber <github@danbarber.me>
Date: Sun, 5 Feb 2017 17:44:06 +0000
Subject: [PATCH] Move guivim config into vimrc so it works with VimR

---
 gvimrc.local | 16 ----------------
 vimrc.local  | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 16 deletions(-)
 delete mode 100644 gvimrc.local

diff --git a/gvimrc.local b/gvimrc.local
deleted file mode 100644
index 6ea4923..0000000
--- a/gvimrc.local
+++ /dev/null
@@ -1,16 +0,0 @@
-" Remove scrollbars
-set guioptions-=R
-set guioptions-=r
-set guioptions-=L
-set guioptions-=l
-
-" Set GUI font according to OS
-if has("gui_macvim")
-  set guifont=Source\ Code\ Pro:h14
-elseif has("gui_gtk2")
-  set guifont=Source\ Code\ Pro\ 10
-endif
-
-" Color scheme
-set background=dark
-colorscheme gruvbox
diff --git a/vimrc.local b/vimrc.local
index c9b00a3..2662e97 100644
--- a/vimrc.local
+++ b/vimrc.local
@@ -1,6 +1,25 @@
 " Color scheme
 colorscheme Tomorrow-Night
 
+if has("gui_running")
+  " Set GUI font according to OS
+  if has("gui_macvim") || has("gui_vimr")
+    set guifont=Source\ Code\ Pro:h14
+  elseif has("gui_gtk2")
+    set guifont=Source\ Code\ Pro\ 10
+  endif
+
+  " Color scheme
+  set background=dark
+  colorscheme gruvbox
+
+  " Remove scrollbars
+  set guioptions-=R
+  set guioptions-=r
+  set guioptions-=L
+  set guioptions-=l
+endif
+
 " Map ctrl-hjkl for easy window movement
 map <c-h> <c-w>h
 map <c-j> <c-w>j