From db0b1814730680f54e2aa586c6df3b9dbb91a355 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Fri, 2 Jun 2023 19:12:21 +0100 Subject: [PATCH] Use Linux system packages for neovim python integration --- roles/neovim/tasks/Darwin.yaml | 6 +++++- roles/neovim/tasks/Debian.yaml | 4 +++- roles/neovim/tasks/RedHat.yaml | 8 +++++--- roles/neovim/tasks/Unix.yaml | 2 -- roles/neovim/vars/main.yaml | 1 - 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/roles/neovim/tasks/Darwin.yaml b/roles/neovim/tasks/Darwin.yaml index 87c2d16..07fc9db 100644 --- a/roles/neovim/tasks/Darwin.yaml +++ b/roles/neovim/tasks/Darwin.yaml @@ -1,7 +1,11 @@ --- - name: install homebrew packages homebrew: - name: neovim + name: + - neovim state: latest +- set_fact: + neovim_pip_packages: '{{neovim_pip_packages + ["pynvim"]}}' + - include_tasks: Unix.yaml diff --git a/roles/neovim/tasks/Debian.yaml b/roles/neovim/tasks/Debian.yaml index 0357c2a..b642ef6 100644 --- a/roles/neovim/tasks/Debian.yaml +++ b/roles/neovim/tasks/Debian.yaml @@ -10,7 +10,9 @@ - name: install apt package become: true apt: - name: neovim + name: + - neovim + - python3-neovim state: latest - include_tasks: Unix.yaml diff --git a/roles/neovim/tasks/RedHat.yaml b/roles/neovim/tasks/RedHat.yaml index d7f5d58..771ac0e 100644 --- a/roles/neovim/tasks/RedHat.yaml +++ b/roles/neovim/tasks/RedHat.yaml @@ -1,8 +1,10 @@ --- -- name: install yum package +- name: install dnf package become: true - yum: - name: neovim + dnf: + name: + - neovim + - python3-neovim state: latest - include_tasks: Unix.yaml diff --git a/roles/neovim/tasks/Unix.yaml b/roles/neovim/tasks/Unix.yaml index f048928..73cd44d 100644 --- a/roles/neovim/tasks/Unix.yaml +++ b/roles/neovim/tasks/Unix.yaml @@ -8,8 +8,6 @@ dest: '{{vim_config_dir}}' version: master -# TODO: - name: set repo email - - name: install pip packages pip: name: '{{neovim_pip_packages}}' diff --git a/roles/neovim/vars/main.yaml b/roles/neovim/vars/main.yaml index e5b4cb8..7dc797c 100644 --- a/roles/neovim/vars/main.yaml +++ b/roles/neovim/vars/main.yaml @@ -3,6 +3,5 @@ neovim_pip_packages: - cmake-language-server - cmakelint - compdb - - pynvim - vim-vint - yamllint