diff --git a/ansible/environments/laptop/host_vars/odofreebsd b/ansible/environments/laptop/host_vars/odofreebsd index 1202fe3..966268a 100644 --- a/ansible/environments/laptop/host_vars/odofreebsd +++ b/ansible/environments/laptop/host_vars/odofreebsd @@ -12,11 +12,11 @@ network_rc: "odofreebsd_network.conf" rc_conf: "odofreebsd_rc.conf" loader_conf: "odofreebsd_loader.conf" install_graphics: true -graphics_driver: "intel" -cputype: "intel" +graphics_driver: "amd" +cputype: "amd" cpu_opt: tigerlake hwpstate: true -cores: 8 +cores: 16 build_user: name: talexander group: talexander diff --git a/ansible/environments/laptop/host_vars/odolinux b/ansible/environments/laptop/host_vars/odolinux index 5b0b087..26037af 100644 --- a/ansible/environments/laptop/host_vars/odolinux +++ b/ansible/environments/laptop/host_vars/odolinux @@ -21,7 +21,7 @@ zfs_snapshot_datasets: - path: zroot/linux/archmain/be - path: zroot/data/bridge/family_disks install_graphics: true -graphics_driver: "intel" +graphics_driver: "amd" build_user: name: talexander group: talexander @@ -30,9 +30,9 @@ enabled_wireguard: - wgh - drmario - colo -cputype: "intel" +cputype: "amd" hwpstate: true -cores: 8 +cores: 16 sway_conf_files: - rofimoji docker_storage_driver: overlay2 # alternatively zfs diff --git a/ansible/roles/build/files/aurutils-nuke b/ansible/roles/build/files/aurutils-nuke new file mode 100755 index 0000000..e136dc5 --- /dev/null +++ b/ansible/roles/build/files/aurutils-nuke @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# +# If something is very wrong in pacman, this removes the keyring and the entire custom repo, then sets up pacman's keyring again. Running the ansible playbook is necessary to get the custom repo added. +set -euo pipefail +IFS=$'\n\t' +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +doas rm -rf /var/cache/pacman/custom/ /etc/pacman.d/conf.d/aurutils.conf +doas rm -rf /etc/pacman.d/gnupg +doas pacman-key --init +doas pacman-key --populate archlinux +doas pacman -S archlinux-keyring diff --git a/ansible/roles/build/tasks/linux.yaml b/ansible/roles/build/tasks/linux.yaml index 02fc05b..db70c15 100644 --- a/ansible/roles/build/tasks/linux.yaml +++ b/ansible/roles/build/tasks/linux.yaml @@ -111,6 +111,8 @@ loop: - src: aurutils-purge dest: /usr/local/bin/aurutils-purge + - src: aurutils-nuke + dest: /usr/local/bin/aurutils-nuke - src: aurutils-sync dest: /usr/local/bin/aurutils-sync - src: aurutils-update-devel-packages diff --git a/ansible/roles/cpu/tasks/linux_amd.yaml b/ansible/roles/cpu/tasks/linux_amd.yaml new file mode 100644 index 0000000..b521f5a --- /dev/null +++ b/ansible/roles/cpu/tasks/linux_amd.yaml @@ -0,0 +1,5 @@ +- name: Install packages + package: + name: + - powertop + state: present diff --git a/ansible/roles/graphics/tasks/linux_amd.yaml b/ansible/roles/graphics/tasks/linux_amd.yaml new file mode 100644 index 0000000..00cb1e5 --- /dev/null +++ b/ansible/roles/graphics/tasks/linux_amd.yaml @@ -0,0 +1,20 @@ +# TODO: decide between amdgpu_top, nvtop, and radeontop +# TODO: Should I enable APM? +- name: Install packages + package: + name: + - linux-firmware # Arch wiki claims this is needed to boot + - mesa + - lib32-mesa + - vulkan-radeon + - lib32-vulkan-radeon + - libva-mesa-driver # Accelerated video decoding + - lib32-libva-mesa-driver # Accelerated video decoding + - mesa-vdpau # Accelerated video decoding + - lib32-mesa-vdpau # Accelerated video decoding + - vulkan-icd-loader + - lib32-vulkan-icd-loader + - libva-utils # for vainfo + - vdpauinfo # for vdpauinfo + - vulkan-tools # For vulkaninfo + state: present diff --git a/ansible/roles/media/files/cast_file_intel b/ansible/roles/media/files/cast_file_vaapi similarity index 100% rename from ansible/roles/media/files/cast_file_intel rename to ansible/roles/media/files/cast_file_vaapi diff --git a/ansible/roles/media/tasks/amd.yaml b/ansible/roles/media/tasks/amd.yaml new file mode 100644 index 0000000..eabdef7 --- /dev/null +++ b/ansible/roles/media/tasks/amd.yaml @@ -0,0 +1,10 @@ +- name: Install scripts + copy: + src: "files/{{ item.src }}" + dest: "{{ item.dest }}" + mode: 0755 + owner: root + group: wheel + loop: + - src: cast_file_vaapi + dest: /usr/local/bin/cast_file diff --git a/ansible/roles/media/tasks/intel.yaml b/ansible/roles/media/tasks/intel.yaml index 6a2cbb5..eabdef7 100644 --- a/ansible/roles/media/tasks/intel.yaml +++ b/ansible/roles/media/tasks/intel.yaml @@ -6,5 +6,5 @@ owner: root group: wheel loop: - - src: cast_file_intel + - src: cast_file_vaapi dest: /usr/local/bin/cast_file