From e676d7fcb8aac01adec057e6a6f7030dd066c70c Mon Sep 17 00:00:00 2001 From: loctvl842 Date: Thu, 2 Mar 2023 15:00:55 +0700 Subject: [PATCH] fix: open `dashboard` after installing plugins --- lazy-lock.json | 58 ++++++++++++++--------------- lua/tvl/config/bufferline.lua | 4 +- lua/tvl/core/autocmds.lua | 5 --- lua/tvl/core/lazy.lua | 34 +++++++++-------- lua/tvl/core/resources/settings.lua | 19 ++++++---- lua/tvl/core/resources/ui.lua | 1 + 6 files changed, 63 insertions(+), 58 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 5cdb24b..5f40d21 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,69 +1,69 @@ { "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, - "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, + "LuaSnip": { "branch": "master", "commit": "f7c845749aba6096f041a73a26ba64f3817bab99" }, "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" }, - "barbecue.nvim": { "branch": "main", "commit": "b894a3696c03842eb2934ce0c856947508afe660" }, - "bufferline.nvim": { "branch": "main", "commit": "52d6acabb79c8c0942f8873a0ca7848eb2159267" }, + "barbecue.nvim": { "branch": "main", "commit": "23348f3979912fb36a1442fb0d07e8d2e739aea2" }, + "bufferline.nvim": { "branch": "main", "commit": "cbb798dd2db7841550cd2c6c6dde12dfda055928" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "compile-nvim": { "branch": "main", "commit": "f7ad312ec5d0ae4a0554a7e52349ee371b868a5d" }, - "dashboard-nvim": { "branch": "master", "commit": "398ba8d9390c13c87a964cbca756319531fffdb7" }, + "dashboard-nvim": { "branch": "master", "commit": "6b401614feea1046c1b36f30c5f6f476eab79296" }, "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" }, "fidget.nvim": { "branch": "main", "commit": "688b4fec4517650e29c3e63cfbb6e498b3112ba1" }, - "friendly-snippets": { "branch": "main", "commit": "6fa50a94ba5378bb73013a6e163376d8e69bd8a5" }, - "gitsigns.nvim": { "branch": "main", "commit": "bb808fc7376ed7bac0fbe8f47b83d4bf01738167" }, + "friendly-snippets": { "branch": "main", "commit": "543667fccf842b509bfecc80aba558f73a4e7c88" }, + "gitsigns.nvim": { "branch": "main", "commit": "3b6c0a6412b31b91eb26bb8f712562cf7bb1d3be" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, "lazy.nvim": { "branch": "main", "commit": "26d121ea13bee96b079403cee6598f04969d4983" }, "lsp-inlayhints.nvim": { "branch": "main", "commit": "84ca3abe8aaecbb5b30ad89e4701d4a9c821b72c" }, - "lsp_signature.nvim": { "branch": "master", "commit": "4665921ff8e30601c7c1328625b3abc1427a6143" }, - "lspsaga.nvim": { "branch": "main", "commit": "ddcc29e2fee63b33119abad76b12cbda5fa048a7" }, + "lsp_signature.nvim": { "branch": "master", "commit": "6f6252f63b0baf0f2224c4caea33819a27f3f550" }, + "lspsaga.nvim": { "branch": "main", "commit": "438b54cba00fca27d280ae4d9242615282045bcb" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "3f9c0ea157e88b08e2d11ec65002eeb6e421f0da" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "29ce60f9a16fef3de682a9365ef635f24ae92bf9" }, - "mason.nvim": { "branch": "main", "commit": "4a514a382b242578dd5971447a5e08f52bee7a8a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "08d074cd0c4d40e5b6033a67246f46072ecfe38e" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "d7dd97cbe95e06857449e801b89a59a6b3701fb4" }, + "mason.nvim": { "branch": "main", "commit": "643206e3f299dc28fd8d2fc55746abd75dd64e36" }, "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" }, - "mini.comment": { "branch": "main", "commit": "9fc3fe43129e8c2611bd21b8f50af8c0d0742533" }, + "mini.comment": { "branch": "main", "commit": "5e8c7f75c48d958ef84ed75772b0263284c8621d" }, "mini.indentscope": { "branch": "main", "commit": "ff1e68b5c01426f9dfff3278dd1b10c9b5f000a1" }, - "mini.pairs": { "branch": "main", "commit": "4ebc1ff8d77fe75e8f219432302800ca29e17614" }, - "monokai-pro.nvim": { "branch": "master", "commit": "ae053118b5c4885e14cb34a0bc53162d6c8a7fe1" }, + "mini.pairs": { "branch": "main", "commit": "61811b4f3e29dc4926f8418dd64aebe0013914c2" }, + "monokai-pro.nvim": { "branch": "master", "commit": "92c3aa691aead86ee5840b431fed1d6a2498650f" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "f3fd905a8c129863ce8314866f5b8d1bba6b97e2" }, "noice.nvim": { "branch": "main", "commit": "d8a1f3056ad713b5d471048f8d029264828e22c0" }, "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, "null-ls.nvim": { "branch": "main", "commit": "689cdd78f70af20a37b5309ebc287ac645ae4f76" }, "nvim-cmp": { "branch": "main", "commit": "01f697a68905f9dcae70960a9eb013695a17f9a2" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, - "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, + "nvim-jdtls": { "branch": "master", "commit": "db08bfb87300fca2db91d15b64ca88a62970fb58" }, "nvim-lightbulb": { "branch": "master", "commit": "56b9ce31ec9d09d560fe8787c0920f76bc208297" }, - "nvim-lspconfig": { "branch": "master", "commit": "62856b20751b748841b0f3ec5a10b1e2f6a6dbc9" }, + "nvim-lspconfig": { "branch": "master", "commit": "95b7a69bc6da2a6a740584ea3c555e5327638b7d" }, "nvim-navic": { "branch": "master", "commit": "7e9d2b2b601149fecdccd11b516acb721e571fe6" }, - "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, + "nvim-notify": { "branch": "master", "commit": "9c987081390753b625e2d94e749e80e9b4a3e082" }, "nvim-scrollbar": { "branch": "main", "commit": "75210c554e935740448cfb532d8a671ae544bb1b" }, "nvim-tree.lua": { "branch": "master", "commit": "362ecbeed69fae91a287004619decadcb6f7c113" }, - "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, + "nvim-treesitter": { "branch": "master", "commit": "252c1011c4bae91d25a8c54be4ed1a7b341c088c" }, "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" }, "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, - "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, + "nvim-ufo": { "branch": "main", "commit": "b70c9ef0f8e2673a11387a39185ff249e00df19f" }, "nvim-web-devicons": { "branch": "master", "commit": "c2c2317f356c8b7da0252f5da758f71bb60bb6b2" }, "peek.nvim": { "branch": "master", "commit": "7fb50a540edf28a99e8f3871e093dff65d5e493d" }, "persistence.nvim": { "branch": "main", "commit": "adcf6913693a0434665d162ee45a186230496f8a" }, "playground": { "branch": "master", "commit": "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "project.nvim": { "branch": "main", "commit": "1c2e9c93c7c85126c2197f5e770054f53b1926fb" }, - "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, + "promise-async": { "branch": "main", "commit": "7fa127fa80e7d4d447e0e2c78e99af4355f4247b" }, "renamer.nvim": { "branch": "master", "commit": "1614d466df53899f11dd5395eaac3c09a275c384" }, - "rnvimr": { "branch": "main", "commit": "4f4fbd29e2e0869bea9a8376e06fca4331de60c9" }, - "statuscol.nvim": { "branch": "main", "commit": "fa9054b576fbaea512f5f19b01c8e896692c20ac" }, - "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, - "toggleterm.nvim": { "branch": "main", "commit": "a5638b2206c3930a16a24e5c184dddd572f8cd34" }, - "tokyonight.nvim": { "branch": "main", "commit": "735e94f3b36ae8b0caa30d1806eb2fa1c3619ca6" }, - "vim-bbye": { "branch": "master", "commit": "903f5eb17f72ebf7b0b1524bbb792c0b36761af6" }, + "rnvimr": { "branch": "main", "commit": "5edff6189cb0f4fae77ee751de5109a8f87cb9c7" }, + "statuscol.nvim": { "branch": "main", "commit": "e2dd7be695585a0f745bcf7c2a547a7c5af663bc" }, + "telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" }, + "toggleterm.nvim": { "branch": "main", "commit": "31d38d11390bcd35a568fcc65a79b7d6ec89de62" }, + "tokyonight.nvim": { "branch": "main", "commit": "1c17f9e65b1e843ef64a8ef53211f05179e7d7c3" }, + "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" }, "vim-illuminate": { "branch": "master", "commit": "49062ab1dd8fec91833a69f0a1344223dd59d643" }, - "vim-startuptime": { "branch": "master", "commit": "5f52ed26e0296a3e1d1453935f417e5808eefab8" }, - "vim-visual-multi": { "branch": "master", "commit": "1c9207b28c8898ab01b54e6d6b61b0b820a814bc" }, - "which-key.nvim": { "branch": "main", "commit": "5224c261825263f46f6771f1b644cae33cd06995" }, + "vim-startuptime": { "branch": "master", "commit": "6580cf539c33a212f4f5542068a3b4dd2b3ad834" }, + "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" }, + "which-key.nvim": { "branch": "main", "commit": "454fe081e6427fb27cd5ebd886fff999c447c859" }, "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" } } \ No newline at end of file diff --git a/lua/tvl/config/bufferline.lua b/lua/tvl/config/bufferline.lua index b548730..3036010 100644 --- a/lua/tvl/config/bufferline.lua +++ b/lua/tvl/config/bufferline.lua @@ -9,14 +9,14 @@ bufferline.setup({ text = "EXPLORER", padding = 0, text_align = "center", - highlight = "Offset", + highlight = "Directory", }, { filetype = "NvimTree", text = "EXPLORER", padding = 0, text_align = "center", - highlight = "Offset", + highlight = "Directory", }, }, buffer_close_icon = "", diff --git a/lua/tvl/core/autocmds.lua b/lua/tvl/core/autocmds.lua index 5737eed..b6b31b3 100644 --- a/lua/tvl/core/autocmds.lua +++ b/lua/tvl/core/autocmds.lua @@ -101,11 +101,6 @@ vim.api.nvim_create_autocmd({ "FileType" }, { callback = function() vim.cmd([[wincmd L]]) end, }) -vim.api.nvim_create_autocmd("User", { - pattern = { "LazyDone", "LazyInstall" }, - callback = function() vim.cmd([[Dashboard]]) end, -}) - vim.api.nvim_create_autocmd({ "TermOpen" }, { pattern = { "*" }, callback = function() diff --git a/lua/tvl/core/lazy.lua b/lua/tvl/core/lazy.lua index 416d330..fc7a09c 100644 --- a/lua/tvl/core/lazy.lua +++ b/lua/tvl/core/lazy.lua @@ -1,13 +1,7 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", - lazypath, - }) + vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", + lazypath }) end vim.opt.rtp:prepend(vim.env.LAZY or lazypath) @@ -16,14 +10,24 @@ require("lazy").setup({ spec = "tvl.core.resources", defaults = { lazy = false, - version = "*", + version = false, -- always use the latest git commit + -- version = "*", -- try installing the latest stable version for plugins that support semver }, - install = { - colorscheme = { - "monokai-pro", + install = { colorscheme = { "monokai-pro", "habamax" } }, + checker = { enabled = false }, + performance = { + rtp = { + -- disable some rtp plugins + disabled_plugins = { + "gzip", + -- "matchit", + -- "matchparen", + -- "netrwPlugin", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, }, }, - checker = { - enabled = false, - }, }) diff --git a/lua/tvl/core/resources/settings.lua b/lua/tvl/core/resources/settings.lua index 851183c..6edd4aa 100644 --- a/lua/tvl/core/resources/settings.lua +++ b/lua/tvl/core/resources/settings.lua @@ -22,12 +22,17 @@ load("options") -- after installing missing plugins -- autocmds and keymaps can wait to load -vim.api.nvim_create_autocmd("User", { - pattern = "VeryLazy", - callback = function() - load("autocmds") - load("keymaps") - end, -}) +if vim.fn.argc( -1) == 0 then + vim.api.nvim_create_autocmd("User", { + pattern = "VeryLazy", + callback = function() + load("autocmds") + load("keymaps") + end, + }) +else + load("autocmds") + load("keymaps") +end return {} diff --git a/lua/tvl/core/resources/ui.lua b/lua/tvl/core/resources/ui.lua index a945a8d..695dc5d 100644 --- a/lua/tvl/core/resources/ui.lua +++ b/lua/tvl/core/resources/ui.lua @@ -23,6 +23,7 @@ return { { "nvim-lualine/lualine.nvim", + lazy = true, config = function() require("tvl.config.lualine").load() end