mirror of
https://github.com/LunarVim/LunarVim.git
synced 2024-09-21 02:55:09 +02:00
Merge branch 'rolling'
This commit is contained in:
commit
8e834b19d7
6 changed files with 30 additions and 24 deletions
2
init.lua
2
init.lua
|
@ -21,6 +21,4 @@ vim.cmd("colorscheme " .. lvim.colorscheme)
|
||||||
local commands = require "lvim.core.commands"
|
local commands = require "lvim.core.commands"
|
||||||
commands.load(commands.defaults)
|
commands.load(commands.defaults)
|
||||||
|
|
||||||
require("lvim.keymappings").setup()
|
|
||||||
|
|
||||||
require("lvim.lsp").setup()
|
require("lvim.lsp").setup()
|
||||||
|
|
|
@ -5,6 +5,11 @@ local M = {}
|
||||||
local user_config_dir = get_config_dir()
|
local user_config_dir = get_config_dir()
|
||||||
local user_config_file = utils.join_paths(user_config_dir, "config.lua")
|
local user_config_file = utils.join_paths(user_config_dir, "config.lua")
|
||||||
|
|
||||||
|
local function apply_defaults(configs, defaults)
|
||||||
|
configs = configs or {}
|
||||||
|
return vim.tbl_deep_extend("keep", configs, defaults)
|
||||||
|
end
|
||||||
|
|
||||||
---Get the full path to the user configuration file
|
---Get the full path to the user configuration file
|
||||||
---@return string
|
---@return string
|
||||||
function M:get_user_config_path()
|
function M:get_user_config_path()
|
||||||
|
@ -27,11 +32,14 @@ function M:init()
|
||||||
local settings = require "lvim.config.settings"
|
local settings = require "lvim.config.settings"
|
||||||
settings.load_options()
|
settings.load_options()
|
||||||
|
|
||||||
|
local default_keymaps = require("lvim.keymappings").get_defaults()
|
||||||
|
lvim.keys = apply_defaults(lvim.keys, default_keymaps)
|
||||||
|
|
||||||
local autocmds = require "lvim.core.autocmds"
|
local autocmds = require "lvim.core.autocmds"
|
||||||
lvim.autocommands = autocmds.load_augroups()
|
lvim.autocommands = apply_defaults(lvim.autocommands, autocmds.load_augroups())
|
||||||
|
|
||||||
local lvim_lsp_config = require "lvim.lsp.config"
|
local lvim_lsp_config = require "lvim.lsp.config"
|
||||||
lvim.lsp = vim.deepcopy(lvim_lsp_config)
|
lvim.lsp = apply_defaults(lvim.lsp, vim.deepcopy(lvim_lsp_config))
|
||||||
|
|
||||||
local supported_languages = require "lvim.config.supported_languages"
|
local supported_languages = require "lvim.config.supported_languages"
|
||||||
require("lvim.lsp.manager").init_defaults(supported_languages)
|
require("lvim.lsp.manager").init_defaults(supported_languages)
|
||||||
|
@ -80,6 +88,9 @@ function M:load(config_path)
|
||||||
|
|
||||||
autocmds.define_augroups(lvim.autocommands)
|
autocmds.define_augroups(lvim.autocommands)
|
||||||
|
|
||||||
|
vim.g.mapleader = (lvim.leader == "space" and " ") or lvim.leader
|
||||||
|
require("lvim.keymappings").load(lvim.keys)
|
||||||
|
|
||||||
local settings = require "lvim.config.settings"
|
local settings = require "lvim.config.settings"
|
||||||
settings.load_commands()
|
settings.load_commands()
|
||||||
end
|
end
|
||||||
|
@ -89,8 +100,8 @@ end
|
||||||
function M:reload()
|
function M:reload()
|
||||||
local lvim_modules = {}
|
local lvim_modules = {}
|
||||||
for module, _ in pairs(package.loaded) do
|
for module, _ in pairs(package.loaded) do
|
||||||
if module:match "lvim" then
|
if module:match "lvim.core" then
|
||||||
package.loaded.module = nil
|
package.loaded[module] = nil
|
||||||
table.insert(lvim_modules, module)
|
table.insert(lvim_modules, module)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -98,7 +109,6 @@ function M:reload()
|
||||||
M:init()
|
M:init()
|
||||||
M:load()
|
M:load()
|
||||||
|
|
||||||
require("lvim.keymappings").setup() -- this should be done before loading the plugins
|
|
||||||
local plugins = require "lvim.plugins"
|
local plugins = require "lvim.plugins"
|
||||||
utils.toggle_autoformat()
|
utils.toggle_autoformat()
|
||||||
local plugin_loader = require "lvim.plugin-loader"
|
local plugin_loader = require "lvim.plugin-loader"
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
local builtins = {
|
local builtins = {
|
||||||
"lvim.keymappings",
|
|
||||||
"lvim.core.which-key",
|
"lvim.core.which-key",
|
||||||
"lvim.core.gitsigns",
|
"lvim.core.gitsigns",
|
||||||
"lvim.core.cmp",
|
"lvim.core.cmp",
|
||||||
|
|
|
@ -71,7 +71,11 @@ M.setup = function()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
treesitter_configs.setup(lvim.builtin.treesitter)
|
local opts = vim.deepcopy(lvim.builtin.treesitter)
|
||||||
|
|
||||||
|
-- avoid running any installers in headless mode since it's harder to detect failures
|
||||||
|
opts.ensure_installed = #vim.api.nvim_list_uis() == 0 and {} or opts.ensure_installed
|
||||||
|
treesitter_configs.setup(opts)
|
||||||
|
|
||||||
if lvim.builtin.treesitter.on_config_done then
|
if lvim.builtin.treesitter.on_config_done then
|
||||||
lvim.builtin.treesitter.on_config_done(treesitter_configs)
|
lvim.builtin.treesitter.on_config_done(treesitter_configs)
|
||||||
|
|
|
@ -57,13 +57,14 @@ end
|
||||||
-- Load key mappings for all provided modes
|
-- Load key mappings for all provided modes
|
||||||
-- @param keymaps A list of key mappings for each mode
|
-- @param keymaps A list of key mappings for each mode
|
||||||
function M.load(keymaps)
|
function M.load(keymaps)
|
||||||
|
keymaps = keymaps or {}
|
||||||
for mode, mapping in pairs(keymaps) do
|
for mode, mapping in pairs(keymaps) do
|
||||||
M.load_mode(mode, mapping)
|
M.load_mode(mode, mapping)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function M.config()
|
function M.get_defaults()
|
||||||
lvim.keys = {
|
local keys = {
|
||||||
---@usage change or add keymappings for insert mode
|
---@usage change or add keymappings for insert mode
|
||||||
insert_mode = {
|
insert_mode = {
|
||||||
-- 'jk' for quitting insert mode
|
-- 'jk' for quitting insert mode
|
||||||
|
@ -151,12 +152,14 @@ function M.config()
|
||||||
}
|
}
|
||||||
|
|
||||||
if vim.fn.has "mac" == 1 then
|
if vim.fn.has "mac" == 1 then
|
||||||
lvim.keys.normal_mode["<A-Up>"] = lvim.keys.normal_mode["<C-Up>"]
|
keys.normal_mode["<A-Up>"] = keys.normal_mode["<C-Up>"]
|
||||||
lvim.keys.normal_mode["<A-Down>"] = lvim.keys.normal_mode["<C-Down>"]
|
keys.normal_mode["<A-Down>"] = keys.normal_mode["<C-Down>"]
|
||||||
lvim.keys.normal_mode["<A-Left>"] = lvim.keys.normal_mode["<C-Left>"]
|
keys.normal_mode["<A-Left>"] = keys.normal_mode["<C-Left>"]
|
||||||
lvim.keys.normal_mode["<A-Right>"] = lvim.keys.normal_mode["<C-Right>"]
|
keys.normal_mode["<A-Right>"] = keys.normal_mode["<C-Right>"]
|
||||||
Log:debug "Activated mac keymappings"
|
Log:debug "Activated mac keymappings"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
return keys
|
||||||
end
|
end
|
||||||
|
|
||||||
function M.print(mode)
|
function M.print(mode)
|
||||||
|
@ -168,9 +171,4 @@ function M.print(mode)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function M.setup()
|
|
||||||
vim.g.mapleader = (lvim.leader == "space" and " ") or lvim.leader
|
|
||||||
M.load(lvim.keys)
|
|
||||||
end
|
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
|
@ -353,16 +353,13 @@ function setup_lvim() {
|
||||||
|
|
||||||
echo "Preparing Packer setup"
|
echo "Preparing Packer setup"
|
||||||
|
|
||||||
rm -f "$LUNARVIM_CONFIG_DIR/config.lua"
|
cp "$LUNARVIM_RUNTIME_DIR/lvim/utils/installer/config.example.lua" "$LUNARVIM_CONFIG_DIR/config.lua"
|
||||||
touch "$LUNARVIM_CONFIG_DIR/config.lua"
|
|
||||||
|
|
||||||
"$INSTALL_PREFIX/bin/lvim" --headless \
|
"$INSTALL_PREFIX/bin/lvim" --headless \
|
||||||
-c 'autocmd User PackerComplete quitall' \
|
-c 'autocmd User PackerComplete quitall' \
|
||||||
-c 'PackerSync'
|
-c 'PackerSync'
|
||||||
|
|
||||||
echo "Packer setup complete"
|
echo "Packer setup complete"
|
||||||
|
|
||||||
cp "$LUNARVIM_RUNTIME_DIR/lvim/utils/installer/config.example.lua" "$LUNARVIM_CONFIG_DIR/config.lua"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function update_lvim() {
|
function update_lvim() {
|
||||||
|
|
Loading…
Reference in a new issue