From 96ac500480dcfd9c8d94a9c50fed64e72fe387ec Mon Sep 17 00:00:00 2001 From: psox Date: Fri, 18 Oct 2019 13:56:42 +0100 Subject: [PATCH] Updated and added support for vimrc includes --- oh-my-zsh | 2 +- vimrc | 15 +++++++++++++++ zsh-custom/plugins/zsh-autosuggestions | 2 +- zsh-custom/plugins/zsh-completions | 2 +- zsh-custom/plugins/zsh-syntax-highlighting | 2 +- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/oh-my-zsh b/oh-my-zsh index ae0de11..3e4d10c 160000 --- a/oh-my-zsh +++ b/oh-my-zsh @@ -1 +1 @@ -Subproject commit ae0de1135dc96cfabe31d70f65112cbeadbfa3bf +Subproject commit 3e4d10c4f17b2fe57090a524d5d78781beda204a diff --git a/vimrc b/vimrc index 9e3a1d9..71a9274 100644 --- a/vimrc +++ b/vimrc @@ -1,6 +1,18 @@ +" Function to source only if file exists { +function! SourceIfExists(file) + if filereadable(expand(a:file)) + exe 'source' a:file + endif +endfunction +" } + + + exec "set rtp=$VIMHOME," . &rtp +call SourceIfExists("~/.config/vim/early.vimrc") + set encoding=utf-8 call plug#begin("$VIMHOME/plugged") @@ -19,6 +31,7 @@ call plug#begin("$VIMHOME/plugged") Plug 'pearofducks/ansible-vim' Plug 'luochen1990/rainbow' Plug 'jremmen/vim-ripgrep' + call SourceIfExists("~/.config/vim/plug.vimrc") if v:version > 704 Plug 'Valloric/YouCompleteMe' Plug 'prabirshrestha/async.vim' @@ -92,6 +105,8 @@ let g:rg_derive_root = 'true' nmap :TagbarToggle +call SourceIfExists("~/.config/vim/late.vimrc") + set modeline set modelines=7 diff --git a/zsh-custom/plugins/zsh-autosuggestions b/zsh-custom/plugins/zsh-autosuggestions index 4016ff7..d43c309 160000 --- a/zsh-custom/plugins/zsh-autosuggestions +++ b/zsh-custom/plugins/zsh-autosuggestions @@ -1 +1 @@ -Subproject commit 4016ff795bb184461996c5539327befc8da2af6f +Subproject commit d43c309f888153d6c46d8b6a3a0186f4148680fd diff --git a/zsh-custom/plugins/zsh-completions b/zsh-custom/plugins/zsh-completions index 922eee0..8def5f1 160000 --- a/zsh-custom/plugins/zsh-completions +++ b/zsh-custom/plugins/zsh-completions @@ -1 +1 @@ -Subproject commit 922eee0706acb111e9678ac62ee77801941d6df2 +Subproject commit 8def5f15835f294ec6a1bf220fb330efddbe2575 diff --git a/zsh-custom/plugins/zsh-syntax-highlighting b/zsh-custom/plugins/zsh-syntax-highlighting index 35c8690..be3882a 160000 --- a/zsh-custom/plugins/zsh-syntax-highlighting +++ b/zsh-custom/plugins/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit 35c8690c0025ceef9584f64da86ced3a72ee32b6 +Subproject commit be3882aeb054d01f6667facc31522e82f00b5e94