Install hardware-specific packages

_machines/ares.yml

@@ -2,6 +2,7 @@ font_size_1: 12
 font_size_2: 12
 
 gpu: amd
+cpu: amd
 
 users:
 - name: hannes

_machines/neptune.yml

@@ -2,6 +2,7 @@ font_size_1: 12
 font_size_2: 12
 
 gpu: nvidia
+cpu: intel
 
 users:
 - name: hannes-work

drivers.yml

@@ -0,0 +1,20 @@
+cpu:
+  amd:
+    - amd-ucode
+  intel:
+    - intel-ucode
+  
+gpu:
+  amd:
+    - mesa
+    - lib32-mesa
+    - xf86-video-amdgpu
+    - vulkan-radeon
+    - lib32-vulkan-radeon
+    - libva-mesa-driver
+    - lib32-libva-mesa-driver
+    - mesa-vdpau
+    - lib32-mesa-vdpau
+  nvidia:
+    - mesa
+    - lib32-mesa

playbook.yml

@@ -577,25 +577,48 @@
           permit nopass nolog setenv {PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin} :sudonopw
       become: true
 
+    - name: hardware-specific configuration
+      tags:
+        - hardware
+      block:
+        - name: read driver variables
+          include_vars:
+            file: drivers.yml
+            name: drivers
+          tags:
+            - always
+
         - name: gpu configuration
           tags:
-        - gpu
+            - hardware:gpu
+          block:
+            - name: install AMD cpu packages
+              package:
+                name: "{{ drivers.cpu.amd }}"
+                state: present
+              become: true
+              when: machine.cpu == 'amd'
+
+            - name: install Intel cpu packages
+              package:
+                name: "{{ drivers.cpu.intel }}"
+                state: present
+              become: true
+              when: machine.cpu == 'intel'
+              
+          when:
+            - machine.cpu is defined
+
+        - name: gpu configuration
+          tags:
+            - hardware:gpu
           block:
             - name: AMD configuration
               when: machine.gpu == 'amd'
               block:
                 - name: install AMDGPU packages
                   package:
-                name:
+                    name: "{{ drivers.gpu.amd }}"
-                  - mesa
-                  - lib32-mesa
-                  - xf86-video-amdgpu
-                  - vulkan-radeon
-                  - lib32-vulkan-radeon
-                  - libva-mesa-driver
-                  - lib32-libva-mesa-driver
-                  - mesa-vdpau
-                  - lib32-mesa-vdpau
                     state: present
                   become: true
 
@@ -619,9 +642,7 @@
               block:
                 - name: install nouveau packages
                   package:
-                name:
+                    name: "{{ drivers.gpu.gpu }}"
-                  - mesa
-                  - lib32-mesa
                     state: present
                   become: true
           when: