Merge pull request #211 from Akianonymus/main

Theme switcher improvements | Packer Shenanigans
This commit is contained in:
siduck76 2021-08-03 11:41:05 +05:30 committed by GitHub
commit 927bde7187
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 18 deletions

View File

@ -157,8 +157,9 @@ main() {
if _NVIM="$(command -v nvim)"; then if _NVIM="$(command -v nvim)"; then
if _check_nvim_version; then if _check_nvim_version; then
printf "\n%s\n" "=> Neovim will now open." && sleep 1 printf "\n%s\n" "=> Neovim will now open." && sleep 1
"${_NVIM}" +"autocmd User PackerComplete ++once quitall" \ "${_NVIM}" +'autocmd User PackerComplete ++once lua print "Waiting for PackerCompile.." vim.cmd "PackerCompile"' \
+":lua require 'pluginList' vim.cmd('PackerSync')" +'autocmd User PackerCompileDone ++once quitall' \
+'lua print "Wait for PackerUpdate and PackerCompile to complete.." require "pluginList" vim.cmd "PackerUpdate"'
"${_NVIM}" "${_NVIM}"
else else
printf "Error: Neovim is installed, but version is lower than 0.5.x, install Neovim >= 5.x and then run nvim & do :PackerSync\n." printf "Error: Neovim is installed, but version is lower than 0.5.x, install Neovim >= 5.x and then run nvim & do :PackerSync\n."

View File

@ -79,9 +79,10 @@ if
) )
then then
-- This should only trigger when in need of PackerSync, so better do it -- This should only trigger when in need of PackerSync, so better do it
print("After completion of PackerSync, restart neovim.") print("After completion of PackerCompile, restart neovim.")
-- Trigger packer compile on PackerComplete, so it properly waits for PackerSync -- Trigger packer compile on PackerComplete, so it properly waits for PackerSync
vim.cmd 'autocmd User PackerComplete ++once lua require("packer").compile()' vim.cmd 'autocmd User PackerComplete ++once lua print "Waiting for PackerCompile.." require("packer").compile()'
vim.cmd 'autocmd User PackerCompileDone ++once echo "Packer Compile done, restart neovim."'
require "pluginList" require "pluginList"
require("packer").sync("telescope-fzf-native.nvim", "telescope-media-files.nvim") require("packer").update("telescope-fzf-native.nvim", "telescope-media-files.nvim")
end end

View File

@ -12,7 +12,8 @@ M.reload_theme = function(theme_name)
end end
if not pcall(require, "themes/" .. theme_name) then if not pcall(require, "themes/" .. theme_name) then
error("No such theme ( " .. theme_name .. " )") print("No such theme ( " .. theme_name .. " )")
return false
end end
vim.g.nvchad_theme = theme_name vim.g.nvchad_theme = theme_name
@ -20,16 +21,22 @@ M.reload_theme = function(theme_name)
-- reload the base16 theme -- reload the base16 theme
local ok, base16 = pcall(require, "base16") local ok, base16 = pcall(require, "base16")
if not ok then if not ok then
error("Error: Cannot load base16 plugin!") print("Error: Cannot load base16 plugin!")
return false
end end
base16(base16.themes[theme_name], true) base16(base16.themes[theme_name], true)
reload_plugin { if
not reload_plugin {
"highlights", "highlights",
"plugins.bufferline", "plugins.bufferline",
"galaxyline", "galaxyline",
"plugins.statusline" "plugins.statusline"
} }
then
print "Error: Not able to reload all plugins."
return false
end
-- now send the provider info to actual refresh -- now send the provider info to actual refresh
require("galaxyline.provider").async_load_providers:send() require("galaxyline.provider").async_load_providers:send()
@ -152,6 +159,7 @@ M.theme_switcher = function(opts)
if change then if change then
-- ask for confirmation to set as default theme -- ask for confirmation to set as default theme
local ans = string.lower(vim.fn.input("Set " .. new_theme .. " as default theme ? [y/N] ")) == "y" local ans = string.lower(vim.fn.input("Set " .. new_theme .. " as default theme ? [y/N] ")) == "y"
local_utils.clear_cmdline()
if ans then if ans then
local_utils.change_theme(current_theme, final_theme) local_utils.change_theme(current_theme, final_theme)
else else
@ -161,9 +169,11 @@ M.theme_switcher = function(opts)
end end
-- open a buffer and close it to reload the statusline -- open a buffer and close it to reload the statusline
vim.cmd("new|bwipeout") vim.cmd("new|bwipeout")
else
final_theme = current_theme
end end
-- set nvchad_theme global var -- set nvchad_theme global var
vim.g.nvchad_theme = current_theme vim.g.nvchad_theme = final_theme
end end
-- launch the telescope picker -- launch the telescope picker
picker:find() picker:find()

View File

@ -2,14 +2,17 @@ local M = {}
-- reload a plugin ( will try to load even if not loaded) -- reload a plugin ( will try to load even if not loaded)
-- can take a string or list ( table ) -- can take a string or list ( table )
-- return true or false
M.reload_plugin = function(plugins) M.reload_plugin = function(plugins)
local status = true
local function _reload_plugin(plugin) local function _reload_plugin(plugin)
local loaded = package.loaded[plugin] local loaded = package.loaded[plugin]
if loaded then if loaded then
package.loaded[plugin] = nil package.loaded[plugin] = nil
end end
if not pcall(require, plugin) then if not pcall(require, plugin) then
error("Error: Cannot load " .. plugin .. " plugin!") print("Error: Cannot load " .. plugin .. " plugin!")
status = false
end end
end end
@ -20,6 +23,7 @@ M.reload_plugin = function(plugins)
_reload_plugin(plugin) _reload_plugin(plugin)
end end
end end
return status
end end
-- return a table of available themes -- return a table of available themes
@ -73,7 +77,8 @@ end
-- 1st arg as current theme, 2nd as new theme -- 1st arg as current theme, 2nd as new theme
M.change_theme = function(current_theme, new_theme) M.change_theme = function(current_theme, new_theme)
if current_theme == nil or new_theme == nil then if current_theme == nil or new_theme == nil then
error "Provide current and new theme name" print "Error: Provide current and new theme name"
return false
end end
if current_theme == new_theme then if current_theme == new_theme then
return return
@ -87,10 +92,20 @@ M.change_theme = function(current_theme, new_theme)
local content = string.gsub(data, find, replace) local content = string.gsub(data, find, replace)
-- see if the find string exists in file -- see if the find string exists in file
if content == data then if content == data then
error("Cannot change default theme with " .. new_theme .. ", edit " .. file .. " manually") print("Error: Cannot change default theme with " .. new_theme .. ", edit " .. file .. " manually")
return false
else else
assert(M.file("w", file, content)) assert(M.file("w", file, content))
end end
end end
M.clear_cmdline = function()
vim.defer_fn(
function()
vim.cmd("echo")
end,
0
)
end
return M return M