From baab102be8392359d65a1ca2b1b60e277135e8f4 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 11 Sep 2026 07:56:50 -0700 Subject: [PATCH] artix, add changes and fixes while getting newer Intel workstation going properly. --- facts/general/package.yml | 14 +++++++++----- facts/workstation/package.yml | 2 ++ files/settings/i3.config | 5 +---- tasks/general/software/aur.yml | 5 ++++- tasks/general/software/packages.yml | 2 +- tasks/workstation/linux/software/packages.yml | 2 ++ tasks/workstation/linux/software/vpn.yml | 10 +++++++++- 7 files changed, 28 insertions(+), 12 deletions(-) diff --git a/facts/general/package.yml b/facts/general/package.yml index bcb868e..a4078bf 100644 --- a/facts/general/package.yml +++ b/facts/general/package.yml @@ -21,7 +21,6 @@ locate: mlocate alsa: alsa-utils stress: stress - fwupdmgr: fwupd - name: General | Facts | Package | Parrot OS Fixes set_fact: @@ -101,6 +100,11 @@ ansible_distribution_file: "{{ prov_dir }}/ansible_distribution.txt" ansible_pkg_mgr_file: "{{ prov_dir }}/ansible_pkg_mgr.txt" +- name: General | Facts | Package | Update Command | Helpers | pacman + set_fact: + update_accept_var: '--noconfirm' + when: ansible_pkg_mgr == "pacman" + - name: General | Facts | Package | Update Command | Store Variables shell: "{{ item }}" loop: @@ -154,18 +158,18 @@ pacman) echo "*** Pacman ***" - pacman_accept="" + auto_accept="" if [[ -n "$accept" ]]; then - pacman_accept="--noconfirm" + auto_accept="{{ update_accept_var }}" fi - sudo pacman -Syu $pacman_accept || + sudo pacman -Syu $auto_accept || return 1 echo -e "\n" if [[ "$LOGNAME" != "root" ]]; then echo "*** AUR (yay) ***" - yay -Syu $pacman_accept || return 2 + yay -Syu $auto_accept || return 2 else echo "*** User is root, skipping AUR (yay) ***" fi diff --git a/facts/workstation/package.yml b/facts/workstation/package.yml index 4325440..7d6af9f 100644 --- a/facts/workstation/package.yml +++ b/facts/workstation/package.yml @@ -54,6 +54,8 @@ vlc_plugins: vlc-plugins-all blueman: blueman mpv: mpv + transmission_gtk: transmission-gtk + transmission_qt: transmission-qt - name: Workstation | Facts | Package | apt (All Distros) diff --git a/files/settings/i3.config b/files/settings/i3.config index d647f86..50b190f 100644 --- a/files/settings/i3.config +++ b/files/settings/i3.config @@ -10,7 +10,7 @@ # Please see https://i3wm.org/docs/userguide.html for a complete reference! set $FIREFOX "sh -c '(which firefox && firefox) || (which firefox-esr && firefox-esr) || (which firefox-flatpak && firefox-flatpak)'" -set $TRANSMISSION "sh -c '(which transmission && transmission) || (which transmission-gtk && transmission-gtk) || (which transmission-flatpak && transmission-flatpak)'" +set $TRANSMISSION "sh -c '(which transmission && transmission) || (which transmission-qt && transmission-qt) || (which transmission-gtk && transmission-gtk) || (which transmission-flatpak && transmission-flatpak)'" # Use the `xev` command to see the name and code of a keyboard key. @@ -394,6 +394,3 @@ exec_always --no-startup-id "killall picom; picom -f --backend xrender" # Battery exec_always --no-startup-id bash -c 'pkill -ef "bash `which battery_nag.sh`" >~/Reports/battery_nag.log 2>&1; battery_nag.sh >>~/Reports/battery_nag.log 2>&1' - -# Reset DMenu -exec_always --no-startup-id bash -c 'find ~/.*cache* -name "*"dmenu"*" -print -delete' diff --git a/tasks/general/software/aur.yml b/tasks/general/software/aur.yml index 252c526..5445d38 100644 --- a/tasks/general/software/aur.yml +++ b/tasks/general/software/aur.yml @@ -42,10 +42,13 @@ repo: "{{ aur_helper_url }}" dest: "{{ aur_helper_dir }}" + - name: General | Software | AUR | Install | Change Permissions + shell: "chown -Rc {{ aur_user }}:wheel {{ aur_helper_dir }}" + - name: General | Software | AUR | Install | Build & Integrate shell: "cd {{ aur_helper_dir }} && makepkg -si --noconfirm" + become_user: "{{ aur_user }}" changed_when: true when: yay_check.rc != 0 - become_user: "{{ aur_user }}" diff --git a/tasks/general/software/packages.yml b/tasks/general/software/packages.yml index 2403d12..d758fe4 100644 --- a/tasks/general/software/packages.yml +++ b/tasks/general/software/packages.yml @@ -67,7 +67,6 @@ - "{{ ca_certificates }}" - "{{ alsa }}" - "{{ stress }}" - - "{{ fwupdmgr }}" state: present - name: General | Software | Packages | Install Software (DEV) @@ -110,6 +109,7 @@ name: - which - "{{ cron }}" + - pacman-contrib state: present when: ansible_pkg_mgr == "pacman" diff --git a/tasks/workstation/linux/software/packages.yml b/tasks/workstation/linux/software/packages.yml index d909912..9769027 100644 --- a/tasks/workstation/linux/software/packages.yml +++ b/tasks/workstation/linux/software/packages.yml @@ -48,6 +48,8 @@ - "{{ rhythmbox }}" - "{{ blueman }}" - "{{ mpv }}" + - "{{ transmission_gtk }}" + - "{{ transmission_qt }}" state: present - name: Workstation | Linux | Software | Packages | Install Audio (Looking at you, Artix) diff --git a/tasks/workstation/linux/software/vpn.yml b/tasks/workstation/linux/software/vpn.yml index 4930142..f4a4f49 100644 --- a/tasks/workstation/linux/software/vpn.yml +++ b/tasks/workstation/linux/software/vpn.yml @@ -34,7 +34,8 @@ when: ansible_pkg_mgr == "pacman" and ansible_service_mgr == "runit" - when: ansible_distribution in ("Debian", "Ubuntu", "Arch", "Artix") + when: ansible_distribution in ("Debian", "Ubuntu") + or ansible_pkg_mgr in ("pacman", "dnf") ## Specific Distros ## @@ -108,3 +109,10 @@ path: "{{ runit_service_dir }}/mullvad" state: absent when: ansible_service_mgr == "runit" + +- name: Workstation | Software | VPN | Mullvad | PATH | Enable Lockdown + shell: "{{ item }}" + loop: + - mullvad auto-connect set on + - mullvad lockdown-mode set on + become_user: "{{ user }}"