mirror of
https://github.com/LunarVim/LunarVim.git
synced 2025-07-21 11:14:42 +02:00
Merge branch 'master' of github.com:ChristianChiarulli/LunarVim into stable
This commit is contained in:
commit
01fc816f31
4 changed files with 108 additions and 106 deletions
3
init.lua
3
init.lua
|
@ -8,6 +8,9 @@ require "lv-galaxyline"
|
|||
require "lv-treesitter"
|
||||
require "lv-which-key"
|
||||
require "lv-neoformat"
|
||||
if O.plugin.dashboard.active then
|
||||
require("lv-dashboard").config()
|
||||
end
|
||||
require "lsp"
|
||||
if O.lang.emmet.active then
|
||||
require "lsp.emmet-ls"
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
--if not package.loaded['nvim-tree.view'] then
|
||||
-- return
|
||||
--end
|
||||
|
||||
-- --if not package.loaded['nvim-tree.view'] then
|
||||
-- -- return
|
||||
-- --end
|
||||
--
|
||||
local M = {}
|
||||
local status_ok, nvim_tree_config = pcall(require, "nvim-tree.config")
|
||||
if not status_ok then
|
||||
return
|
||||
end
|
||||
|
||||
--
|
||||
M.config = function()
|
||||
local g = vim.g
|
||||
|
||||
|
@ -69,9 +69,6 @@ local view_status_ok, view = pcall(require, "nvim-tree.view")
|
|||
if not view_status_ok then
|
||||
return
|
||||
end
|
||||
|
||||
--local view = require "nvim-tree.view"
|
||||
|
||||
M.toggle_tree = function()
|
||||
if view.win_open() then
|
||||
require("nvim-tree").close()
|
||||
|
@ -86,5 +83,5 @@ M.toggle_tree = function()
|
|||
require("nvim-tree").find_file(true)
|
||||
end
|
||||
end
|
||||
|
||||
--
|
||||
return M
|
||||
|
|
|
@ -61,7 +61,9 @@ return require("packer").startup(function(use)
|
|||
|
||||
use {
|
||||
"kyazdani42/nvim-tree.lua",
|
||||
-- event = "BufEnter",
|
||||
-- cmd = "NvimTreeToggle",
|
||||
commit = "fd7f60e242205ea9efc9649101c81a07d5f458bb",
|
||||
config = function()
|
||||
require("lv-nvimtree").config()
|
||||
end,
|
||||
|
@ -128,9 +130,9 @@ return require("packer").startup(function(use)
|
|||
"ChristianChiarulli/dashboard-nvim",
|
||||
event = "BufWinEnter",
|
||||
-- cmd = { "Dashboard", "DashboardNewFile", "DashboardJumpMarks" },
|
||||
config = function()
|
||||
require("lv-dashboard").config()
|
||||
end,
|
||||
-- config = function()
|
||||
-- require("lv-dashboard").config()
|
||||
-- end,
|
||||
disable = not O.plugin.dashboard.active,
|
||||
-- opt = true,
|
||||
}
|
||||
|
|
|
@ -100,7 +100,7 @@ installpacker() {
|
|||
|
||||
cloneconfig() {
|
||||
echo "Cloning LunarVim configuration"
|
||||
git clone --branch stable https://github.com/ChristianChiarulli/lunarvim.git ~/.config/nvim
|
||||
git clone https://github.com/ChristianChiarulli/lunarvim.git ~/.config/nvim
|
||||
mv $HOME/.config/nvim/utils/installer/lv-config.example.lua $HOME/.config/nvim/lv-config.lua
|
||||
# mv $HOME/.config/nvim/utils/init.lua $HOME/.config/nvim/init.lua
|
||||
nvim -u $HOME/.config/nvim/init.lua +PackerInstall
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue