Refactor steam and ensure nvidia is working

7 files changed, 30 insertions, 23 deletions

diff --git a/roles/nvidia_gtx1060/meta/main.yml b/roles/nvidia_gtx1060/meta/main.yml
index 6bdd4b5c..3400c7f4 100644
--- a/roles/nvidia_gtx1060/meta/main.yml
+++ b/roles/nvidia_gtx1060/meta/main.yml
@@ -2,6 +2,9 @@
 dependencies:
   - 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 GTX 1060 proprietary drivers"
diff --git a/roles/nvidia_gtx1060/tasks/install-archlinux.yml b/roles/nvidia_gtx1060/tasks/install-archlinux.yml
index c7354b89..6d656f54 100644
--- a/roles/nvidia_gtx1060/tasks/install-archlinux.yml
+++ b/roles/nvidia_gtx1060/tasks/install-archlinux.yml
@@ -1,14 +1,4 @@
 ---
-- name: "Ensure multilib is enabled"
-  ansible.builtin.include_role:
-    name: "multilib"
-
-- name: "Install libva NVIDIA driver"
-  become: true
-  ansible.builtin.package:
-    name: "{{ nvidia_gtx1060_packages }}"
-    state: "present"
-
 - name: "Install NVIDIA driver from AUR"
   become: true
   become_user: "aur_builder"
@@ -17,6 +7,12 @@
     state: "present"
     use: "yay"
 
+- name: "Install libva NVIDIA driver"
+  become: true
+  ansible.builtin.package:
+    name: "{{ nvidia_gtx1060_packages }}"
+    state: "present"
+
 - name: "Configure NVIDIA DRM kernel mode setting"
   become: true
   ansible.builtin.template:
diff --git a/roles/steam/meta/main.yml b/roles/steam/meta/main.yml
index 1ae30c02..84677871 100644
--- a/roles/steam/meta/main.yml
+++ b/roles/steam/meta/main.yml
@@ -1,5 +1,7 @@
 ---
-dependencies: []
+dependencies:
+  - role: "multilib"
+    when: ansible_facts['os_family'] == "Archlinux"
 galaxy_info:
   author: "a14m"
   description: "Install steam"
@@ -9,3 +11,9 @@ galaxy_info:
     - name: "ArchLinux"
       versions:
         - "all"
+    - name: "Ubuntu"
+      versions:
+        - "noble"
+    - name: "Debian"
+      versions:
+        - "bookworm"
diff --git a/roles/steam/tasks/install-archlinux.yml b/roles/steam/tasks/install-archlinux.yml
deleted file mode 100644
index 0ac25b4b..00000000
--- a/roles/steam/tasks/install-archlinux.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: "Ensure multilib is enabled"
-  ansible.builtin.include_role:
-    name: "multilib"
-
-- name: "Ensure steam is installed"
-  become: true
-  ansible.builtin.package:
-    name: "steam"
-    state: "present"
diff --git a/roles/steam/tasks/main.yml b/roles/steam/tasks/main.yml
index 71bcbd0d..fc2b1f67 100644
--- a/roles/steam/tasks/main.yml
+++ b/roles/steam/tasks/main.yml
@@ -1,3 +1,9 @@
 ---
-- name: "Include OS-specific tasks"
-  ansible.builtin.include_tasks: "install-{{ ansible_facts['os_family'] | lower }}.yml"
+- name: "Include OS-specific variables"
+  ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml"
+
+- name: "Ensure steam is installed"
+  become: true
+  ansible.builtin.package:
+    name: "{{ steam_pkg }}"
+    state: "present"
diff --git a/roles/steam/vars/archlinux.yml b/roles/steam/vars/archlinux.yml
new file mode 100644
index 00000000..acfdce53
--- /dev/null
+++ b/roles/steam/vars/archlinux.yml
@@ -0,0 +1,2 @@
+---
+steam_pkg: "steam"
diff --git a/roles/steam/vars/debian.yml b/roles/steam/vars/debian.yml
new file mode 100644
index 00000000..054a325f
--- /dev/null
+++ b/roles/steam/vars/debian.yml
@@ -0,0 +1,2 @@
+---
+steam_pkg: "steam-installer"