diff --git a/init.lua b/init.lua index 805fc32..49bc3ed 100644 --- a/init.lua +++ b/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 - pcall(require, chad_modules[i]) - end - async:close() - end - ) -) -async:send() +for i = 1, #chad_modules, 1 do + pcall(require, chad_modules[i]) +end diff --git a/lua/mappings.lua b/lua/mappings.lua index 5321a3b..cfd6e1b 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -147,6 +147,13 @@ map("n", "", ":noh", opt) -- get out of terminal with jk map("t", "jk", "", 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", "gs", ":Git", opt) map("n", "gh", ":diffget //2", opt) diff --git a/lua/options.lua b/lua/options.lua index cb62d38..a8ad934 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -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 diff --git a/lua/pluginList.lua b/lua/pluginList.lua index 568f008..6d476af 100644 --- a/lua/pluginList.lua +++ b/lua/pluginList.lua @@ -198,7 +198,7 @@ return packer.startup( } use { - "tweekmonster/startuptime.vim", + "dstein64/vim-startuptime", cmd = "StartupTime" } diff --git a/lua/theme.lua b/lua/theme.lua index 85bf895..5356706 100644 --- a/lua/theme.lua +++ b/lua/theme.lua @@ -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