From 79805b7fea9638656b4398b6e83b73529d7d0ccf Mon Sep 17 00:00:00 2001 From: siduck Date: Mon, 27 Mar 2023 05:27:57 +0530 Subject: [PATCH] bootstrap: clone base46 to lazy path instead of tmpdir --- init.lua | 1 - lua/core/bootstrap.lua | 43 +++++++++++++++++++---------------- lua/plugins/configs/mason.lua | 2 +- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/init.lua b/init.lua index 2de4ae5..21f0b6f 100644 --- a/init.lua +++ b/init.lua @@ -12,7 +12,6 @@ local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" -- bootstrap lazy.nvim! if not vim.loop.fs_stat(lazypath) then - require("core.bootstrap").base46() require("core.bootstrap").gen_chadrc_template() require("core.bootstrap").lazy(lazypath) end diff --git a/lua/core/bootstrap.lua b/lua/core/bootstrap.lua index 787feab..bb547ef 100644 --- a/lua/core/bootstrap.lua +++ b/lua/core/bootstrap.lua @@ -1,31 +1,33 @@ local M = {} -M.base46 = function() - vim.notify " Compiling base46 theme to bytecode ..." - - local repo = "https://github.com/NvChad/base46" - local tmp_path = vim.fn.stdpath "config" .. "/tmp_base46" - - vim.fn.system { "git", "clone", "--depth", "1", "-b", "v2.0", repo, tmp_path } - vim.opt.rtp:prepend(tmp_path) - require("base46").compile() - - vim.fn.delete(tmp_path, "rf") +M.echo = function(str) + vim.cmd "redraw" + vim.api.nvim_echo({ { str, "Bold" } }, true, {}) end M.lazy = function(install_path) - vim.cmd "redraw|echo '' | echo ' Installing lazy.nvim & plugins ..'" + ------------- base46 --------------- + local lazy_path = vim.fn.stdpath "data" .. "/lazy/base46" + M.echo " Compiling base46 theme to bytecode ..." + + local base46_repo = "https://github.com/NvChad/base46" + vim.fn.system { "git", "clone", "--depth", "1", "-b", "v2.0", base46_repo, lazy_path } + vim.opt.rtp:prepend(lazy_path) + + require("base46").compile() + + --------- lazy.nvim --------------- + M.echo " Installing lazy.nvim & plugins ..." local repo = "https://github.com/folke/lazy.nvim.git" vim.fn.system { "git", "clone", "--filter=blob:none", "--branch=stable", repo, install_path } - vim.opt.rtp:prepend(install_path) - -- install plugins + compile their configs + -- install plugins require "plugins" vim.api.nvim_buf_delete(0, { force = true }) -- close lazy window - -- install mason packages + ---------- mason packages ------------- vim.schedule(function() vim.cmd "MasonInstallAll" local packages = table.concat(vim.g.mason_binaries_list, " ") @@ -36,7 +38,7 @@ M.lazy = function(install_path) if packages:match "%S" == nil then vim.schedule(function() vim.api.nvim_buf_delete(0, { force = true }) - vim.api.nvim_echo({ { "Now please read the docs at nvchad.com!! 󰕹 󰱬 ", "NvimInternalError" } }, true, {}) + M.echo "Now please read the docs at nvchad.com!! 󰕹 󰱬" end) end end) @@ -45,10 +47,10 @@ end M.gen_chadrc_template = function() if not vim.api.nvim_get_runtime_file("lua/custom/chadrc.lua", false)[1] then - local input = vim.fn.input "Do you want to install chadrc template? (y/n) : " + local input = vim.fn.input "Do you want to install example custom config? (y/n) : " if input == "y" then - vim.cmd "redraw|echo '' | echo 'cloning chadrc starter template repo..'" + M.echo "cloning example custom config repo ..." local repo = "https://github.com/NvChad/example_config" local install_path = vim.fn.stdpath "config" .. "/lua/custom" @@ -56,13 +58,14 @@ M.gen_chadrc_template = function() -- delete .git from that repo vim.fn.delete(vim.fn.stdpath "config" .. "/lua/custom/.git", "rf") - vim.cmd "redraw|echo '' | echo 'successfully installed chadrc template!'" + M.echo "successfully installed example custom config!" else local custom_dir = vim.fn.stdpath "config" .. "/lua/custom/" vim.fn.mkdir(custom_dir, "p") local file = io.open(custom_dir .. "chadrc.lua", "w") - file:write("local M = {}\n M.ui = {theme = 'onedark'}\n return M"):close() + file:write "local M = {}\n M.ui = {theme = 'onedark'}\n return M" + file:close() end end end diff --git a/lua/plugins/configs/mason.lua b/lua/plugins/configs/mason.lua index bcc8a38..8ccc313 100644 --- a/lua/plugins/configs/mason.lua +++ b/lua/plugins/configs/mason.lua @@ -1,5 +1,5 @@ local options = { - ensure_installed = { "lua-language-server", "stylua" }, -- not an option from mason.nvim + ensure_installed = { "lua-language-server" }, -- not an option from mason.nvim PATH = "skip",