From b0065577304dc07148ff70305c7df28d2a5d96fb Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Sat, 14 Oct 2023 19:43:28 +1100
Subject: [PATCH] Use bundled copy of editorconfig-vim if available

---
 config/vim/init.vim    | 1 +
 config/vim/plugins.vim | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/vim/init.vim b/config/vim/init.vim
index c1e17b2..b7f3fc9 100644
--- a/config/vim/init.vim
+++ b/config/vim/init.vim
@@ -36,6 +36,7 @@ colorscheme gruvbox8
 inoremap jj <Esc>
 nnoremap <C-t> :Files<CR>
 
+packadd! editorconfig
 
 if exists('+belloff')
   set belloff+=ctrlg
diff --git a/config/vim/plugins.vim b/config/vim/plugins.vim
index 67189a1..0704d27 100644
--- a/config/vim/plugins.vim
+++ b/config/vim/plugins.vim
@@ -16,8 +16,11 @@ minpac#add('prabirshrestha/async.vim')
 
 minpac#add('lifepillar/vim-gruvbox8')
 
+if !isdirectory($VIMRUNTIME .. '/pack/dist/opt/editorconfig')
+  minpac#add('editorconfig/editorconfig-vim')
+endif
+
 minpac#add('direnv/direnv.vim')
-minpac#add('editorconfig/editorconfig-vim')
 minpac#add('godlygeek/tabular')
 minpac#add('jamessan/vim-gnupg')
 minpac#add('junegunn/vim-easy-align')