From 30bbccc5cbecdefb4904bd960e2738a76d9355af Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Sun, 20 Nov 2022 12:33:55 +0800 Subject: [PATCH] chore(init): remove main.vim --- init.vim | 60 +++++++++++++++++++++++++++++++++++++++++++++++++- main.vim | 67 -------------------------------------------------------- vimrc | 2 +- 3 files changed, 60 insertions(+), 69 deletions(-) delete mode 100644 main.vim diff --git a/init.vim b/init.vim index 36c42df69..202a5205f 100644 --- a/init.vim +++ b/init.vim @@ -6,4 +6,62 @@ " License: GPLv3 "============================================================================= -execute 'source' fnamemodify(expand(''), ':h').'/main.vim' +" set default encoding to utf-8 +" Let Vim use utf-8 internally, because many scripts require this +set encoding=utf-8 +scriptencoding utf-8 + +" Enable nocompatible +if &compatible + set nocompatible +endif + +let g:_spacevim_root_dir = escape(fnamemodify(resolve(fnamemodify(expand(''), + \ ':p:h:gs?\\?'.((has('win16') || has('win32') + \ || has('win64'))?'\':'/') . '?')), ':p:gs?[\\/]?/?'), ' ') +lockvar g:_spacevim_root_dir +if has('nvim') + let s:qtdir = split(&rtp, ',')[-1] + if s:qtdir =~# 'nvim-qt' + let &rtp = s:qtdir . ',' . g:_spacevim_root_dir . ',' . $VIMRUNTIME + else + let &rtp = g:_spacevim_root_dir . ',' . $VIMRUNTIME + endif +else + let &rtp = g:_spacevim_root_dir . ',' . $VIMRUNTIME +endif +call SpaceVim#logger#info('Loading SpaceVim from: ' . g:_spacevim_root_dir) + +if has('vim_starting') + " python host + " @bug python2 error on neovim 0.6.1 + " let g:loaded_python_provider = 0 + if !empty($PYTHON_HOST_PROG) + let g:python_host_prog = $PYTHON_HOST_PROG + call SpaceVim#logger#info('$PYTHON_HOST_PROG is not empty, setting g:python_host_prog:' . g:python_host_prog) + endif + if !empty($PYTHON3_HOST_PROG) + let g:python3_host_prog = $PYTHON3_HOST_PROG + call SpaceVim#logger#info('$PYTHON3_HOST_PROG is not empty, setting g:python3_host_prog:' . g:python3_host_prog) + if !has('nvim') + \ && (has('win16') || has('win32') || has('win64')) + \ && exists('&pythonthreedll') + \ && exists('&pythonthreehome') + let &pythonthreedll = get(split(globpath(fnamemodify($PYTHON3_HOST_PROG, ':h'), 'python*.dll'), '\n'), -1, '') + call SpaceVim#logger#info('init &pythonthreedll:' . &pythonthreedll) + let &pythonthreehome = fnamemodify($PYTHON3_HOST_PROG, ':h') + call SpaceVim#logger#info('init &pythonthreehome:' . &pythonthreehome) + endif + endif +endif + +call SpaceVim#begin() + +call SpaceVim#custom#load() + +call SpaceVim#default#keyBindings() + +call SpaceVim#end() + +call SpaceVim#logger#info('finished loading SpaceVim!') +" vim:set et sw=2 cc=80: diff --git a/main.vim b/main.vim deleted file mode 100644 index faf2ae7f5..000000000 --- a/main.vim +++ /dev/null @@ -1,67 +0,0 @@ -"============================================================================= -" main.vim --- Main file of SpaceVim -" Copyright (c) 2016-2022 Shidong Wang & Contributors -" Author: Shidong Wang < wsdjeg@outlook.com > -" URL: https://spacevim.org -" License: GPLv3 -"============================================================================= - -" set default encoding to utf-8 -" Let Vim use utf-8 internally, because many scripts require this -set encoding=utf-8 -scriptencoding utf-8 - -" Enable nocompatible -if &compatible - set nocompatible -endif - -let g:_spacevim_root_dir = escape(fnamemodify(resolve(fnamemodify(expand(''), - \ ':p:h:gs?\\?'.((has('win16') || has('win32') - \ || has('win64'))?'\':'/') . '?')), ':p:gs?[\\/]?/?'), ' ') -lockvar g:_spacevim_root_dir -if has('nvim') - let s:qtdir = split(&rtp, ',')[-1] - if s:qtdir =~# 'nvim-qt' - let &rtp = s:qtdir . ',' . g:_spacevim_root_dir . ',' . $VIMRUNTIME - else - let &rtp = g:_spacevim_root_dir . ',' . $VIMRUNTIME - endif -else - let &rtp = g:_spacevim_root_dir . ',' . $VIMRUNTIME -endif -call SpaceVim#logger#info('Loading SpaceVim from: ' . g:_spacevim_root_dir) - -if has('vim_starting') - " python host - " @bug python2 error on neovim 0.6.1 - " let g:loaded_python_provider = 0 - if !empty($PYTHON_HOST_PROG) - let g:python_host_prog = $PYTHON_HOST_PROG - call SpaceVim#logger#info('$PYTHON_HOST_PROG is not empty, setting g:python_host_prog:' . g:python_host_prog) - endif - if !empty($PYTHON3_HOST_PROG) - let g:python3_host_prog = $PYTHON3_HOST_PROG - call SpaceVim#logger#info('$PYTHON3_HOST_PROG is not empty, setting g:python3_host_prog:' . g:python3_host_prog) - if !has('nvim') - \ && (has('win16') || has('win32') || has('win64')) - \ && exists('&pythonthreedll') - \ && exists('&pythonthreehome') - let &pythonthreedll = get(split(globpath(fnamemodify($PYTHON3_HOST_PROG, ':h'), 'python*.dll'), '\n'), -1, '') - call SpaceVim#logger#info('init &pythonthreedll:' . &pythonthreedll) - let &pythonthreehome = fnamemodify($PYTHON3_HOST_PROG, ':h') - call SpaceVim#logger#info('init &pythonthreehome:' . &pythonthreehome) - endif - endif -endif - -call SpaceVim#begin() - -call SpaceVim#custom#load() - -call SpaceVim#default#keyBindings() - -call SpaceVim#end() - -call SpaceVim#logger#info('finished loading SpaceVim!') -" vim:set et sw=2 cc=80: diff --git a/vimrc b/vimrc index 2c5668658..692c4f0e7 100644 --- a/vimrc +++ b/vimrc @@ -23,6 +23,6 @@ if 1 let g:_spacevim_if_lua = 1 endif endif - execute 'source' fnamemodify(expand(''), ':h').'/main.vim' + execute 'source' fnamemodify(expand(''), ':h').'/init.vim' endif " vim:set et sw=2