From 1c4d971f2081b0bde8783b6996fcff528a8a6e13 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Tue, 11 Dec 2018 23:08:03 -0500
Subject: [PATCH] Add go support and make it play nice with polyglot

---
 nvim/.config/nvim/init.vim  | 5 +++++
 nvim/.config/nvim/plugs.vim | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 844a02b..82b96c8 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -58,3 +58,8 @@ let g:deoplete#sources#jedi#show_docstring = 1
 inoremap <expr><C-n> deoplete#mappings#manual_complete()
 inoremap <expr><tab> pumvisible() ? "\<c-n>" : "\<tab>"
 
+" Turn off polyglot for go so they play nice
+if exists('g:loaded_polyglot')
+    let g:polyglot_disabled = ['go']
+endif
+
diff --git a/nvim/.config/nvim/plugs.vim b/nvim/.config/nvim/plugs.vim
index b3e34ed..d3f2e9c 100644
--- a/nvim/.config/nvim/plugs.vim
+++ b/nvim/.config/nvim/plugs.vim
@@ -11,8 +11,9 @@ Plug 'airblade/vim-gitgutter' " Shows a diff in the gutter
 " TODO: consider switching to powerline
 Plug 'vim-airline/vim-airline' " Display more contextual information
 
-" syntax highlighting
-Plug 'sheerun/vim-polyglot' " Automatic syntax highlighting
+" language support
+Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
+Plug 'sheerun/vim-polyglot' " Automatic syntax highlighting for many languages
 
 " vimwiki
 Plug 'vimwiki/vimwiki'