Fix nvidia role to setup the correct driver to GTX1060

6 files changed, 36 insertions, 7 deletions

diff --git a/roles/linux_headers/meta/argument_specs.yml b/roles/linux_headers/meta/argument_specs.yml
new file mode 100644
index 00000000..f4ece4b7
--- /dev/null
+++ b/roles/linux_headers/meta/argument_specs.yml
@@ -0,0 +1,6 @@
+---
+argument_specs:
+  main:
+    short_description: "Install linux-headers on Linux distribution"
+    description: "Install linux-headers on Linux distribution"
+    options: {}
diff --git a/roles/linux_headers/meta/main.yml b/roles/linux_headers/meta/main.yml
new file mode 100644
index 00000000..f2598464
--- /dev/null
+++ b/roles/linux_headers/meta/main.yml
@@ -0,0 +1,17 @@
+---
+dependencies: []
+galaxy_info:
+  author: "a14m"
+  description: "Install linux-headers"
+  license: "MIT"
+  min_ansible_version: "2.18"
+  platforms:
+    - name: "ArchLinux"
+      versions:
+        - "all"
+    - name: "Ubuntu"
+      versions:
+        - "noble"
+    - name: "Debian"
+      versions:
+        - "bookworm"
diff --git a/roles/linux_headers/tasks/main.yml b/roles/linux_headers/tasks/main.yml
new file mode 100644
index 00000000..454e4af8
--- /dev/null
+++ b/roles/linux_headers/tasks/main.yml
@@ -0,0 +1,6 @@
+---
+- name: "Ensure linux-headers is installed"
+  become: true
+  ansible.builtin.package:
+    name: "linux-headers"
+    state: "present"
diff --git a/roles/nvidia/defaults/main.yml b/roles/nvidia/defaults/main.yml
index 8fc2a510..1b2ecc67 100644
--- a/roles/nvidia/defaults/main.yml
+++ b/roles/nvidia/defaults/main.yml
@@ -1,12 +1,11 @@
 ---
+nvidia_packages:
+  - "libva-nvidia-driver"
+
 nvidia_aur_packages:
   - "nvidia-580xx-dkms"
   - "nvidia-580xx-utils"
-
-nvidia_packages:
-  - "linux-headers"
-  - "nvidia-settings"
-  - "libva-nvidia-driver"
+  - "nvidia-580xx-settings"
 
 nvidia_modules:
   - "nvidia"
diff --git a/roles/nvidia/meta/main.yml b/roles/nvidia/meta/main.yml
index cc0ec526..9271bfe5 100644
--- a/roles/nvidia/meta/main.yml
+++ b/roles/nvidia/meta/main.yml
@@ -1,5 +1,6 @@
 ---
 dependencies:
+  - role: "linux_headers"
   - role: "yay"
 galaxy_info:
   author: "a14m"
diff --git a/roles/nvidia/tasks/install-archlinux.yml b/roles/nvidia/tasks/install-archlinux.yml
index f11f71ba..aac25ed1 100644
--- a/roles/nvidia/tasks/install-archlinux.yml
+++ b/roles/nvidia/tasks/install-archlinux.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Install NVIDIA packages"
+- name: "Install libva NVIDIA driver"
   become: true
   ansible.builtin.package:
     name: "{{ nvidia_packages }}"
@@ -25,7 +25,7 @@
   become: true
   ansible.builtin.shell: |
     set -euo pipefail
-    grep '^MODULES=' /etc/mkinitcpio.conf | sed 's/MODULES=(\\(.*\\))/\\1/'
+    grep '^MODULES=' /etc/mkinitcpio.conf | sed 's/MODULES=(\(.*\))/\1/'
   # noqa var-naming[no-role-prefix] as it describes the current kernel modules and not the nvidia modules
   register: "current_kernel_modules"
   changed_when: false