Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,18 @@ desktop:
- vlc
- xclip

# Snap packages to install.
# Each item can optionally set:
# - classic: true|false
# - channel: e.g. latest/stable, latest/edge, 2.0/stable, etc.
snaps:
- name: bw
- name: chezmoi
classic: true
# examples:
# - name: some-snap
# channel: latest/edge

# Variables from roles/development
development_enabled: true
development:
Expand Down
12 changes: 12 additions & 0 deletions roles/desktop/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,15 @@ desktop:
- ubuntu-restricted-extras
- vlc
- xclip

# Snap packages to install.
# Each item can optionally set:
# - classic: true|false
# - channel: e.g. latest/stable, latest/edge, 2.0/stable, etc.
snaps:
- name: bw
- name: chezmoi
classic: true
# examples:
# - name: some-snap
# channel: latest/edge
11 changes: 11 additions & 0 deletions roles/desktop/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,14 @@
state: present
update_cache: true
cache_valid_time: "{{ apt_cache_time | default(3600) }}"

- name: Install desktop snap packages
become: true
community.general.snap:
name: "{{ item.name }}"
state: present
classic: "{{ item.classic | default(false) }}"
channel: "{{ item.channel | default(omit) }}"
loop: "{{ desktop.snaps | default([]) }}"
loop_control:
label: "{{ item.name }}"
2 changes: 1 addition & 1 deletion roles/hadolint/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
# Prefer checksum from API digest (e.g., 'sha256:<hex>')
- name: "Hadolint | Compute SHA256 from API digest if available"
ansible.builtin.set_fact:
_sha256: "{{ (_bin_asset.digest | default('') ).split(':') | last }}"
_sha256: "{{ (_bin_asset.digest | default('')).split(':') | last }}"
when: _bin_asset.digest is defined and (_bin_asset.digest | length > 0)

# Fallback to fetching .sha256 file
Expand Down
11 changes: 1 addition & 10 deletions roles/kvm/tasks/passthrough.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,7 @@
{%- endif %}
pci_ids: "{{ vga_id + (',' + audio_id if audio_id | length > 0 else '') }}" # string
vendor: >-
{% if 'NVIDIA' in vga_line or 'Nvidia' in vga_line -%}
nvidia
{%- elif 'Intel' in vga_line -%}
intel
{%- elif 'AMD' in vga_line or 'Advanced' in vga_line -%}
amd
{%- else -%}
unknown
{%- endif %}
vendor: "{% if 'NVIDIA' in vga_line or 'Nvidia' in vga_line -%} nvidia{%- elif 'Intel' in vga_line -%} intel{%- elif 'AMD' in vga_line or 'Advanced' in vga_line -%} amd{%- else -%} unknown{%- endif %}"

new_entry: ["{{ group_id }}", "{{ vendor }}", "{{ pci_ids }}"] # [string*3]

Expand Down