From acf5e17896db05857d6fb54d4f50da1f7a8f7eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= Date: Mon, 2 Jan 2023 10:08:52 +0100 Subject: [PATCH] nvim: improve lazy --- dot_config/nvim/init.lua | 5 +++- dot_config/nvim/lazy-lock.json | 18 +++++++------- .../{packages/init.lua => packages.lua} | 4 ++-- .../nvim/lua/configs/packages/neotree.lua | 24 +++++++++++-------- 4 files changed, 29 insertions(+), 22 deletions(-) rename dot_config/nvim/lua/configs/{packages/init.lua => packages.lua} (92%) diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua index 3f37f32..3440877 100644 --- a/dot_config/nvim/init.lua +++ b/dot_config/nvim/init.lua @@ -11,7 +11,10 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.runtimepath:prepend(lazypath) -require('lazy').setup('configs.packages', { install = {} }) +require('lazy').setup('configs.packages', { + install = { colorscheme = { 'gruvbox' } }, + rtp = { disable_plugins = { 'netrw' } } +}) require('configs.options').setup() require('configs.misc').setup() diff --git a/dot_config/nvim/lazy-lock.json b/dot_config/nvim/lazy-lock.json index de96ad4..8f529c2 100644 --- a/dot_config/nvim/lazy-lock.json +++ b/dot_config/nvim/lazy-lock.json @@ -12,26 +12,26 @@ "gruvbox": { "branch": "master", "commit": "2b5b1f777f0583ffb39086d6c16f39e6e37459c0" }, "indent-blankline.nvim": { "branch": "master", "commit": "c4c203c3e8a595bc333abaf168fcb10c13ed5fb7" }, "kommentary": { "branch": "main", "commit": "981d56735ecc13e3c52b2d0cae269f5b9dcfe8ff" }, - "lazy.nvim": { "branch": "main", "commit": "c7122d64cdf16766433588486adcee67571de6d0" }, + "lazy.nvim": { "branch": "main", "commit": "3974a6cbe38f7958c2e4f41c6f0d9a6c001a723d" }, "linediff.vim": { "branch": "main", "commit": "b4d3c3f03eed00caa741c2650e13db5b7b7ce0ef" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "32a7382a75a52e8ad05f4cec7eeb8bbfbe80d461" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "3b41f0d17139bb156f1acd907608f63e0e307caf" }, - "neodev.nvim": { "branch": "main", "commit": "8e06acf88e0621badd9499cfcafbce5ca97dfe8e" }, + "neodev.nvim": { "branch": "main", "commit": "c045c0fe93b1f9c78443d0f3b88660fffbcf64a7" }, "nette.vim": { "branch": "master", "commit": "3f5c7f61d3552856ba95b0285d4acb485c1d61ea" }, "nui.nvim": { "branch": "main", "commit": "4939282919885e1c83aff68ecb35b3cadf6015a9" }, - "null-ls.nvim": { "branch": "main", "commit": "647a1eeeefc43ce15d941972642210637c370471" }, - "nvim-cmp": { "branch": "main", "commit": "e55033fce468c9c578b946948807f2ac48a6ee08" }, - "nvim-lspconfig": { "branch": "master", "commit": "d066a47be7713dba46736aece1792a4e13aaf1de" }, + "null-ls.nvim": { "branch": "main", "commit": "d09d7d82cc26d63673cef85cb62895dd68aab6d8" }, + "nvim-cmp": { "branch": "main", "commit": "c49ad26e894e137e401b1d294948c46327877eaf" }, + "nvim-lspconfig": { "branch": "master", "commit": "6b43ce561d97412cc512b569db6938e44529293e" }, "nvim-navic": { "branch": "master", "commit": "7a2b823152fe4de65ee7925b0e32d26ed73bc57c" }, - "nvim-treesitter": { "branch": "master", "commit": "fb36ed4c9e962d9fbfa608cd4a5d9313b1e8a8b1" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "247e392a8beb28c5d43a1375f93f8f90f1cc11ad" }, + "nvim-treesitter": { "branch": "master", "commit": "b67822bf58b0fbf0c496ae21a177d02fa8388edf" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "d816761ec1ea4a605689bc5f4111088459cf74d4" }, "nvim-web-devicons": { "branch": "master", "commit": "05e1072f63f6c194ac6e867b567e6b437d3d4622" }, "nvim-yati": { "branch": "main", "commit": "b76ca0c8c4617b49c7572f055e7b9caed96f783f" }, "playground": { "branch": "master", "commit": "8a887bcf66017bd775a0fb19c9d8b7a4d6759c48" }, "plenary.nvim": { "branch": "master", "commit": "4b7e52044bbb84242158d977a50c4cbcd85070c7" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "schemastore.nvim": { "branch": "main", "commit": "f36196d7044da6abf13ed3abf824fd5f3625f35d" }, + "schemastore.nvim": { "branch": "main", "commit": "99cdee23ff1343da67c37b4dffb0821a8fdf82a6" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "fab3e2212e206f4f8b3bbaa656e129443c9b802e" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" }, "telescope.nvim": { "branch": "master", "commit": "a606bd10c79ec5989c76c49cc6f736e88b63f0da" }, @@ -39,5 +39,5 @@ "vdebug": { "branch": "master", "commit": "247f2be7fe3108038276615cb9493b82fced0001" }, "vim-matchup": { "branch": "master", "commit": "db5120dd9887c988de7cd973ddb951e465d413e5" }, "vim-vsnip": { "branch": "master", "commit": "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e" }, - "zig.vim": { "branch": "master", "commit": "c33e1e312fc0f9523d09d7ddb845ea5d52db41d0" } + "zig.vim": { "branch": "master", "commit": "c8caa9ab97334ca5af2d69900108bb4af20933c5" } } \ No newline at end of file diff --git a/dot_config/nvim/lua/configs/packages/init.lua b/dot_config/nvim/lua/configs/packages.lua similarity index 92% rename from dot_config/nvim/lua/configs/packages/init.lua rename to dot_config/nvim/lua/configs/packages.lua index 6f23eb9..61905e8 100644 --- a/dot_config/nvim/lua/configs/packages/init.lua +++ b/dot_config/nvim/lua/configs/packages.lua @@ -7,9 +7,9 @@ return { config = true, }, - { 'AndrewRadev/linediff.vim', cmd = 'LineDiffAdd' }, + { 'AndrewRadev/linediff.vim', cmd = 'Linediff' }, - { 'lukas-reineke/indent-blankline.nvim', event = "BufReadPre" }, + { 'lukas-reineke/indent-blankline.nvim', config = true }, { 'b3nj5m1n/kommentary', diff --git a/dot_config/nvim/lua/configs/packages/neotree.lua b/dot_config/nvim/lua/configs/packages/neotree.lua index cd96c12..44e859e 100644 --- a/dot_config/nvim/lua/configs/packages/neotree.lua +++ b/dot_config/nvim/lua/configs/packages/neotree.lua @@ -1,11 +1,18 @@ local M = { - 'nvim-neo-tree/neo-tree.nvim', - branch = 'v2.x', - dependencies = { - 'nvim-lua/plenary.nvim', - 'kyazdani42/nvim-web-devicons', -- not strictly required, but recommended - 'MunifTanjim/nui.nvim', - }, + 'nvim-neo-tree/neo-tree.nvim', + branch = 'v2.x', + lazy = false, + keys = { + { '', [[Neotree toggle]], { desc = 'Toggle Neotree' } }, + { '', [[Neotree reveal]], { desc = 'Show current file in Neotree' } }, + { 'G', [[Neotree git_status]], { desc = 'Neotree git status' } } + }, + cmd = 'Neotree', + dependencies = { + 'nvim-lua/plenary.nvim', + 'kyazdani42/nvim-web-devicons', -- not strictly required, but recommended + 'MunifTanjim/nui.nvim', + }, } function M.config() @@ -212,9 +219,6 @@ function M.config() } }) - vim.api.nvim_set_keymap('n', '', [[Neotree toggle]], {}) - vim.api.nvim_set_keymap('n', '', [[Neotree reveal]], {}) - vim.api.nvim_set_keymap('n', 'G', [[Neotree git_status]], {}) end return M