From 5caa13c27c7f14173ec12bd45c7542228d537f4f Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 28 Oct 2017 21:39:02 +1300 Subject: Move syntax config back into .vimrc This reverts commit 5dba4c. The order of the configuration matters more for these settings, because the "sahara" colorscheme is only available after loading it as a plugin. I'll divest some other stuff that should be less sensitive to the order in which it's loaded first, and then tackle this one afterwards. --- vim/config/syntax.vim | 12 ------------ vim/vimrc | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 vim/config/syntax.vim diff --git a/vim/config/syntax.vim b/vim/config/syntax.vim deleted file mode 100644 index 68a344e2..00000000 --- a/vim/config/syntax.vim +++ /dev/null @@ -1,12 +0,0 @@ -" Options dependent on the syntax feature -if has('syntax') - - " Use syntax highlighting with 100 lines of context - silent! syntax enable - silent! syntax sync minlines=100 - - " Use my custom color scheme if possible, otherwise I'm happy with whatever - " the default is, and it usually cares about my background - set background=dark - silent! colorscheme sahara -endif diff --git a/vim/vimrc b/vim/vimrc index 401a287e..3a579836 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -23,6 +23,19 @@ if has('autocmd') filetype indent plugin on endif +" Options dependent on the syntax feature +if has('syntax') + + " Use syntax highlighting with 100 lines of context + silent! syntax enable + silent! syntax sync minlines=100 + + " Use my custom color scheme if possible, otherwise I'm happy with whatever + " the default is, and it usually cares about my background + set background=dark + silent! colorscheme sahara +endif + " Use all ancestors of current directory for :find if has('file_in_path') set path=** -- cgit v1.2.3