vim: lazy load as many plugins as possible

config/nvim/lua/fschauen/init.lua

@@ -10,3 +10,5 @@ require 'fschauen.filetypes'
 require 'fschauen.diagnostics'
 require 'fschauen.lazy'
 
+vim.cmd [[colorscheme gruvbox]]
+

config/nvim/lua/fschauen/plugins/colorizer.lua

@@ -3,6 +3,8 @@ return {
 
   cond = vim.opt.termguicolors:get(),
 
+  event = { 'BufReadPost', 'BufNewFile' },
+
   config = function()
     require('colorizer').setup(nil, {
       mode = 'foreground',

config/nvim/lua/fschauen/plugins/colorscheme.lua

@@ -1,14 +1,5 @@
 return {
-  {
+  { 'fschauen/solarized.nvim', dev = true, lazy =true },
-    'fschauen/solarized.nvim',
+  { 'fschauen/gruvbox.nvim', dev = true, lazy = true },
-    dev = true,
-  },
-  {
-    'fschauen/gruvbox.nvim',
-    dev = true,
-    config = function ()
-      vim.cmd [[colorscheme gruvbox]]
-    end,
-  },
 }
 

config/nvim/lua/fschauen/plugins/comment.lua

@@ -1,8 +1,9 @@
 return {
   'numToStr/Comment.nvim',
 
-  config = function()
+  lazy = false,       -- recommended in the README
-    require('Comment').setup {
+
+  opts = {
     padding = true,   -- Add a space between comment and the line
     sticky = true,    -- Whether the cursor should stay at its position
     ignore = nil,     -- Lines to be ignored while (un)comment
@@ -33,7 +34,5 @@ return {
 
     pre_hook = nil,    -- Function to call before (un)comment
     post_hook = nil,   -- Function to call after (un)comment
+  },
 }
-  end
-}
-

config/nvim/lua/fschauen/plugins/fugitive.lua

@@ -1,10 +1,10 @@
 return {
   'tpope/vim-fugitive',
 
-  config = function()
+  keys = {
-    vim.keymap.set('n', '<leader>gg', ':Git ')
+    { '<leader>gg', ':Git ' },
-    vim.keymap.set('n', '<leader>gs', '<cmd>tab Git<cr>')
+    { '<leader>gs', '<cmd>tab Git<cr>' },
-    vim.keymap.set('n', '<leader>gb', '<cmd>Git blame<cr>')
+    { '<leader>gb', '<cmd>Git blame<cr>' }
-  end,
+  },
 }
 

config/nvim/lua/fschauen/plugins/indent-blankline.lua

@@ -1,6 +1,8 @@
 return {
   'lukas-reineke/indent-blankline.nvim',
 
+  lazy = false,  -- trows an error when lazy loading
+
   config = function()
     require('indent_blankline').setup {
       enabled = false,

config/nvim/lua/fschauen/plugins/init.lua

@@ -1,7 +1,5 @@
 return {
   'nvim-lua/plenary.nvim',
   'milisims/nvim-luaref',
-  'keith/swift.vim',
-  'chr4/nginx.vim',
 }
 

config/nvim/lua/fschauen/plugins/neogit.lua

@@ -1,8 +1,7 @@
 return {
   'NeogitOrg/neogit',
 
-  config = function()
+  opts = {
-    require('neogit').setup {
     disable_hint = true,
     signs = {
       section = { '', '' },
@@ -15,9 +14,9 @@ return {
         ['<space>'] = 'Toggle',
       },
     },
-    }
+  },
 
-    vim.keymap.set('n', '<leader>gn', '<cmd>Neogit<cr>')
+  keys = {
-  end,
+    { '<leader>gn', '<cmd>Neogit<cr>' },
+  },
 }
-

config/nvim/lua/fschauen/plugins/nginx.lua

@@ -0,0 +1,5 @@
+return {
+  'chr4/nginx.vim',
+
+  ft = 'nginx',
+}

config/nvim/lua/fschauen/plugins/nvim-tree.lua

@@ -1,5 +1,9 @@
-local config = function()
+return {
-  require('nvim-tree').setup {
+  'nvim-tree/nvim-tree.lua',
+
+  dependencies = { 'nvim-tree/nvim-web-devicons' },
+
+  opts = {
     disable_netrw = true,       -- replace netrw with nvim-tree
     hijack_cursor = true,       -- keep the cursor on begin of the filename
     sync_root_with_cwd = true,  -- watch for `DirChanged` and refresh the tree
@@ -37,16 +41,12 @@ local config = function()
       group_empty = true,   -- folders that contain only one folder are grouped
       highlight_git = true, -- enable highlight based on git attributes
     },
-  }
+  },
-
+
-  vim.keymap.set('n', '<leader>nn', '<cmd>NvimTreeOpen<cr>')
+  keys = {
-  vim.keymap.set('n', '<leader>nf', '<cmd>NvimTreeFindFile<cr>')
+    { '<leader>nn', '<cmd>NvimTreeOpen<cr>' },
-  vim.keymap.set('n', '<leader>nc', '<cmd>NvimTreeClose<cr>')
+    { '<leader>nf', '<cmd>NvimTreeFindFile<cr>' },
-end
+    { '<leader>nc', '<cmd>NvimTreeClose<cr>' },
-
+  },
-return {
-  'nvim-tree/nvim-tree.lua',
-  dependencies = { 'nvim-tree/nvim-web-devicons' },
-  config = config,
 }
 

config/nvim/lua/fschauen/plugins/swift.lua

@@ -0,0 +1,6 @@
+  return {
+    'keith/swift.vim',
+
+    ft = 'swift',
+  }
+

config/nvim/lua/fschauen/plugins/telescope.lua

@@ -1,4 +1,4 @@
-T = {
+return {
   'nvim-telescope/telescope.nvim',
 
   dependencies = {
@@ -11,10 +11,7 @@ T = {
     },
   },
 
-  trigger = '<leader>f',  -- my addition, not used by lazy.nvim
+  config = function()
-}
-
-T.config = function()
     local telescope      = require 'telescope'
     local actions        = require 'telescope.actions'
     local actions_layout = require 'telescope.actions.layout'
@@ -125,7 +122,7 @@ T.config = function()
         for _, row in ipairs(list) do
           local lhs, picker, title, desc = row[1], row[2], row[3], row[4]
           local rhs = function() picker { prompt_title = ' ' .. title .. ' ' } end
-        vim.keymap.set(mode, T.trigger .. lhs, rhs, { desc = '  ' .. desc })
+          vim.keymap.set(mode, '<leader>f' .. lhs, rhs, { desc = '  ' .. desc })
         end
       end
     end
@@ -184,7 +181,6 @@ T.config = function()
     telescope.load_extension 'fzf'
     telescope.load_extension 'file_browser'
     vim.keymap.set('n', '<leader>fB', '<cmd>Telescope file_browser<cr>', { desc = ' [f]ile [B]rowser' })
-end
+  end,
-
+}
-return T
 

config/nvim/lua/fschauen/plugins/todo-comments.lua

@@ -1,13 +1,19 @@
-local telescope = vim.F.npcall(require, 'fschauen.plugins.telescope')
-local trigger = telescope and telescope.trigger or '<leader>f'
-
 return {
   'folke/todo-comments.nvim',
-  dependencies = { 'nvim-lua/plenary.nvim' },
+
+  dependencies = {
+    'nvim-lua/plenary.nvim'
+  },
+
   config = true,
-  event = { 'BufReadPost', 'BufNewFile' },
+
+  event = {
+    'BufReadPost',
+    'BufNewFile'
+  },
+
   keys = {
-    { trigger .. 't', '<cmd>TodoTelescope<cr>' },
+    { '<leader>ft', '<cmd>TodoTelescope<cr>' },
   },
 }
 

config/nvim/lua/fschauen/plugins/treesitter.lua

@@ -1,5 +1,15 @@
-local config = function()
+return {
-  require('nvim-treesitter.configs').setup {
+  'nvim-treesitter/nvim-treesitter',
+
+  dependencies = {
+    'nvim-treesitter/nvim-treesitter-refactor',
+    'nvim-treesitter/nvim-treesitter-textobjects',
+    'nvim-treesitter/playground',
+  },
+
+  main = 'nvim-treesitter.configs',
+
+  opts = {
     ensure_installed = {
       'bash',
       'c',
@@ -81,21 +91,14 @@ local config = function()
     playground = {
       enable = true,
     },
-  }
+  },
 
-  vim.keymap.set('n', '<leader>tp', '<cmd>TSPlaygroundToggle<cr>')
+  event = { 'BufReadPost', 'BufNewFile' },
-  vim.keymap.set('n', '<leader>th', '<cmd>TSHighlightCapturesUnderCursor<cr>')
-  vim.keymap.set('n', '<leader>tn', '<cmd>TSNodeUnderCursor<cr>')
-end
 
-return {
+  keys = {
-  'nvim-treesitter/nvim-treesitter',
+    { '<leader>tp', '<cmd>TSPlaygroundToggle<cr>' },
-
+    { '<leader>th', '<cmd>TSHighlightCapturesUnderCursor<cr>' },
-  config = config,
+    { '<leader>tn', '<cmd>TSNodeUnderCursor<cr>' },
-  dependencies = {
-    'nvim-treesitter/nvim-treesitter-refactor',
-    'nvim-treesitter/nvim-treesitter-textobjects',
-    'nvim-treesitter/playground',
   },
 }
 

config/nvim/lua/fschauen/plugins/trouble.lua

@@ -3,17 +3,15 @@ return {
 
   dependencies = { 'nvim-tree/nvim-web-devicons' },
 
-  config = function()
+  opts = {
-    local trouble = require('trouble')
-
-    trouble.setup {
     padding = false,  -- don't add an extra new line of top of the list
     auto_preview = false,  -- don't preview automatically
-    }
+  },
-
+
-    vim.keymap.set('n', '<leader>lt', '<cmd>TroubleToggle<cr>')
+  keys = {
-    vim.keymap.set('n', '<leader>lw', '<cmd>TroubleToggle workspace_diagnostics<cr>')
+    { '<leader>lt', '<cmd>TroubleToggle<cr>' },
-    vim.keymap.set('n', '<leader>ld', '<cmd>TroubleToggle document_diagnostics<cr>')
+    { '<leader>lw', '<cmd>TroubleToggle workspace_diagnostics<cr>' },
-  end
+    { '<leader>ld', '<cmd>TroubleToggle document_diagnostics<cr>' },
+  },
 }
 

config/nvim/lua/fschauen/plugins/undotree.lua

@@ -13,8 +13,10 @@ return {
     vim.g.undotree_TreeReturnShape = '╲'
   end,
 
-  config = function()
+  config = false,
-    vim.keymap.set('n', '<leader>u', '<cmd>UndotreeToggle<cr>')
+
-  end
+  keys = {
+    { '<leader>u', '<cmd>UndotreeToggle<cr>' },
+  },
 }
 

config/nvim/lua/fschauen/plugins/vim-better-whitespace.lua

@@ -11,11 +11,13 @@ return {
     }
   end,
 
-  config = function()
+  config = false,
-    vim.keymap.set('n', '<leader>ww', '<cmd>ToggleWhitespace<cr>')
+
-    vim.keymap.set('n', '<leader>wj', '<cmd>NextTrailingWhitespace<cr>')
+  keys ={
-    vim.keymap.set('n', '<leader>wk', '<cmd>PrevTrailingWhitespace<cr>')
+    { '<leader>ww', '<cmd>ToggleWhitespace<cr>' },
-    vim.keymap.set('n', '<leader>wd', '<cmd>StripWhitespace<cr>')
+    { '<leader>wj', '<cmd>NextTrailingWhitespace<cr>' },
-  end,
+    { '<leader>wk', '<cmd>PrevTrailingWhitespace<cr>' },
+    { '<leader>wd', '<cmd>StripWhitespace<cr>' },
+  },
 }
 

config/nvim/lua/fschauen/plugins/virt-column.lua

@@ -1,20 +1,24 @@
 return {
   'lukas-reineke/virt-column.nvim',
 
-  config = function()
+  opts = {
-    require('virt-column').setup {
     char = '│',
-    }
+  },
 
-    local toggle_virtual_column = function()
+  event = { 'BufReadPost', 'BufNewFile' },
+
+  keys ={
+    {
+      '<leader>sc',
+      function()
         if vim.o.colorcolumn == '' then
           vim.o.colorcolumn = '+1'  -- one after 'textwidth'
         else
           vim.o.colorcolumn = ''    -- none
         end
-    end
-
-    vim.keymap.set('n', '<leader>sc', toggle_virtual_column)
       end,
+      'Toggle virtual colunn'
+    },
+  },
 }