minor updates to fix bugs
This commit is contained in:
parent
ecf2107cb3
commit
ef9de2c748
@ -1,2 +1,2 @@
|
|||||||
require "lazyvim" -- my config based on folkes LazyVim starter
|
require("lazyvim") -- my config based on folkes LazyVim starter
|
||||||
-- require("chris") -- my config based on Christian Chiarullis work
|
-- require("chris") -- my config based on Christian Chiarullis work
|
||||||
|
|||||||
@ -37,7 +37,7 @@ local options = {
|
|||||||
sidescrolloff = 8,
|
sidescrolloff = 8,
|
||||||
guifont = "monospace:h17",
|
guifont = "monospace:h17",
|
||||||
title = true,
|
title = true,
|
||||||
spelllang = "en_us",
|
spelllang = "en_gb",
|
||||||
autowrite = true,
|
autowrite = true,
|
||||||
confirm = true,
|
confirm = true,
|
||||||
formatoptions = "jcroqlnt", -- tcqj
|
formatoptions = "jcroqlnt", -- tcqj
|
||||||
|
|||||||
@ -18,6 +18,8 @@ vim.api.nvim_set_keymap("n", "<leader>L", "<cmd>:Lazy<cr>", { desc = "Lazy GUI"
|
|||||||
|
|
||||||
vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
|
vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
|
||||||
|
|
||||||
|
require("lazyvim.config").setup()
|
||||||
|
|
||||||
if not vim.g.vscode then
|
if not vim.g.vscode then
|
||||||
require("lazy").setup({
|
require("lazy").setup({
|
||||||
spec = "lazyvim.plugins",
|
spec = "lazyvim.plugins",
|
||||||
|
|||||||
@ -1,33 +0,0 @@
|
|||||||
local function load(name)
|
|
||||||
local Util = require("lazy.core.util")
|
|
||||||
-- always load lazyvim, then user file
|
|
||||||
for _, mod in ipairs({ "lazyvim.config." .. name, "config." .. name }) do
|
|
||||||
Util.try(function()
|
|
||||||
require(mod)
|
|
||||||
end, {
|
|
||||||
msg = "Failed loading " .. mod,
|
|
||||||
on_error = function(msg)
|
|
||||||
local modpath = require("lazy.core.cache").find(mod)
|
|
||||||
if modpath then
|
|
||||||
Util.error(msg)
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- load options here, before lazy init while sourcing plugin modules
|
|
||||||
-- this is needed to make sure options will be correctly applied
|
|
||||||
-- after installing missing plugins
|
|
||||||
load("options")
|
|
||||||
|
|
||||||
-- autocmds and keymaps can wait to load
|
|
||||||
vim.api.nvim_create_autocmd("User", {
|
|
||||||
pattern = "VeryLazy",
|
|
||||||
callback = function()
|
|
||||||
load("autocmds")
|
|
||||||
load("keymaps")
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
return {}
|
|
||||||
Loading…
Reference in New Issue
Block a user