diff options
| -rw-r--r-- | configure.yml | 56 | ||||
| -rw-r--r-- | molecule/archlinux-gnome/converge.yml | 50 | ||||
| -rw-r--r-- | molecule/archlinux/converge.yml | 54 | ||||
| -rw-r--r-- | molecule/debian/converge.yml | 1 | ||||
| -rw-r--r-- | molecule/ubuntu/converge.yml | 1 | ||||
| -rw-r--r-- | roles/nvidia_gtx1060/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/nvidia_gtx1060/tasks/install-archlinux.yml | 16 | ||||
| -rw-r--r-- | roles/steam/meta/main.yml | 10 | ||||
| -rw-r--r-- | roles/steam/tasks/install-archlinux.yml | 10 | ||||
| -rw-r--r-- | roles/steam/tasks/main.yml | 10 | ||||
| -rw-r--r-- | roles/steam/vars/archlinux.yml | 2 | ||||
| -rw-r--r-- | roles/steam/vars/debian.yml | 2 |
12 files changed, 109 insertions, 106 deletions
diff --git a/configure.yml b/configure.yml index 838dc330..c5de4866 100644 --- a/configure.yml +++ b/configure.yml @@ -11,38 +11,35 @@ - role: "aur_font" - role: "which" - role: "bash" + - role: "alacritty" - role: "man" - role: "jq" - role: "ag" - role: "tmux" - - role: "zoxide" - - role: "wireguard" - - role: "go" - - role: "python" - - role: "docker" - - role: "podman" - - role: "ansible" - role: "rsync" - role: "gpg" + - role: "btop" + - role: "zoxide" - role: "git" - role: "git-crypt" - role: "dotfiles" - role: "password_store" + - role: "wireguard" - role: "vim" + - role: "gnome-calendar" + - role: "mpv" - role: "neomutt" + - role: "go" + - role: "python" + - role: "docker" + - role: "podman" + - role: "ansible" + - role: "claude" - role: "firefox" - role: "chromium" - role: "obsidian" - - role: "steam" - - role: "gnome-calendar" - - role: "claude" - - role: "alacritty" - - role: "mpv" - role: "nvidia_gtx1060" - - role: "btop" - - role: "bluetui" - - role: "wlctl" - - role: "wiremix" + - role: "steam" - role: "waybar" - role: "hyprland" post_tasks: @@ -67,13 +64,6 @@ - role: "jq" - role: "ag" - role: "tmux" - - role: "wireguard" - - role: "go" - - role: "python" - - role: "docker" - - role: "podman" - - role: "ansible" - - role: "gnome" - role: "rsync" - role: "gpg" - role: "git" @@ -82,6 +72,13 @@ - role: "password_store" - role: "vim" - role: "neomutt" + - role: "wireguard" + - role: "go" + - role: "python" + - role: "docker" + - role: "podman" + - role: "ansible" + - role: "gnome" - role: "firefox" - role: "obsidian" - role: "gnome-calendar" @@ -105,6 +102,13 @@ - role: "man" - role: "jq" - role: "ag" + - role: "btop" + - role: "gpg" + - role: "git" + - role: "git-crypt" + - role: "dotfiles" + - role: "password_store" + - role: "vim" - role: "wireguard" - role: "gateway" - role: "nginx" @@ -112,12 +116,6 @@ - role: "pihole" - role: "prometheus" - role: "grafana" - - role: "gpg" - - role: "git" - - role: "git-crypt" - - role: "dotfiles" - - role: "password_store" - - role: "vim" - role: "neomutt" post_tasks: - name: "Reboot if required" diff --git a/molecule/archlinux-gnome/converge.yml b/molecule/archlinux-gnome/converge.yml index f4284299..2d1554ad 100644 --- a/molecule/archlinux-gnome/converge.yml +++ b/molecule/archlinux-gnome/converge.yml @@ -58,47 +58,47 @@ roles: - role: "locales" - role: "timezone" + - role: "yay" + - role: "font" + - role: "aur_font" + - role: "which" - role: "bash" + - role: "alacritty" - role: "man" - role: "jq" - role: "ag" - role: "tmux" - - role: "yay" - - role: "usbutils" - - role: "wireguard" - - role: "gateway" - - role: "python" - - role: "go" - - role: "rust" - - role: "zoxide" - - role: "docker" - - role: "podman" - - role: "ansible" - - role: "nginx" - - role: "prometheus" - - role: "grafana" - - role: "gnome" - - role: "gnome-calendar" - role: "rsync" - role: "gpg" + - role: "btop" + - role: "zoxide" + - role: "git" + - role: "git-crypt" - role: "dotfiles" + - role: "password_store" + - role: "wireguard" - role: "vim" + - role: "gnome" + - role: "gnome-calendar" + - role: "mpv" - role: "neomutt" - - role: "password_store" - - role: "which" + - role: "go" + - role: "python" + - role: "docker" + - role: "podman" + - role: "ansible" + - role: "claude" - role: "firefox" - role: "chromium" - role: "obsidian" + - role: "nvidia_gtx1060" - role: "steam" - - role: "font" - - role: "aur_font" - - role: "alacritty" - - role: "mpv" - - role: "btop" + - role: "usbutils" + - role: "nginx" + - role: "prometheus" + - role: "grafana" - role: "bluetui" - role: "wlctl" - role: "pipewire" - role: "brightnessctl" - role: "wiremix" - - role: "nvidia_gtx1060" - - role: "claude" diff --git a/molecule/archlinux/converge.yml b/molecule/archlinux/converge.yml index 8a2f561e..2f3bbf2b 100644 --- a/molecule/archlinux/converge.yml +++ b/molecule/archlinux/converge.yml @@ -58,47 +58,43 @@ roles: - role: "locales" - role: "timezone" + - role: "yay" + - role: "font" + - role: "aur_font" + - role: "which" - role: "bash" + - role: "alacritty" - role: "man" - role: "jq" - role: "ag" - role: "tmux" - - role: "yay" - - role: "usbutils" - - role: "wireguard" - - role: "gateway" - - role: "python" - - role: "go" - - role: "rust" - - role: "zoxide" - - role: "docker" - - role: "podman" - - role: "ansible" - - role: "nginx" - - role: "prometheus" - - role: "grafana" - role: "rsync" - role: "gpg" + - role: "btop" + - role: "zoxide" + - role: "git" + - role: "git-crypt" - role: "dotfiles" + - role: "password_store" + - role: "wireguard" - role: "vim" + - role: "gnome-calendar" + - role: "mpv" - role: "neomutt" - - role: "password_store" - - role: "which" + - role: "go" + - role: "python" + - role: "docker" + - role: "podman" + - role: "ansible" + - role: "claude" - role: "firefox" - role: "chromium" - role: "obsidian" - - role: "steam" - - role: "font" - - role: "aur_font" - - role: "alacritty" - - role: "mpv" - - role: "btop" - - role: "bluetui" - - role: "wlctl" - - role: "pipewire" - - role: "brightnessctl" - - role: "wiremix" - role: "nvidia_gtx1060" + - role: "steam" + - role: "waybar" - role: "hyprland" - - role: "claude" - - role: "gnome-calendar" + - role: "usbutils" + - role: "nginx" + - role: "prometheus" + - role: "grafana" diff --git a/molecule/debian/converge.yml b/molecule/debian/converge.yml index 89dc7b2d..c97a8553 100644 --- a/molecule/debian/converge.yml +++ b/molecule/debian/converge.yml @@ -104,3 +104,4 @@ - role: "btop" - role: "pipewire" - role: "claude" + - role: "steam" diff --git a/molecule/ubuntu/converge.yml b/molecule/ubuntu/converge.yml index 1dea67b0..87970750 100644 --- a/molecule/ubuntu/converge.yml +++ b/molecule/ubuntu/converge.yml @@ -93,3 +93,4 @@ - role: "btop" - role: "pipewire" - role: "claude" + - role: "steam" 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" |
