diff --git a/install.sh b/install.sh index 54b2987..cda2ec9 100755 --- a/install.sh +++ b/install.sh @@ -84,13 +84,19 @@ function configure_default { cp "$BASEDIR/resources/vimrc" "$HOME/.vimrc" || echo vimrc defined! - [[ ! -f $HOME/.config/nvim/init.vim ]] && - cp "$BASEDIR/resources/init.vim" "$HOME/.config/nvim/init.vim" || - echo nvim init.vim defined! + configure_nvim + configure_nvim nvim-vanilla +} - [[ ! -f $HOME/.config/nvim-vanilla/init.vim ]] && - cp "$BASEDIR/resources/init.vim" "$HOME/.config/nvim-vanilla/init.vim" || - echo nvim-vanilla init.vim defined! +function configure_nvim { + local nvim_app=${1:-nvim} + if grep -q "\$HOME/.vimrc" "$HOME/.config/${nvim_app}/init.lua"; then + cat "$BASEDIR/resources/init.lua" "$HOME/.config/${nvim_app}/init.lua" >"$HOME/.config/${nvim_app}/init.lua.new" + mv "$HOME/.config/${nvim_app}/init.lua.new" "$HOME/.config/${nvim_app}/init.lua" + echo "${nvim_app} init.lua may load .vimrc newly created!" + else + echo "${nvim_app} init.lua may load .vimrc already defined!" + fi } function install_neovim { diff --git a/resources/init.lua b/resources/init.lua new file mode 100644 index 0000000..102e44f --- /dev/null +++ b/resources/init.lua @@ -0,0 +1,6 @@ +-- legacy vimrc +local vimrc = vim.fn.expand('~/.vimrc') +if vim.fn.filereadable(vimrc) == 1 then + vim.cmd('source ' .. vimrc) +end +-------------------- diff --git a/resources/init.vim b/resources/init.vim deleted file mode 100644 index 5618a4a..0000000 --- a/resources/init.vim +++ /dev/null @@ -1,4 +0,0 @@ -if filereadable(expand('~/.vimrc')) - source ~/.vimrc -endif -