From ff4b5b19de84d938f57d06b4b8664bec0dce85b7 Mon Sep 17 00:00:00 2001 From: Aaron Saw Min Sern <58265908+aaronsms@users.noreply.github.com> Date: Thu, 2 Sep 2021 23:29:56 +0800 Subject: fix runtime path (#1443) --- init.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 3ed7d231..03fa38ef 100644 --- a/init.lua +++ b/init.lua @@ -3,16 +3,16 @@ local home_dir = vim.loop.os_homedir() 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:prepend(home_dir .. "/.local/share/lunarvim/site") vim.opt.rtp:append(home_dir .. "/.local/share/lunarvim/site/after") +vim.opt.rtp:remove(home_dir .. "/.config/nvim") +vim.opt.rtp:remove(home_dir .. "/.config/nvim/after") +vim.opt.rtp:prepend(home_dir .. "/.config/lvim") +vim.opt.rtp:append(home_dir .. "/.config/lvim/after") + -- TODO: we need something like this: vim.opt.packpath = vim.opt.rtp vim.cmd [[let &packpath = &runtimepath]] -- }}} -- cgit v1.2.3 From 9ece2e5369de46962422837be3dce3b8e889805d Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Tue, 7 Sep 2021 19:23:14 -0400 Subject: feat: compe -> cmp (#1496) --- init.lua | 7 ------- 1 file changed, 7 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 03fa38ef..365eb61d 100644 --- a/init.lua +++ b/init.lua @@ -52,10 +52,3 @@ if lsp_settings_status_ok then end require("keymappings").setup() - --- TODO: these guys need to be in language files --- if lvim.lang.emmet.active then --- require "lsp.emmet-ls" --- end --- if lvim.lang.tailwindcss.active then --- require "lsp.tailwind -- cgit v1.2.3 From 009f004ce844209bec09efadaf768ac736e53c48 Mon Sep 17 00:00:00 2001 From: Chase Colman <5411+chase@users.noreply.github.com> Date: Thu, 9 Sep 2021 00:29:44 +0800 Subject: [Feature] Add modified version of impatient.nvim for caching (#1488) --- init.lua | 3 +++ 1 file changed, 3 insertions(+) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 365eb61d..cb23f633 100644 --- a/init.lua +++ b/init.lua @@ -17,6 +17,9 @@ vim.opt.rtp:append(home_dir .. "/.config/lvim/after") vim.cmd [[let &packpath = &runtimepath]] -- }}} +_G.PLENARY_DEBUG = false -- Plenary destroys cache with this undocumented flag set to true by default +require("impatient").enable_profile() + local config = require "config" config:init() config:load() -- cgit v1.2.3 From ad86b1920426577ca2d0e6d56c309a190455c14f Mon Sep 17 00:00:00 2001 From: Chase Colman <5411+chase@users.noreply.github.com> Date: Sun, 12 Sep 2021 14:15:29 +0800 Subject: refactor: add explicit setup for impatient (#1529) Co-authored-by: kylo252 <59826753+kylo252@users.noreply.github.com> --- init.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index cb23f633..9bccc33c 100644 --- a/init.lua +++ b/init.lua @@ -18,7 +18,10 @@ vim.cmd [[let &packpath = &runtimepath]] -- }}} _G.PLENARY_DEBUG = false -- Plenary destroys cache with this undocumented flag set to true by default -require("impatient").enable_profile() +require("impatient").setup { + path = vim.fn.stdpath "cache" .. "/lvim_cache", + enable_profiling = true, +} local config = require "config" config:init() -- cgit v1.2.3 From 8eed75d67f9cbcefb91c4cb5aac0ffd013be25cc Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Mon, 13 Sep 2021 11:28:15 +0200 Subject: refactor: use more flexible paths (#1381) --- init.lua | 53 ++++++++++------------------------------------------- 1 file changed, 10 insertions(+), 43 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 9bccc33c..f0edfcc7 100644 --- a/init.lua +++ b/init.lua @@ -1,60 +1,27 @@ --- {{{ Bootstrap -local home_dir = vim.loop.os_homedir() - -vim.opt.rtp:append(home_dir .. "/.local/share/lunarvim/lvim") - -vim.opt.rtp:remove(home_dir .. "/.local/share/nvim/site") -vim.opt.rtp:remove(home_dir .. "/.local/share/nvim/site/after") -vim.opt.rtp:prepend(home_dir .. "/.local/share/lunarvim/site") -vim.opt.rtp:append(home_dir .. "/.local/share/lunarvim/site/after") - -vim.opt.rtp:remove(home_dir .. "/.config/nvim") -vim.opt.rtp:remove(home_dir .. "/.config/nvim/after") -vim.opt.rtp:prepend(home_dir .. "/.config/lvim") -vim.opt.rtp:append(home_dir .. "/.config/lvim/after") - --- TODO: we need something like this: vim.opt.packpath = vim.opt.rtp -vim.cmd [[let &packpath = &runtimepath]] --- }}} +if os.getenv "LUNARVIM_RUNTIME_DIR" then + local path_sep = vim.loop.os_uname().version:match "Windows" and "\\" or "/" + vim.opt.rtp:append(os.getenv "LUNARVIM_RUNTIME_DIR" .. path_sep .. "lvim") +end -_G.PLENARY_DEBUG = false -- Plenary destroys cache with this undocumented flag set to true by default -require("impatient").setup { - path = vim.fn.stdpath "cache" .. "/lvim_cache", - enable_profiling = true, -} +require("bootstrap"):init() local config = require "config" -config:init() +-- config:init() config:load() local plugins = require "plugins" -local plugin_loader = require("plugin-loader").init() -plugin_loader:load { plugins, lvim.plugins } +require("plugin-loader"):load { plugins, lvim.plugins } local Log = require "core.log" -Log:info "Starting LunarVim" +Log:debug "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) -local utils = require "utils" -utils.toggle_autoformat() +require("utils").toggle_autoformat() local commands = require "core.commands" commands.load(commands.defaults) -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(lvim.lsp.null_ls.setup) -end - -local lsp_settings_status_ok, lsp_settings = pcall(require, "nlspsettings") -if lsp_settings_status_ok then - lsp_settings.setup { - config_home = home_dir .. "/.config/lvim/lsp-settings", - } -end +require("lsp").global_setup() require("keymappings").setup() -- cgit v1.2.3 From d01ba08eaec1640ac2d038893525b3ba0af25813 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Sun, 3 Oct 2021 16:13:46 +0200 Subject: refactor: auto-generate language configuration (#1584) Refactor the monolithic `lvim.lang` design into a more modular approach. IMPORTANT: run `:LvimUpdate` in order to generate the new ftplugin template files. --- init.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index f0edfcc7..c4fa5d35 100644 --- a/init.lua +++ b/init.lua @@ -18,10 +18,9 @@ Log:debug "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) -require("utils").toggle_autoformat() local commands = require "core.commands" commands.load(commands.defaults) -require("lsp").global_setup() - require("keymappings").setup() + +require("lsp").setup() -- cgit v1.2.3