diff --git a/roles/neovim/tasks/main.yml b/roles/neovim/tasks/main.yml
index 465a184..644ee9e 100644
--- a/roles/neovim/tasks/main.yml
+++ b/roles/neovim/tasks/main.yml
@@ -7,7 +7,7 @@
 
 - name: Install (Archlinux)
   block:
-    - name: Install packages (Archlinux)
+    - name: Install things with pacman (Archlinux)
       become: true
       pacman:
         name:
@@ -18,24 +18,20 @@
           - 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)
+    - name: Install things with pip (Archlinux)
+      pip:
+        name: neovim-remote
+        extra_args: --user
+    - name: Install things with npm (Archlinux)
       become: true
       npm:
         name: '@ansible/ansible-language-server'
@@ -51,7 +47,7 @@
       apt:
         deb: /tmp/nvim-linux64.deb
         # TODO: Download and check the package
-    - name: Install packages (Debian)
+    - name: Install things with apt (Debian)
       become: true
       apt:
         name:
@@ -62,16 +58,17 @@
           - clang
           - npm
           - ripgrep
-    - name: Install linters (Debian)
-      become: true
-      apt:
-        name:
-          - ansible-lint
           - flake8
           - mypy
           - pylint3
           - shellcheck
-    - name: Install language servers with npm (Debian)
+    - name: Install things with pip (Debian)
+      pip:
+        name:
+          - ansible-lint
+          - neovim-remote
+        extra_args: --user
+    - name: Install things with npm (Debian)
       become: true
       npm:
         name: "{{ item }}"
@@ -80,16 +77,11 @@
       with_items:
         - bash-language-server
         - '@ansible/ansible-language-server'
-        #- lua-language-server
-        #- texlab
+        # - lua-language-server
+        # - texlab
   when:
     ansible_facts['distribution'] == 'Debian'
 
-- name: Install neovim-remote
-  pip:
-    name: neovim-remote
-    extra_args: --user
-
 - name: Make sure needed directories exist
   file: path={{ item.path }} state=directory mode={{ item.mode }}
   with_items: