From 0ebf9bdbb4e2c3388a2394a15617e06322252412 Mon Sep 17 00:00:00 2001
From: "flyingscorpio@clevo" <tfranken@protonmail.com>
Date: Thu, 11 Aug 2022 01:12:16 +0200
Subject: [PATCH] Rearrange installations for neovim

---
 roles/neovim/tasks/main.yml | 140 +++++++++++++++++++-----------------
 1 file changed, 76 insertions(+), 64 deletions(-)

diff --git a/roles/neovim/tasks/main.yml b/roles/neovim/tasks/main.yml
index c90ae7a..f593738 100644
--- a/roles/neovim/tasks/main.yml
+++ b/roles/neovim/tasks/main.yml
@@ -1,55 +1,83 @@
 ---
-- name: Install packages (Archlinux)
-  become: true
-  pacman:
-    name:
-      - vim
-      - python-pynvim
-      - neovim
-      - python-pylint
-      - python-black
-      - ansible-lint
-      - base-devel
-      - flake8
-      - mypy
-      - shellcheck
-      - cmake
-      - clang
-      - npm
-      - ripgrep
-      - bash-language-server
-      - lua-language-server
-      - texlab
+- name: Install (Archlinux)
+  block:
+    - name: Install packages (Archlinux)
+      become: true
+      pacman:
+        name:
+          - neovim
+          - python-pynvim
+          - base-devel
+          - cmake
+          - clang
+          - npm
+          - ripgrep
+    - name: Install linters (Archlinux)
+      become: true
+      pacman:
+        name:
+          - ansible-lint
+          - flake8
+          - mypy
+          - python-pylint
+          - python-black
+          - shellcheck
+    - name: Install language servers with pacman (Archlinux)
+      become: true
+      pacman:
+        name:
+          - bash-language-server
+          - lua-language-server
+          - texlab
+    - name: Install language servers with npm (Archlinux)
+      become: true
+      npm:
+        name: '@ansible/ansible-language-server'
+        global: true
+        state: present
   when:
     ansible_facts['distribution'] == 'Archlinux'
 
-- name: Install packages (Debian)
-  become: true
-  apt:
-    name:
-      - vim
-      - python3-pynvim
-      - neovim
-      - build-essential
-      - python3-dev
-      - pylint3
-      - ansible-lint
-      - flake8
-      - mypy
-      - shellcheck
-      - cmake
-      - clang
-      - npm
-      - ripgrep
-      - lua-language-server
-      - texlab
-  when:
-    ansible_facts['distribution'] == 'Debian'
-
-- name: Install neovim with pip for Debian
-  pip:
-    name: neovim
-    extra_args: --user
+- name: Install (Debian)
+  block:
+    - name: Install neovim with pip (Debian)
+      pip:
+        name: neovim
+        extra_args: --user
+    - name: Install packages (Debian)
+      become: true
+      apt:
+        name:
+          - python3-pynvim
+          - build-essential
+          - python3-dev
+          - cmake
+          - clang
+          - npm
+          - ripgrep
+    - name: Install linters (Debian)
+      become: true
+      apt:
+        name:
+          - ansible-lint
+          - flake8
+          - mypy
+          - pylint3
+          - shellcheck
+    - name: Install language servers with apt (Debian)
+      become: true
+      apt:
+        name:
+          - lua-language-server
+          - texlab
+    - name: Install language servers with npm (Debian)
+      become: true
+      npm:
+        name:
+          - bash-language-server
+          - '@ansible/ansible-language-server'
+        global: true
+        state: present
   when:
     ansible_facts['distribution'] == 'Debian'
 
@@ -81,19 +109,3 @@
   command: nvim --headless -c 'autocmd User PackerComplete quitall' -c PackerSync
   # TODO: changed_when
   changed_when: false
-
-- name: Install language servers with npm
-  become: true
-  npm:
-    name: '@ansible/ansible-language-server'
-    global: true
-    state: present
-
-- name: Install language servers for Debian
-  become: true
-  npm:
-    name: bash-language-server
-    global: true
-    state: present
-  when:
-    ansible_facts['distribution'] == 'Debian'