diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index e33b580..60c394e 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -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 diff --git a/.config/nvim/lua/lazyvim/config/options.lua b/.config/nvim/lua/lazyvim/config/options.lua index 4de6e4d..0f12bd9 100644 --- a/.config/nvim/lua/lazyvim/config/options.lua +++ b/.config/nvim/lua/lazyvim/config/options.lua @@ -37,7 +37,7 @@ local options = { sidescrolloff = 8, guifont = "monospace:h17", title = true, - spelllang = "en_us", + spelllang = "en_gb", autowrite = true, confirm = true, formatoptions = "jcroqlnt", -- tcqj diff --git a/.config/nvim/lua/lazyvim/init.lua b/.config/nvim/lua/lazyvim/init.lua index 1c0d174..e7486f1 100644 --- a/.config/nvim/lua/lazyvim/init.lua +++ b/.config/nvim/lua/lazyvim/init.lua @@ -18,6 +18,8 @@ vim.api.nvim_set_keymap("n", "L", ":Lazy", { desc = "Lazy GUI" vim.opt.rtp:prepend(vim.env.LAZY or lazypath) +require("lazyvim.config").setup() + if not vim.g.vscode then require("lazy").setup({ spec = "lazyvim.plugins", diff --git a/.config/nvim/lua/lazyvim/plugins/config.lua b/.config/nvim/lua/lazyvim/plugins/config.lua deleted file mode 100644 index cf169d8..0000000 --- a/.config/nvim/lua/lazyvim/plugins/config.lua +++ /dev/null @@ -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 {}