Merge branch 'main' of github.com:siduck76/NvChad into vim-fugitive

This commit is contained in:
Tavo Annus 2021-07-23 20:57:32 +03:00
commit 021b5c07f5
5 changed files with 12 additions and 31 deletions

View File

@ -1,21 +1,9 @@
require "options"
local chad_modules = { local chad_modules = {
"pluginList", "options",
"mappings", "mappings",
"utils" "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]) pcall(require, chad_modules[i])
end end
async:close()
end
)
)
async:send()

View File

@ -147,6 +147,13 @@ map("n", "<Esc>", ":noh<CR>", opt)
-- get out of terminal with jk -- get out of terminal with jk
map("t", "jk", "<C-\\><C-n>", opt) 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 -- Vim Fugitive
map("n", "<Leader>gs", ":Git<CR>", opt) map("n", "<Leader>gs", ":Git<CR>", opt)
map("n", "<Leader>gh", ":diffget //2<CR>", opt) map("n", "<Leader>gh", ":diffget //2<CR>", opt)

View File

@ -1,13 +1,6 @@
local opt = vim.opt local opt = vim.opt
local g = vim.g 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.ruler = false
opt.hidden = true opt.hidden = true
opt.ignorecase = true opt.ignorecase = true

View File

@ -198,7 +198,7 @@ return packer.startup(
} }
use { use {
"tweekmonster/startuptime.vim", "dstein64/vim-startuptime",
cmd = "StartupTime" cmd = "StartupTime"
} }

View File

@ -3,13 +3,6 @@ vim.g.nvchad_theme = "onedark"
local present, base16 = pcall(require, "base16") local present, base16 = pcall(require, "base16")
if present then 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) base16(base16.themes["onedark"], true)
require "highlights" require "highlights"
return true return true