Replace mac nvidia main driver with integrated driver

The nvidia driver doesn't work no matter what, so replacing it for now
with the integrated CPU i915 driver

13 files changed, 25 insertions, 131 deletions

diff --git a/roles/gpu-switch/defaults/main.yml b/roles/gpu-switch/defaults/main.yml
deleted file mode 100644
index db1abd44..00000000
--- a/roles/gpu-switch/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-gpu_switch_dedicated: false
diff --git a/roles/gpu-switch/meta/argument_specs.yml b/roles/gpu-switch/meta/argument_specs.yml
deleted file mode 100644
index 46632ea4..00000000
--- a/roles/gpu-switch/meta/argument_specs.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-argument_specs:
-  main:
-    short_description: "Install gpu-switch"
-    description: "Install gpu-switch"
-    options:
-      gpu_switch_dedicated:
-        type: "bool"
-        default: false
-        description: "Enable dedicated GPU on machine when true other wise use default iGPU"
diff --git a/roles/gpu-switch/tasks/main.yml b/roles/gpu-switch/tasks/main.yml
deleted file mode 100644
index 14cc3be2..00000000
--- a/roles/gpu-switch/tasks/main.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- name: "Ensure gpu-switch is installed"
-  become: true
-  become_user: "aur_builder"
-  kewlfft.aur.aur:
-    name: "gpu-switch"
-    state: "present"
-    use: "yay"
-
-- name: "Configure gpu-switch to use dedicated GPU"
-  become: true
-  ansible.builtin.command:
-    cmd: "gpu-switch -d"
-  changed_when: false
-  when: gpu_switch_dedicated
-
-- name: "Configure gpu-switch to use integrated GPU"
-  become: true
-  ansible.builtin.command:
-    cmd: "gpu-switch -i"
-  changed_when: false
-  when: not gpu_switch_dedicated
diff --git a/roles/intel_i915/meta/argument_specs.yml b/roles/intel_i915/meta/argument_specs.yml
new file mode 100644
index 00000000..268bb28e
--- /dev/null
+++ b/roles/intel_i915/meta/argument_specs.yml
@@ -0,0 +1,6 @@
+---
+argument_specs:
+  main:
+    short_description: "Install Intel i915 Mesa drivers"
+    description: "Install Intel i915 Mesa drivers"
+    options: {}
diff --git a/roles/gpu-switch/meta/main.yml b/roles/intel_i915/meta/main.yml
index 3a4515bb..8c602240 100644
--- a/roles/gpu-switch/meta/main.yml
+++ b/roles/intel_i915/meta/main.yml
@@ -1,9 +1,10 @@
 ---
 dependencies:
-  - role: "yay"
+  - role: "multilib"
+    when: ansible_facts['os_family'] == "Archlinux"
 galaxy_info:
   author: "a14m"
-  description: "Install gpu-switch"
+  description: "Install Intel i915 Mesa drivers"
   license: "MIT"
   min_ansible_version: "2.18"
   platforms:
diff --git a/roles/intel_i915/tasks/main.yml b/roles/intel_i915/tasks/main.yml
new file mode 100644
index 00000000..0120174f
--- /dev/null
+++ b/roles/intel_i915/tasks/main.yml
@@ -0,0 +1,9 @@
+---
+- name: "Include OS-specific variables"
+  ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml"
+
+- name: "Install Intel i915 driver packages"
+  become: true
+  ansible.builtin.package:
+    name: "{{ intel_i915_packages }}"
+    state: "present"
diff --git a/roles/intel_i915/vars/archlinux.yml b/roles/intel_i915/vars/archlinux.yml
new file mode 100644
index 00000000..d9b11d06
--- /dev/null
+++ b/roles/intel_i915/vars/archlinux.yml
@@ -0,0 +1,7 @@
+---
+intel_i915_packages:
+  - "mesa"
+  - "libva-intel-driver"
+  - "vulkan-intel"
+  - "lib32-mesa"
+  - "lib32-vulkan-intel"
diff --git a/roles/nvidia_gt750m/defaults/main.yml b/roles/nvidia_gt750m/defaults/main.yml
deleted file mode 100644
index 559ccdae..00000000
--- a/roles/nvidia_gt750m/defaults/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-nvidia_gt750m_aur_packages:
-  - "nvidia-470xx-dkms"
-  - "nvidia-470xx-utils"
-  - "nvidia-470xx-settings"
-  - "lib32-nvidia-470xx-utils"
-
-nvidia_gt750m_modules:
-  - "nvidia"
-  - "nvidia_modeset"
-  - "nvidia_uvm"
-  - "nvidia_drm"
diff --git a/roles/nvidia_gt750m/handlers/main.yml b/roles/nvidia_gt750m/handlers/main.yml
deleted file mode 100644
index 58b9b02c..00000000
--- a/roles/nvidia_gt750m/handlers/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: "Rebuild initramfs"
-  become: true
-  ansible.builtin.command:
-    cmd: "mkinitcpio -P"
-  changed_when: true
-
-- name: "Reboot"
-  become: true
-  ansible.builtin.reboot:
-    reboot_timeout: 600
diff --git a/roles/nvidia_gt750m/meta/main.yml b/roles/nvidia_gt750m/meta/main.yml
deleted file mode 100644
index bcdaea14..00000000
--- a/roles/nvidia_gt750m/meta/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-dependencies:
-  - role: "bash"
-  - role: "linux_headers"
-  - role: "yay"
-    when: ansible_facts['os_family'] == "Archlinux"
-  - role: "multilib"
-    when: ansible_facts['os_family'] == "Archlinux"
-galaxy_info:
-  author: "a14m"
-  description: "Install and configure NVIDIA GT 750M legacy (470xx) drivers"
-  license: "MIT"
-  min_ansible_version: "2.18"
-  platforms:
-    - name: "ArchLinux"
-      versions:
-        - "all"
diff --git a/roles/nvidia_gt750m/tasks/install-archlinux.yml b/roles/nvidia_gt750m/tasks/install-archlinux.yml
deleted file mode 100644
index 68412d5c..00000000
--- a/roles/nvidia_gt750m/tasks/install-archlinux.yml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-- name: "Install NVIDIA driver from AUR"
-  become: true
-  become_user: "aur_builder"
-  kewlfft.aur.aur:
-    name: "{{ nvidia_gt750m_aur_packages }}"
-    state: "present"
-    use: "yay"
-
-- name: "Configure NVIDIA DRM kernel mode setting"
-  become: true
-  ansible.builtin.template:
-    src: "nvidia.conf.j2"
-    dest: "/etc/modprobe.d/nvidia.conf"
-    mode: "0644"
-  notify:
-    - "Rebuild initramfs"
-    - "Reboot"
-  tags:
-    - "molecule-notest"
-
-- name: "Get current mkinitcpio MODULES"
-  become: true
-  ansible.builtin.shell: |
-    set -euo pipefail
-    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
-  args:
-    executable: /bin/bash
-  tags:
-    - "molecule-notest"
-
-- name: "Add NVIDIA modules to mkinitcpio"
-  become: true
-  vars:
-    existing_modules: "{{ current_kernel_modules.stdout.split() | reject('in', nvidia_gt750m_modules) | list }}"
-    all_modules: "{{ existing_modules + nvidia_gt750m_modules }}"
-  ansible.builtin.lineinfile:
-    path: "/etc/mkinitcpio.conf"
-    regexp: "^MODULES=\\(.*\\)"
-    line: "MODULES=({{ all_modules | join(' ') }})"
-  notify:
-    - "Rebuild initramfs"
-    - "Reboot"
-  tags:
-    - "molecule-notest"
diff --git a/roles/nvidia_gt750m/tasks/main.yml b/roles/nvidia_gt750m/tasks/main.yml
deleted file mode 100644
index 71bcbd0d..00000000
--- a/roles/nvidia_gt750m/tasks/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: "Include OS-specific tasks"
-  ansible.builtin.include_tasks: "install-{{ ansible_facts['os_family'] | lower }}.yml"
diff --git a/roles/nvidia_gt750m/templates/nvidia.conf.j2 b/roles/nvidia_gt750m/templates/nvidia.conf.j2
deleted file mode 100644
index 9672977e..00000000
--- a/roles/nvidia_gt750m/templates/nvidia.conf.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-blacklist nouveau
-
-options nvidia_drm modeset=1
-options nvidia_drm fbdev=1