neovim

commit 5f91192c17a80c0ada60d623eefa7aa47008b458
parent 3fa32d654b20907b78342d991dd6d541a9db3b48
Author: Tomas Nemec <nemi@skaut.cz>
Date:   Mon, 29 Nov 2021 10:21:57 +0100

update

Diffstat:
M
lua/tms/p/aerial.lua
 | 
2
+-
M
lua/tms/plugins.lua
 | 
77
+++++++++++++++++++++++++++++++++++++++++------------------------------------

2 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/lua/tms/p/aerial.lua b/lua/tms/p/aerial.lua
@@ -13,7 +13,7 @@ M.setup = function()
   end)
 
   require('telescope').load_extension('aerial')
-  require('tms.lsp').add_attach(function(client, bufnr) aerial.on_attach(client, bufnr) end)
+  require('tms.lsp').add_attach(function(client, bufnr) require('aerial').on_attach(client, bufnr) end)
 end
 
 return M
diff --git a/lua/tms/plugins.lua b/lua/tms/plugins.lua
@@ -3,13 +3,16 @@ local packer = require('packer')
 return packer.startup({
   function()
     local use = packer.use
-
     use {'wbthomason/packer.nvim', opt = true}
 
     -- meta
     use {'tweekmonster/startuptime.vim'}
     use {'nathom/filetype.nvim'}
     use {'lewis6991/impatient.nvim'}
+    use {'tjdevries/astronauta.nvim'}
+
+    -- colorscheme
+    use {'tjdevries/colorbuddy.nvim'}
 
     -- spell
     use 'xxdavid/bez-diakritiky.vim'
@@ -42,11 +45,11 @@ return packer.startup({
     }
     use { -- undo tree
       'mbbill/undotree',
-      config = function()
+      setup = function()
         vim.g.undotree_WindowLayout = 2
         vim.g.undotree_SplitWidth = 50
-        vim.keymap.nnoremap {'<F5>', '<cmd>UndotreeToggle<cr>'}
       end,
+      config = function() vim.keymap.nnoremap {'<F5>', '<cmd>UndotreeToggle<cr>'} end,
     }
     use { -- animate height/width of window
       'camspiers/animate.vim',
@@ -79,8 +82,8 @@ return packer.startup({
     }
     use { -- beacon last cursor pos
       'danilamihailov/beacon.nvim',
+      setup = function() vim.g.beacon_ignore_filetypes = {'vifm'} end,
       config = function()
-        vim.g.beacon_ignore_filetypes = {'vifm'}
         vim.keymap.nmap {'*', '*:Beacon<cr>'}
         vim.keymap.nmap {'#', '#:Beacon<cr>'}
       end,
@@ -93,29 +96,30 @@ return packer.startup({
         vim.api.nvim_set_keymap('n', ':', '<cmd>lua require("fine-cmdline").open()<CR>', {noremap = true})
       end,
     } -- Nice thing... not sure if i like this
-
-    vim.g.loaded_matchparen = 1
-    vim.g.hiPairs_timeout = 5
-    vim.g.hiPairs_hl_matchPair = {
-      ['term'] = 'underline,bold',
-      ['cterm'] = 'bold',
-      ['ctermfg'] = 'none',
-      ['ctermbg'] = 'none',
-      ['guifg'] = 'none',
-      ['guibg'] = 'none',
-      ['gui'] = 'bold',
-    }
-    vim.g.hiPairs_hl_unmatchPair = {
-      ['term'] = 'underline,bold',
-      ['cterm'] = 'bold',
-      ['ctermfg'] = 'none',
-      ['ctermbg'] = 'none',
-      ['guifg'] = 'none',
-      ['guibg'] = 'none',
-      ['gui'] = 'bold',
-    }
     use { -- highlight parens
       'Yggdroot/hiPairs',
+      setup = function()
+        vim.g.loaded_matchparen = 1
+        vim.g.hiPairs_timeout = 5
+        vim.g.hiPairs_hl_matchPair = {
+          ['term'] = 'underline,bold',
+          ['cterm'] = 'bold',
+          ['ctermfg'] = 'none',
+          ['ctermbg'] = 'none',
+          ['guifg'] = 'none',
+          ['guibg'] = 'none',
+          ['gui'] = 'bold',
+        }
+        vim.g.hiPairs_hl_unmatchPair = {
+          ['term'] = 'underline,bold',
+          ['cterm'] = 'bold',
+          ['ctermfg'] = 'none',
+          ['ctermbg'] = 'none',
+          ['guifg'] = 'none',
+          ['guibg'] = 'none',
+          ['gui'] = 'bold',
+        }
+      end,
       config = function() end,
     }
     use 'chaoren/vim-wordmotion' -- word counts with _,.,-,...
@@ -187,7 +191,6 @@ return packer.startup({
         vim.keymap.vnoremap {'<leader>s', '<cmd>lua require("spectre").open_visual()<cr>'}
       end,
     }
-    use {'tjdevries/astronauta.nvim'}
     use {'luukvbaal/stabilize.nvim'}
 
     -- quickfix list
@@ -252,9 +255,6 @@ return packer.startup({
       end,
     }
 
-    -- colorscheme
-    use {'tjdevries/colorbuddy.nvim'}
-
     -- http
     use {disable = true, 'nicwest/vim-http'}
     use {
@@ -269,16 +269,16 @@ return packer.startup({
     }
 
     -- file manager
-    use {'vifm/vifm.vim', config = function() vim.g.vifm_replace_netrw = true end}
+    use {'vifm/vifm.vim', setup = function() vim.g.vifm_replace_netrw = true end}
 
     -- tasks
     use {'amirrezaask/actions.nvim', config = function() require('tms.p.actions').setup() end}
 
     -- filetype
     use 'tikhomirov/vim-glsl'
-    use {'mattn/emmet-vim'}
-    use {'windwp/nvim-ts-autotag', config = function() require('nvim-ts-autotag').setup {} end} -- html tag autoclose/rename
-    use {'vim-php/vim-composer', config = function() vim.g.composer_cmd = 'composer' end}
+    use {'mattn/emmet-vim', setup = function() vim.g.user_emmet_leader_key = '<C-Z>' end}
+    use {'windwp/nvim-ts-autotag', ft = {'html', 'php'}, config = function() require('nvim-ts-autotag').setup {} end} -- html tag autoclose/rename
+    use {'vim-php/vim-composer', setup = function() vim.g.composer_cmd = 'composer' end}
     use 'fpob/nette.vim'
     use 'baskerville/vim-sxhkdrc'
     use {'dart-lang/dart-vim-plugin', ft = {'dart'}}
@@ -325,7 +325,7 @@ return packer.startup({
     }
 
     -- lsp
-    use{  'neovim/nvim-lspconfig' ,config=function() require('tms.lsp').setup() end}
+    use {'neovim/nvim-lspconfig', config = function() require('tms.lsp').setup() end}
     use 'ii14/lsp-command'
     use 'williamboman/nvim-lsp-installer'
     use {
@@ -336,10 +336,15 @@ return packer.startup({
     use {'folke/lua-dev.nvim'}
     use {
       'jose-elias-alvarez/null-ls.nvim',
-      config = function() require('tms.p.nullls').setup() end,
       requires = {'nvim-lua/plenary.nvim', 'neovim/nvim-lspconfig'},
+      config = function() require('tms.p.nullls').setup() end,
+    }
+    use {
+      'stevearc/aerial.nvim',
+      after = {'telescope.nvim'},
+      require = {'neovim/nvim-lspconfig'},
+      config = function() require('tms.p.aerial').setup() end,
     }
-    use {'stevearc/aerial.nvim', config = function() require('tms.p.aerial').setup() end}
     -- use 'mfussenegger/nvim-jdtls'
 
     -- dap