diff options
| -rw-r--r-- | configure.yml | 18 | ||||
| -rw-r--r-- | molecule/archlinux-gnome/converge.yml | 1 | ||||
| -rw-r--r-- | molecule/archlinux/converge.yml | 1 | ||||
| -rw-r--r-- | roles/gpu_driver/meta/argument_specs.yml | 8 | ||||
| -rw-r--r-- | roles/gpu_driver/meta/main.yml | 12 | ||||
| -rw-r--r-- | roles/gpu_driver/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/gpu_driver/vars/main.yml | 6 | ||||
| -rw-r--r-- | roles/pciutils/meta/argument_specs.yml | 6 | ||||
| -rw-r--r-- | roles/pciutils/meta/main.yml | 17 | ||||
| -rw-r--r-- | roles/pciutils/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/steam/meta/main.yml | 1 |
11 files changed, 70 insertions, 18 deletions
diff --git a/configure.yml b/configure.yml index f71f962d..e1fc93e2 100644 --- a/configure.yml +++ b/configure.yml @@ -39,27 +39,13 @@ - role: "podman" - role: "ansible" - role: "claude" + - role: "hyprland" - role: "firefox" - role: "zen-browser" - role: "chromium" - role: "obsidian" - role: "microsoft-teams" - - role: "hyprland" - -- name: "Nvidia configure" - gather_facts: true - hosts: - - archlinux.local - roles: - - role: "nvidia_gtx1060" - - role: "steam" - -- name: "Mac nvidia configure" - gather_facts: true - hosts: - - mac.local - roles: - - role: "intel_i915" + - role: "gpu_driver" - role: "steam" - name: "Ubuntu configure" diff --git a/molecule/archlinux-gnome/converge.yml b/molecule/archlinux-gnome/converge.yml index eb08fa9c..eaa8bc23 100644 --- a/molecule/archlinux-gnome/converge.yml +++ b/molecule/archlinux-gnome/converge.yml @@ -97,7 +97,6 @@ - role: "chromium" - role: "obsidian" - role: "microsoft-teams" - - role: "nvidia_gtx1060" - role: "steam" - role: "usbutils" - role: "nginx" diff --git a/molecule/archlinux/converge.yml b/molecule/archlinux/converge.yml index 6da075d2..bd2c4c93 100644 --- a/molecule/archlinux/converge.yml +++ b/molecule/archlinux/converge.yml @@ -96,7 +96,6 @@ - role: "chromium" - role: "obsidian" - role: "microsoft-teams" - - role: "nvidia_gtx1060" - role: "steam" - role: "waybar" - role: "hyprland" diff --git a/roles/gpu_driver/meta/argument_specs.yml b/roles/gpu_driver/meta/argument_specs.yml new file mode 100644 index 00000000..6986388f --- /dev/null +++ b/roles/gpu_driver/meta/argument_specs.yml @@ -0,0 +1,8 @@ +--- +argument_specs: + main: + short_description: "Detect the GPU and include the appropriate driver role" + description: > + Detects the GPU present on the machine using PCI device information and + includes the matching driver role (intel_i915 or nvidia_gtx1060). + options: {} diff --git a/roles/gpu_driver/meta/main.yml b/roles/gpu_driver/meta/main.yml new file mode 100644 index 00000000..4b4c9a4e --- /dev/null +++ b/roles/gpu_driver/meta/main.yml @@ -0,0 +1,12 @@ +--- +dependencies: + - role: "pciutils" +galaxy_info: + author: "a14m" + description: "Detect the GPU and include the appropriate driver role" + license: "MIT" + min_ansible_version: "2.18" + platforms: + - name: "ArchLinux" + versions: + - "all" diff --git a/roles/gpu_driver/tasks/main.yml b/roles/gpu_driver/tasks/main.yml new file mode 100644 index 00000000..7f6f130f --- /dev/null +++ b/roles/gpu_driver/tasks/main.yml @@ -0,0 +1,12 @@ +--- +- name: "Detect GPU" + ansible.builtin.command: + cmd: "lspci" + register: gpu_driver_lspci + changed_when: false + +- name: "Include driver role for matched GPU" + ansible.builtin.include_role: + name: "{{ item.role }}" + loop: "{{ gpu_driver_map }}" + when: item.match in gpu_driver_lspci.stdout diff --git a/roles/gpu_driver/vars/main.yml b/roles/gpu_driver/vars/main.yml new file mode 100644 index 00000000..152f7499 --- /dev/null +++ b/roles/gpu_driver/vars/main.yml @@ -0,0 +1,6 @@ +--- +gpu_driver_map: + - match: "GeForce GTX 1060" + role: "nvidia_gtx1060" + - match: "Intel" + role: "intel_i915" diff --git a/roles/pciutils/meta/argument_specs.yml b/roles/pciutils/meta/argument_specs.yml new file mode 100644 index 00000000..a9845ff3 --- /dev/null +++ b/roles/pciutils/meta/argument_specs.yml @@ -0,0 +1,6 @@ +--- +argument_specs: + main: + short_description: "Install pciutils on Linux distribution" + description: "Install pciutils on Linux distribution" + options: {} diff --git a/roles/pciutils/meta/main.yml b/roles/pciutils/meta/main.yml new file mode 100644 index 00000000..b3a2fe28 --- /dev/null +++ b/roles/pciutils/meta/main.yml @@ -0,0 +1,17 @@ +--- +dependencies: [] +galaxy_info: + author: "a14m" + description: "Install pciutils" + license: "MIT" + min_ansible_version: "2.18" + platforms: + - name: "ArchLinux" + versions: + - "all" + - name: "Ubuntu" + versions: + - "noble" + - name: "Debian" + versions: + - "bookworm" diff --git a/roles/pciutils/tasks/main.yml b/roles/pciutils/tasks/main.yml new file mode 100644 index 00000000..b9d6d62f --- /dev/null +++ b/roles/pciutils/tasks/main.yml @@ -0,0 +1,6 @@ +--- +- name: "Ensure pciutils is installed" + become: true + ansible.builtin.package: + name: "pciutils" + state: "present" diff --git a/roles/steam/meta/main.yml b/roles/steam/meta/main.yml index dd77817d..f5068235 100644 --- a/roles/steam/meta/main.yml +++ b/roles/steam/meta/main.yml @@ -4,6 +4,7 @@ dependencies: when: ansible_facts['distribution'] == "Archlinux" - role: "multiverse" when: ansible_facts['distribution'] == "Ubuntu" + - role: "gpu_driver" galaxy_info: author: "a14m" description: "Install steam" |