holm/LunarVim.LunarVim
1
0
Fork 0
mirror of https://github.com/LunarVim/LunarVim.git synced 2025-07-21 11:14:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:ChristianChiarulli/LunarVim into stable

Browse source
This commit is contained in:
christianchiarulli 2021-07-07 00:00:29 -04:00
commit 01fc816f31
4 changed files with 108 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

3
init.lua
View file

@ -8,6 +8,9 @@ require "lv-galaxyline"
require "lv-treesitter" require "lv-treesitter"
require "lv-which-key" require "lv-which-key"
require "lv-neoformat" require "lv-neoformat"
if O.plugin.dashboard.active then
require("lv-dashboard").config()
end
require "lsp" require "lsp"
if O.lang.emmet.active then if O.lang.emmet.active then
require "lsp.emmet-ls" require "lsp.emmet-ls"

15
lua/lv-nvimtree/init.lua
View file

@ -1,13 +1,13 @@
--if not package.loaded['nvim-tree.view'] then -- --if not package.loaded['nvim-tree.view'] then
-- return -- -- return
--end -- --end
--
local M = {} local M = {}
local status_ok, nvim_tree_config = pcall(require, "nvim-tree.config") local status_ok, nvim_tree_config = pcall(require, "nvim-tree.config")
if not status_ok then if not status_ok then
return return
end end
--
M.config = function() M.config = function()
local g = vim.g local g = vim.g
@ -69,9 +69,6 @@ local view_status_ok, view = pcall(require, "nvim-tree.view")
if not view_status_ok then if not view_status_ok then
return return
end end
--local view = require "nvim-tree.view"
M.toggle_tree = function() M.toggle_tree = function()
if view.win_open() then if view.win_open() then
require("nvim-tree").close() require("nvim-tree").close()
@ -86,5 +83,5 @@ M.toggle_tree = function()
require("nvim-tree").find_file(true) require("nvim-tree").find_file(true)
end end
end end
--
return M return M

8
lua/plugins.lua
View file

@ -61,7 +61,9 @@ return require("packer").startup(function(use)
use { use {
"kyazdani42/nvim-tree.lua", "kyazdani42/nvim-tree.lua",
-- event = "BufEnter",
-- cmd = "NvimTreeToggle", -- cmd = "NvimTreeToggle",
commit = "fd7f60e242205ea9efc9649101c81a07d5f458bb",
config = function() config = function()
require("lv-nvimtree").config() require("lv-nvimtree").config()
end, end,
@ -128,9 +130,9 @@ return require("packer").startup(function(use)
"ChristianChiarulli/dashboard-nvim", "ChristianChiarulli/dashboard-nvim",
event = "BufWinEnter", event = "BufWinEnter",
-- cmd = { "Dashboard", "DashboardNewFile", "DashboardJumpMarks" }, -- cmd = { "Dashboard", "DashboardNewFile", "DashboardJumpMarks" },
config = function() -- config = function()
require("lv-dashboard").config() -- require("lv-dashboard").config()
end, -- end,
disable = not O.plugin.dashboard.active, disable = not O.plugin.dashboard.active,
-- opt = true, -- opt = true,
} }

2
utils/installer/install.sh
View file

@ -100,7 +100,7 @@ installpacker() {
cloneconfig() { cloneconfig() {
echo "Cloning LunarVim configuration" 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/installer/lv-config.example.lua $HOME/.config/nvim/lv-config.lua
# mv $HOME/.config/nvim/utils/init.lua $HOME/.config/nvim/init.lua # mv $HOME/.config/nvim/utils/init.lua $HOME/.config/nvim/init.lua
nvim -u $HOME/.config/nvim/init.lua +PackerInstall nvim -u $HOME/.config/nvim/init.lua +PackerInstall