diff --git a/.gitmodules b/.gitmodules index 6704713..c83586e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "contrib/vim-plug"] - path = contrib/vim-plug - url = https://github.com/junegunn/vim-plug [submodule "ansible_roles/firefox"] path = ansible_roles/firefox url = https://github.com/staticdev/ansible-role-firefox @@ -13,3 +10,6 @@ [submodule "pkgbuilds/portfolio-performance-bin"] path = pkgbuilds/portfolio-performance-bin url = https://aur.archlinux.org/portfolio-performance-bin.git +[submodule "pkgbuilds/vim-plug"] + path = pkgbuilds/vim-plug + url = https://aur.archlinux.org/vim-plug.git diff --git a/contrib/vim-plug b/contrib/vim-plug deleted file mode 160000 index c3b6b7c..0000000 --- a/contrib/vim-plug +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c3b6b7c2971da730d66f6955d5c467db8dae536b diff --git a/pkgbuilds/vim-plug b/pkgbuilds/vim-plug new file mode 160000 index 0000000..8989fa1 --- /dev/null +++ b/pkgbuilds/vim-plug @@ -0,0 +1 @@ +Subproject commit 8989fa106c2febf9487e245031dee3f3c862b5ef diff --git a/playbook.yml b/playbook.yml index f287887..6e569a6 100644 --- a/playbook.yml +++ b/playbook.yml @@ -231,6 +231,8 @@ source ./env curl -sSf --proto '=https' https://download.spotify.com/debian/pubkey_6224F9941A8AA6D1.gpg | gpg --import - + - name: vim-plug + - set_fact: aur_packages: "{{ aur_packages|map(attribute='dependencies', default=[]) | flatten + aur_packages }}" diff --git a/user.yml b/user.yml index b5baa5c..21cd6fa 100644 --- a/user.yml +++ b/user.yml @@ -251,25 +251,6 @@ - dotfiles - block: - - name: create intermediate directories for vim-plug - file: - path: "{{ item }}" - state: directory - with_items: - - ~/.local/ - - ~/.local/share/ - - ~/.local/share/nvim/ - - ~/.local/share/nvim/site/ - - ~/.local/share/nvim/site/autoload/ - - - name: install vim-plug - copy: - src: contrib/vim-plug/plug.vim - dest: ~/.local/share/nvim/site/autoload/plug.vim - owner: "{{ user.name }}" - group: "{{ user.name }}" - mode: "0644" - - name: install vim plugins command: nvim --headless +PlugInstall +qall register: vim_plugin_install