diff --git a/init.lua b/init.lua index c81a66d..1c70ab2 100644 --- a/init.lua +++ b/init.lua @@ -1,48 +1,42 @@ G = require('G') -local lazypath = G.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not G.loop.fs_stat(lazypath) then - - G.fn.system({ - "git", - "clone", - "--filter=blob:none", - "http://git.qqnewbie.top/newbieQQ/lazy.nvim.git", - -- latest stable release - "--branch=stable", - lazypath, - }) - - G.fn.system({ - "git", - "config", - "--global", - "credential.helper", - "store", - }) - -end - -G.opt.rtp:prepend(lazypath) - -local normalplugs = require('normal.plug') -local vscodeplugs = require('vscode.plug') -local neovimplugs = require('neovim.plug') - -if G.g.vscode then - normalplugs = {vscodeplugs, normalplugs} -else - normalplugs = {neovimplugs, normalplugs} -end - -require("lazy").setup(normalplugs) if G.g.vscode then require('vscode.vscode') else + local lazypath = G.fn.stdpath("data") .. "/lazy/lazy.nvim" + if not G.loop.fs_stat(lazypath) then + + G.fn.system({ + "git", + "clone", + "--filter=blob:none", + "http://git.qqnewbie.top/newbieQQ/lazy.nvim.git", + -- latest stable release + "--branch=stable", + lazypath, + }) + + G.fn.system({ + "git", + "config", + "--global", + "credential.helper", + "store", + }) + + end + G.opt.rtp:prepend(lazypath) + + require("lazy").setup({ + require('normal.plug'), + require('neovim.plug') + }) + + require('normal.normal') require('neovim.neovim') + end -require('normal.normal') diff --git a/lua/vscode/vscode.lua b/lua/vscode/vscode.lua index e69de29..08b01fe 100644 --- a/lua/vscode/vscode.lua +++ b/lua/vscode/vscode.lua @@ -0,0 +1 @@ +require("vscode.keymap")