From ae6fa140cb0f0a1c676176515748583b49694524 Mon Sep 17 00:00:00 2001 From: "flyingscorpio@clevo" Date: Fri, 25 Nov 2022 09:52:43 +0100 Subject: [PATCH] Move plugin options to after file --- .../plugins/options => after/plugin}/completion.lua | 0 .../plugins/options => after/plugin}/indentline.lua | 0 .../{lua/plugins/options => after/plugin}/lsp.lua | 0 .../plugins/options => after/plugin}/lualine.lua | 0 .../plugins/options => after/plugin}/luasnip.lua | 0 .../plugins/options => after/plugin}/nerdtree.lua | 0 .../plugins/options => after/plugin}/telescope.lua | 0 .../plugins/options => after/plugin}/treesitter.lua | 0 .../{lua/plugins/options => after/plugin}/vimtex.lua | 0 .../plugins/options => after/plugin}/whitespace.lua | 0 roles/neovim/files/init.lua | 3 +-- roles/neovim/files/lua/{plugins => }/packer.lua | 0 roles/neovim/files/lua/plugins/options/init.lua | 12 ------------ roles/neovim/tasks/main.yml | 6 +++++- 14 files changed, 6 insertions(+), 15 deletions(-) rename roles/neovim/files/{lua/plugins/options => after/plugin}/completion.lua (100%) rename roles/neovim/files/{lua/plugins/options => after/plugin}/indentline.lua (100%) rename roles/neovim/files/{lua/plugins/options => after/plugin}/lsp.lua (100%) rename roles/neovim/files/{lua/plugins/options => after/plugin}/lualine.lua (100%) rename roles/neovim/files/{lua/plugins/options => after/plugin}/luasnip.lua (100%) rename roles/neovim/files/{lua/plugins/options => after/plugin}/nerdtree.lua (100%) rename roles/neovim/files/{lua/plugins/options => after/plugin}/telescope.lua (100%) rename roles/neovim/files/{lua/plugins/options => after/plugin}/treesitter.lua (100%) rename roles/neovim/files/{lua/plugins/options => after/plugin}/vimtex.lua (100%) rename roles/neovim/files/{lua/plugins/options => after/plugin}/whitespace.lua (100%) rename roles/neovim/files/lua/{plugins => }/packer.lua (100%) delete mode 100644 roles/neovim/files/lua/plugins/options/init.lua diff --git a/roles/neovim/files/lua/plugins/options/completion.lua b/roles/neovim/files/after/plugin/completion.lua similarity index 100% rename from roles/neovim/files/lua/plugins/options/completion.lua rename to roles/neovim/files/after/plugin/completion.lua diff --git a/roles/neovim/files/lua/plugins/options/indentline.lua b/roles/neovim/files/after/plugin/indentline.lua similarity index 100% rename from roles/neovim/files/lua/plugins/options/indentline.lua rename to roles/neovim/files/after/plugin/indentline.lua diff --git a/roles/neovim/files/lua/plugins/options/lsp.lua b/roles/neovim/files/after/plugin/lsp.lua similarity index 100% rename from roles/neovim/files/lua/plugins/options/lsp.lua rename to roles/neovim/files/after/plugin/lsp.lua diff --git a/roles/neovim/files/lua/plugins/options/lualine.lua b/roles/neovim/files/after/plugin/lualine.lua similarity index 100% rename from roles/neovim/files/lua/plugins/options/lualine.lua rename to roles/neovim/files/after/plugin/lualine.lua diff --git a/roles/neovim/files/lua/plugins/options/luasnip.lua b/roles/neovim/files/after/plugin/luasnip.lua similarity index 100% rename from roles/neovim/files/lua/plugins/options/luasnip.lua rename to roles/neovim/files/after/plugin/luasnip.lua diff --git a/roles/neovim/files/lua/plugins/options/nerdtree.lua b/roles/neovim/files/after/plugin/nerdtree.lua similarity index 100% rename from roles/neovim/files/lua/plugins/options/nerdtree.lua rename to roles/neovim/files/after/plugin/nerdtree.lua diff --git a/roles/neovim/files/lua/plugins/options/telescope.lua b/roles/neovim/files/after/plugin/telescope.lua similarity index 100% rename from roles/neovim/files/lua/plugins/options/telescope.lua rename to roles/neovim/files/after/plugin/telescope.lua diff --git a/roles/neovim/files/lua/plugins/options/treesitter.lua b/roles/neovim/files/after/plugin/treesitter.lua similarity index 100% rename from roles/neovim/files/lua/plugins/options/treesitter.lua rename to roles/neovim/files/after/plugin/treesitter.lua diff --git a/roles/neovim/files/lua/plugins/options/vimtex.lua b/roles/neovim/files/after/plugin/vimtex.lua similarity index 100% rename from roles/neovim/files/lua/plugins/options/vimtex.lua rename to roles/neovim/files/after/plugin/vimtex.lua diff --git a/roles/neovim/files/lua/plugins/options/whitespace.lua b/roles/neovim/files/after/plugin/whitespace.lua similarity index 100% rename from roles/neovim/files/lua/plugins/options/whitespace.lua rename to roles/neovim/files/after/plugin/whitespace.lua diff --git a/roles/neovim/files/init.lua b/roles/neovim/files/init.lua index 3408bde..99bba50 100644 --- a/roles/neovim/files/init.lua +++ b/roles/neovim/files/init.lua @@ -1,7 +1,6 @@ require('encoding') require('remaps') require('options') -require('plugins.packer') -require('plugins.options') +require('packer') require('colors') require('autocommands') diff --git a/roles/neovim/files/lua/plugins/packer.lua b/roles/neovim/files/lua/packer.lua similarity index 100% rename from roles/neovim/files/lua/plugins/packer.lua rename to roles/neovim/files/lua/packer.lua diff --git a/roles/neovim/files/lua/plugins/options/init.lua b/roles/neovim/files/lua/plugins/options/init.lua deleted file mode 100644 index 10578c1..0000000 --- a/roles/neovim/files/lua/plugins/options/init.lua +++ /dev/null @@ -1,12 +0,0 @@ --- PLUGINS - OPTIONS - -require('plugins.options.lsp') -require('plugins.options.treesitter') -require('plugins.options.completion') -require('plugins.options.luasnip') -require('plugins.options.lualine') -require('plugins.options.telescope') -require('plugins.options.nerdtree') -require('plugins.options.vimtex') -require('plugins.options.indentline') -require('plugins.options.whitespace') diff --git a/roles/neovim/tasks/main.yml b/roles/neovim/tasks/main.yml index 15f1d28..472253b 100644 --- a/roles/neovim/tasks/main.yml +++ b/roles/neovim/tasks/main.yml @@ -155,6 +155,7 @@ with_items: - {path: '~/.config/nvim', mode: '0755'} - {path: '~/.config/nvim/lua', mode: '0755'} + - {path: '~/.config/nvim/after', mode: '0755'} - name: Copy configs copy: src={{ item.src }} dest={{ item.dest }} mode=0644 @@ -165,10 +166,13 @@ - name: Copy lua configs synchronize: - src: lua + src: "{{ item }}" dest: ~/.config/nvim/ recursive: true delete: true + with_items: + - lua + - after - name: Run PackerSync command: nvim --headless -c 'autocmd User PackerComplete quitall' -c PackerSync