From 9ffe47ba5a4f9cb4bcc295468968acec07ecd8a6 Mon Sep 17 00:00:00 2001 From: Ahmed Abdelhalim Date: Sat, 24 Jan 2026 21:07:20 +0100 Subject: Rename nvidia role to nvidia_gtx1060 --- configure.yml | 2 +- roles/nvidia/defaults/main.yml | 14 -------- roles/nvidia/handlers/main.yml | 6 ---- roles/nvidia/meta/main.yml | 13 -------- roles/nvidia/tasks/install-archlinux.yml | 42 ------------------------ roles/nvidia/tasks/main.yml | 3 -- roles/nvidia/templates/nvidia.conf.j2 | 4 --- roles/nvidia_gtx1060/defaults/main.yml | 14 ++++++++ roles/nvidia_gtx1060/handlers/main.yml | 6 ++++ roles/nvidia_gtx1060/meta/main.yml | 13 ++++++++ roles/nvidia_gtx1060/tasks/install-archlinux.yml | 42 ++++++++++++++++++++++++ roles/nvidia_gtx1060/tasks/main.yml | 3 ++ roles/nvidia_gtx1060/templates/nvidia.conf.j2 | 4 +++ 13 files changed, 83 insertions(+), 83 deletions(-) delete mode 100644 roles/nvidia/defaults/main.yml delete mode 100644 roles/nvidia/handlers/main.yml delete mode 100644 roles/nvidia/meta/main.yml delete mode 100644 roles/nvidia/tasks/install-archlinux.yml delete mode 100644 roles/nvidia/tasks/main.yml delete mode 100644 roles/nvidia/templates/nvidia.conf.j2 create mode 100644 roles/nvidia_gtx1060/defaults/main.yml create mode 100644 roles/nvidia_gtx1060/handlers/main.yml create mode 100644 roles/nvidia_gtx1060/meta/main.yml create mode 100644 roles/nvidia_gtx1060/tasks/install-archlinux.yml create mode 100644 roles/nvidia_gtx1060/tasks/main.yml create mode 100644 roles/nvidia_gtx1060/templates/nvidia.conf.j2 diff --git a/configure.yml b/configure.yml index ceb92852..4593a90a 100644 --- a/configure.yml +++ b/configure.yml @@ -33,7 +33,7 @@ - role: "neomutt" - role: "firefox" - role: "alacritty" - - role: "nvidia" + - role: "nvidia_gtx1060" - role: "hyprland" - name: "Ubuntu configure" diff --git a/roles/nvidia/defaults/main.yml b/roles/nvidia/defaults/main.yml deleted file mode 100644 index 1b2ecc67..00000000 --- a/roles/nvidia/defaults/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -nvidia_packages: - - "libva-nvidia-driver" - -nvidia_aur_packages: - - "nvidia-580xx-dkms" - - "nvidia-580xx-utils" - - "nvidia-580xx-settings" - -nvidia_modules: - - "nvidia" - - "nvidia_modeset" - - "nvidia_uvm" - - "nvidia_drm" diff --git a/roles/nvidia/handlers/main.yml b/roles/nvidia/handlers/main.yml deleted file mode 100644 index 67408c79..00000000 --- a/roles/nvidia/handlers/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: "Rebuild initramfs" - become: true - ansible.builtin.command: - cmd: "mkinitcpio -P" - changed_when: true diff --git a/roles/nvidia/meta/main.yml b/roles/nvidia/meta/main.yml deleted file mode 100644 index 9271bfe5..00000000 --- a/roles/nvidia/meta/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -dependencies: - - role: "linux_headers" - - role: "yay" -galaxy_info: - author: "a14m" - description: "Install and configure NVIDIA proprietary drivers" - license: "MIT" - min_ansible_version: "2.18" - platforms: - - name: "ArchLinux" - versions: - - "all" diff --git a/roles/nvidia/tasks/install-archlinux.yml b/roles/nvidia/tasks/install-archlinux.yml deleted file mode 100644 index aac25ed1..00000000 --- a/roles/nvidia/tasks/install-archlinux.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -- name: "Install libva NVIDIA driver" - become: true - ansible.builtin.package: - name: "{{ nvidia_packages }}" - state: "present" - -- name: "Install NVIDIA driver from AUR" - become: true - become_user: "aur_builder" - kewlfft.aur.aur: - name: "{{ nvidia_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" - -- 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 - -- name: "Add NVIDIA modules to mkinitcpio" - become: true - vars: - existing_modules: "{{ current_kernel_modules.stdout.split() | reject('in', nvidia_modules) | list }}" - all_modules: "{{ existing_modules + nvidia_modules }}" - ansible.builtin.lineinfile: - path: "/etc/mkinitcpio.conf" - regexp: "^MODULES=\\(.*\\)" - line: "MODULES=({{ all_modules | join(' ') }})" - notify: "Rebuild initramfs" diff --git a/roles/nvidia/tasks/main.yml b/roles/nvidia/tasks/main.yml deleted file mode 100644 index 71bcbd0d..00000000 --- a/roles/nvidia/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/templates/nvidia.conf.j2 b/roles/nvidia/templates/nvidia.conf.j2 deleted file mode 100644 index 9672977e..00000000 --- a/roles/nvidia/templates/nvidia.conf.j2 +++ /dev/null @@ -1,4 +0,0 @@ -blacklist nouveau - -options nvidia_drm modeset=1 -options nvidia_drm fbdev=1 diff --git a/roles/nvidia_gtx1060/defaults/main.yml b/roles/nvidia_gtx1060/defaults/main.yml new file mode 100644 index 00000000..6bdba8ed --- /dev/null +++ b/roles/nvidia_gtx1060/defaults/main.yml @@ -0,0 +1,14 @@ +--- +nvidia_gtx1060_packages: + - "libva-nvidia-driver" + +nvidia_gtx1060_aur_packages: + - "nvidia-580xx-dkms" + - "nvidia-580xx-utils" + - "nvidia-580xx-settings" + +nvidia_gtx1060_modules: + - "nvidia" + - "nvidia_modeset" + - "nvidia_uvm" + - "nvidia_drm" diff --git a/roles/nvidia_gtx1060/handlers/main.yml b/roles/nvidia_gtx1060/handlers/main.yml new file mode 100644 index 00000000..67408c79 --- /dev/null +++ b/roles/nvidia_gtx1060/handlers/main.yml @@ -0,0 +1,6 @@ +--- +- name: "Rebuild initramfs" + become: true + ansible.builtin.command: + cmd: "mkinitcpio -P" + changed_when: true diff --git a/roles/nvidia_gtx1060/meta/main.yml b/roles/nvidia_gtx1060/meta/main.yml new file mode 100644 index 00000000..6bdd4b5c --- /dev/null +++ b/roles/nvidia_gtx1060/meta/main.yml @@ -0,0 +1,13 @@ +--- +dependencies: + - role: "linux_headers" + - role: "yay" +galaxy_info: + author: "a14m" + description: "Install and configure NVIDIA GTX 1060 proprietary drivers" + license: "MIT" + min_ansible_version: "2.18" + platforms: + - name: "ArchLinux" + versions: + - "all" diff --git a/roles/nvidia_gtx1060/tasks/install-archlinux.yml b/roles/nvidia_gtx1060/tasks/install-archlinux.yml new file mode 100644 index 00000000..488dd15d --- /dev/null +++ b/roles/nvidia_gtx1060/tasks/install-archlinux.yml @@ -0,0 +1,42 @@ +--- +- name: "Install libva NVIDIA driver" + become: true + ansible.builtin.package: + name: "{{ nvidia_gtx_1060_packages }}" + state: "present" + +- name: "Install NVIDIA driver from AUR" + become: true + become_user: "aur_builder" + kewlfft.aur.aur: + name: "{{ nvidia_gtx_1060_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" + +- 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 + +- name: "Add NVIDIA modules to mkinitcpio" + become: true + vars: + existing_modules: "{{ current_kernel_modules.stdout.split() | reject('in', nvidia_gtx_1060_modules) | list }}" + all_modules: "{{ existing_modules + nvidia_gtx_1060_modules }}" + ansible.builtin.lineinfile: + path: "/etc/mkinitcpio.conf" + regexp: "^MODULES=\\(.*\\)" + line: "MODULES=({{ all_modules | join(' ') }})" + notify: "Rebuild initramfs" diff --git a/roles/nvidia_gtx1060/tasks/main.yml b/roles/nvidia_gtx1060/tasks/main.yml new file mode 100644 index 00000000..71bcbd0d --- /dev/null +++ b/roles/nvidia_gtx1060/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- name: "Include OS-specific tasks" + ansible.builtin.include_tasks: "install-{{ ansible_facts['os_family'] | lower }}.yml" diff --git a/roles/nvidia_gtx1060/templates/nvidia.conf.j2 b/roles/nvidia_gtx1060/templates/nvidia.conf.j2 new file mode 100644 index 00000000..9672977e --- /dev/null +++ b/roles/nvidia_gtx1060/templates/nvidia.conf.j2 @@ -0,0 +1,4 @@ +blacklist nouveau + +options nvidia_drm modeset=1 +options nvidia_drm fbdev=1 -- cgit v1.2.3