From ae1dea8b6499afbc35d3386654f9d0d8d208d342 Mon Sep 17 00:00:00 2001 From: dklymenk <64093836+dklymenk@users.noreply.github.com> Date: Mon, 16 Aug 2021 16:31:03 +0300 Subject: [Feature] Expose null ls setup to user config (#1323) * expose null_ls setup to user config * add new config to example configs * fix tabs with stylua * change else statement in the example --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 0224a383..5844d79d 100644 --- a/init.lua +++ b/init.lua @@ -58,7 +58,7 @@ require("lsp").config() local null_status_ok, null_ls = pcall(require, "null-ls") if null_status_ok then null_ls.config {} - require("lspconfig")["null-ls"].setup {} + require("lspconfig")["null-ls"].setup(lvim.lsp.null_ls.setup) end local lsp_settings_status_ok, lsp_settings = pcall(require, "nlspsettings") -- cgit v1.2.3 From 33640834e4b07a8e9c5a6707ec0eadd863011ac0 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Fri, 20 Aug 2021 22:59:40 +0200 Subject: fix: set runtime directories correctly (#1354) * fix: set runtime directories correctly This also simplifies the way to invoke LunarVim to just be: `nvim -u "$LUNARVIM_RUNTIME_DIR/lvim/init.lua"` Fixes #1352 * use libuv to get homedir path --- init.lua | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 5844d79d..1d6cdc0f 100644 --- a/init.lua +++ b/init.lua @@ -1,16 +1,21 @@ -vim.cmd [[ - set packpath-=~/.config/nvim - set packpath-=~/.config/nvim/after - set packpath-=~/.local/share/nvim/site - set packpath^=~/.local/share/lunarvim/site - set packpath^=~/.config/lvim +-- {{{ Bootstrap +local home_dir = vim.loop.os_homedir() - set runtimepath-=~/.config/nvim - set runtimepath-=~/.config/nvim/after - set runtimepath+=~/.config/lvim - set runtimepath^=~/.local/share/lunarvim/lvim/after -]] --- vim.opt.rtp:append() instead of vim.cmd ? +vim.opt.rtp:append(home_dir .. "/.local/share/lunarvim/lvim") + +vim.opt.rtp:remove(home_dir .. "/.config/nvim") +vim.opt.rtp:remove(home_dir .. "/.config/nvim/after") +vim.opt.rtp:append(home_dir .. "/.config/lvim") +vim.opt.rtp:append(home_dir .. "/.config/lvim/after") + +vim.opt.rtp:remove(home_dir .. "/.local/share/nvim/site") +vim.opt.rtp:remove(home_dir .. "/.local/share/nvim/site/after") +vim.opt.rtp:append(home_dir .. "/.local/share/lunarvim/site") +vim.opt.rtp:append(home_dir .. "/.local/share/lunarvim/site/after") + +-- TODO: we need something like this: vim.opt.packpath = vim.opt.rtp +vim.cmd [[let &packpath = &runtimepath]] +-- }}} local function file_exists(name) local f = io.open(name, "r") -- cgit v1.2.3 From 00b895d9e9577f084cf577a07f9d6d6e1f7a4cac Mon Sep 17 00:00:00 2001 From: Luc Sinet Date: Wed, 25 Aug 2021 07:47:48 +0200 Subject: [Feature] Encapsulate config logic (#1338) * Define core/builtins, streamline status_color interface * Encapsulate configuration in its own module * Add fallback to lv-config.lua * Rectify settings loading order to allow overriding vim options * Move default-config into config/ module * replace uv.fs_stat with utils.is_file --- init.lua | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 1d6cdc0f..9724c2cc 100644 --- a/init.lua +++ b/init.lua @@ -17,34 +17,11 @@ vim.opt.rtp:append(home_dir .. "/.local/share/lunarvim/site/after") vim.cmd [[let &packpath = &runtimepath]] -- }}} -local function file_exists(name) - local f = io.open(name, "r") - if f ~= nil then - io.close(f) - return true - else - return false - end -end - -local lvim_path = os.getenv "HOME" .. "/.config/lvim/" -USER_CONFIG_PATH = lvim_path .. "config.lua" -local config_exist = file_exists(USER_CONFIG_PATH) -if not config_exist then - USER_CONFIG_PATH = lvim_path .. "lv-config.lua" - print "Rename ~/.config/lvim/lv-config.lua to config.lua" -end +local config = require "config" +config:init() +config:load() -require "default-config" local autocmds = require "core.autocmds" -require("settings").load_options() - -local status_ok, error = pcall(vim.cmd, "luafile " .. USER_CONFIG_PATH) -if not status_ok then - print("something is wrong with your " .. USER_CONFIG_PATH) - print(error) -end -require("settings").load_commands() autocmds.define_augroups(lvim.autocommands) local plugins = require "plugins" -- cgit v1.2.3 From a83fffdc80bbd50b9a797adcab8ce29f0fdfacc2 Mon Sep 17 00:00:00 2001 From: chaeing Date: Wed, 25 Aug 2021 23:40:25 -0700 Subject: [Bugfix] Load user's autocmd custom_groups (#1393) * Require core.autocmds before sourcing user config * Define augroups after sourcing user config --- init.lua | 3 --- 1 file changed, 3 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 9724c2cc..a3662a58 100644 --- a/init.lua +++ b/init.lua @@ -21,9 +21,6 @@ local config = require "config" config:init() config:load() -local autocmds = require "core.autocmds" -autocmds.define_augroups(lvim.autocommands) - local plugins = require "plugins" local plugin_loader = require("plugin-loader").init() plugin_loader:load { plugins, lvim.plugins } -- cgit v1.2.3 From 5b94e3cee2c4405e98c9c0e8769670723a1f4bae Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Thu, 26 Aug 2021 12:49:29 +0200 Subject: fix logging when plenary is not available (#1390) --- init.lua | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'init.lua') diff --git a/init.lua b/init.lua index a3662a58..43c6d25d 100644 --- a/init.lua +++ b/init.lua @@ -24,6 +24,10 @@ config:load() local plugins = require "plugins" local plugin_loader = require("plugin-loader").init() plugin_loader:load { plugins, lvim.plugins } + +local Log = require("core.log").new_default() +Log:info "Starting LunarVim" + vim.g.colors_name = lvim.colorscheme -- Colorscheme must get called after plugins are loaded or it will break new installs. vim.cmd("colorscheme " .. lvim.colorscheme) -- cgit v1.2.3 From 27679f988fe187f9831ba7895c9c3a7ce2dd14f4 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Thu, 26 Aug 2021 20:32:16 +0200 Subject: [Refactor]: only allow a single logger (#1405) --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 43c6d25d..d253191e 100644 --- a/init.lua +++ b/init.lua @@ -25,7 +25,7 @@ local plugins = require "plugins" local plugin_loader = require("plugin-loader").init() plugin_loader:load { plugins, lvim.plugins } -local Log = require("core.log").new_default() +local Log = require "core.log" Log:info "Starting LunarVim" vim.g.colors_name = lvim.colorscheme -- Colorscheme must get called after plugins are loaded or it will break new installs. -- cgit v1.2.3 From 23952f14437be39056b1e89436e8aea76dfbb61d Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Fri, 27 Aug 2021 18:47:31 +0200 Subject: Fix missing "HOME" variable errors (#1415) Co-authored-by: MarcSchaetz --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index d253191e..3ed7d231 100644 --- a/init.lua +++ b/init.lua @@ -47,7 +47,7 @@ end local lsp_settings_status_ok, lsp_settings = pcall(require, "nlspsettings") if lsp_settings_status_ok then lsp_settings.setup { - config_home = os.getenv "HOME" .. "/.config/lvim/lsp-settings", + config_home = home_dir .. "/.config/lvim/lsp-settings", } end -- cgit v1.2.3