Merge branch 'main' of github.com:siduck76/NvChad into vim-fugitive
This commit is contained in:
commit
021b5c07f5
18
init.lua
18
init.lua
|
@ -1,21 +1,9 @@
|
|||
require "options"
|
||||
|
||||
local chad_modules = {
|
||||
"pluginList",
|
||||
"options",
|
||||
"mappings",
|
||||
"utils"
|
||||
}
|
||||
|
||||
local async
|
||||
async =
|
||||
vim.loop.new_async(
|
||||
vim.schedule_wrap(
|
||||
function()
|
||||
for i = 1, #chad_modules, 1 do
|
||||
for i = 1, #chad_modules, 1 do
|
||||
pcall(require, chad_modules[i])
|
||||
end
|
||||
async:close()
|
||||
end
|
||||
)
|
||||
)
|
||||
async:send()
|
||||
end
|
||||
|
|
|
@ -147,6 +147,13 @@ map("n", "<Esc>", ":noh<CR>", opt)
|
|||
-- get out of terminal with jk
|
||||
map("t", "jk", "<C-\\><C-n>", opt)
|
||||
|
||||
-- Packer commands till because we are not loading it at startup
|
||||
vim.cmd("silent! command PackerCompile lua require 'pluginList' require('packer').compile()")
|
||||
vim.cmd("silent! command PackerInstall lua require 'pluginList' require('packer').install()")
|
||||
vim.cmd("silent! command PackerStatus lua require 'pluginList' require('packer').status()")
|
||||
vim.cmd("silent! command PackerSync lua require 'pluginList' require('packer').sync()")
|
||||
vim.cmd("silent! command PackerUpdate lua require 'pluginList' require('packer').update()")
|
||||
|
||||
-- Vim Fugitive
|
||||
map("n", "<Leader>gs", ":Git<CR>", opt)
|
||||
map("n", "<Leader>gh", ":diffget //2<CR>", opt)
|
||||
|
|
|
@ -1,13 +1,6 @@
|
|||
local opt = vim.opt
|
||||
local g = vim.g
|
||||
|
||||
-- Turn these off at startup, will be enabled later just before loading the theme
|
||||
vim.cmd([[
|
||||
syntax off
|
||||
filetype off
|
||||
filetype plugin indent off
|
||||
]])
|
||||
|
||||
opt.ruler = false
|
||||
opt.hidden = true
|
||||
opt.ignorecase = true
|
||||
|
|
|
@ -198,7 +198,7 @@ return packer.startup(
|
|||
}
|
||||
|
||||
use {
|
||||
"tweekmonster/startuptime.vim",
|
||||
"dstein64/vim-startuptime",
|
||||
cmd = "StartupTime"
|
||||
}
|
||||
|
||||
|
|
|
@ -3,13 +3,6 @@ vim.g.nvchad_theme = "onedark"
|
|||
local present, base16 = pcall(require, "base16")
|
||||
|
||||
if present then
|
||||
-- enabled these options, was disabled in options.lua
|
||||
vim.cmd([[
|
||||
syntax on
|
||||
filetype on
|
||||
filetype plugin indent on
|
||||
]])
|
||||
|
||||
base16(base16.themes["onedark"], true)
|
||||
require "highlights"
|
||||
return true
|
||||
|
|
Loading…
Reference in New Issue