From 65a0d8b670ac6ac7de0d7e91d3d819590b86b03f Mon Sep 17 00:00:00 2001 From: Hyperling Date: Sun, 2 Aug 2026 11:26:38 -0700 Subject: [PATCH] Changes from 2 days ago to keep getting Artix closer to a complete provision. --- facts/workstation/package.yml | 5 ++++- files/settings/i3.config | 4 ++-- local.yml | 4 ++-- tasks/workstation/linux/software/i3.yml | 4 ++-- tasks/workstation/linux/software/packages.yml | 13 ++++++++++--- tasks/workstation/linux/software/tlp.yml | 6 ++++++ 6 files changed, 26 insertions(+), 10 deletions(-) diff --git a/facts/workstation/package.yml b/facts/workstation/package.yml index 399ef77..1804099 100644 --- a/facts/workstation/package.yml +++ b/facts/workstation/package.yml @@ -26,6 +26,7 @@ dmenu: dmenu sassc: sassc ffmpeg: ffmpeg + wireless_tools: wireless-tools - name: Workstation | Facts | Package | Pop_OS! @@ -69,8 +70,10 @@ flatpak_distro: true firefox_esr: firefox psutil: python-psutil - appimagelauncher: appimagelauncher + #appimagelauncher: appimagelauncher # No longer in the repos, AUR. font_awesome: ttf-font-awesome + wireless_tools: wireless_tools + nfs: nfs-utils when: ansible_pkg_mgr == "pacman" diff --git a/files/settings/i3.config b/files/settings/i3.config index f999fa6..3c9c068 100644 --- a/files/settings/i3.config +++ b/files/settings/i3.config @@ -254,7 +254,7 @@ assign [class="(?i).*Mullvad.*"] $ws10 ## Workspace Specific Workflows ## bindsym $ctrl+$shift+1 workspace $ws1; exec i3-sensible-terminal; -bindsym $ctrl+$shift+2 workspace $ws2; exec firefox-flatpak; +bindsym $ctrl+$shift+2 workspace $ws2; exec "firefox-flatpak || firefox || firefox-esr"; bindsym $ctrl+$shift+3 workspace $ws3; exec codium-flatpak; bindsym $ctrl+$shift+4 workspace $ws4; exec code-flatpak; bindsym $ctrl+$shift+5 workspace $ws5; exec "session; dino" @@ -327,7 +327,7 @@ bar { exec mullvad-vpn exec i3-sensible-terminal #exec firefox-flatpak -exec transmission +exec "transmission || transmission-gtk || transmission-flatpak" exec light -O exec light -N 0 diff --git a/local.yml b/local.yml index 5bb361b..49fb4a1 100644 --- a/local.yml +++ b/local.yml @@ -152,6 +152,8 @@ - include_tasks: tasks/workstation/linux/software/packages.yml when: ansible_system == "Linux" + - include_tasks: tasks/workstation/linux/software/tlp.yml + - include_tasks: tasks/workstation/linux/software/lutris.yml when: ansible_system == "Linux" @@ -192,8 +194,6 @@ - include_tasks: tasks/workstation/shared/settings/services.yml - - include_tasks: tasks/workstation/linux/software/tlp.yml - - include_tasks: tasks/workstation/shared/settings/templates.yml ## Final Tasks (SLOW) ## diff --git a/tasks/workstation/linux/software/i3.yml b/tasks/workstation/linux/software/i3.yml index d57f407..0a2623b 100644 --- a/tasks/workstation/linux/software/i3.yml +++ b/tasks/workstation/linux/software/i3.yml @@ -34,7 +34,7 @@ set_fact: i3_yay_packages: - greybird-gtk-theme - - enlightenment-arc-theme + #- enlightenment-arc-theme - numix-gtk-theme when: ansible_pkg_mgr == "pacman" @@ -60,7 +60,7 @@ update_cache: yes - name: Workstation | Linux | Software | i3 | Install (yay) - command: "yay --noconfirm -S {{ item }}" + command: "yay -Qs {{ item }} || yay --noconfirm -S {{ item }}" loop: "{{ i3_yay_packages }}" when: ansible_pkg_mgr == "pacman" become_user: "{{ aur_user }}" diff --git a/tasks/workstation/linux/software/packages.yml b/tasks/workstation/linux/software/packages.yml index 67313df..03eb3f6 100644 --- a/tasks/workstation/linux/software/packages.yml +++ b/tasks/workstation/linux/software/packages.yml @@ -36,13 +36,20 @@ name: - vlc - "{{ appimagelauncher }}" - - "{{ evolution }}" - - "{{ evolution }}*" + #- "{{ evolution }}" + #- "{{ evolution }}*" # This was not working in pacman, but also isn't needed anymore. - gparted - hugo - - wireless-tools + - "{{ wireless_tools }}" state: present +- name: Workstation | Linux | Software | Packages | Install From AUR + command: "yay -Qs {{ item }} || yay --noconfirm -S {{ item }}" + loop: + - appimagelauncher + when: ansible_pkg_mgr == "pacman" + become_user: "{{ aur_user }}" + - name: Workstation | Linux | Software | Packages | GS Connect (KDE Connect, Android Tool) package: name: diff --git a/tasks/workstation/linux/software/tlp.yml b/tasks/workstation/linux/software/tlp.yml index 68d76c4..7abf252 100644 --- a/tasks/workstation/linux/software/tlp.yml +++ b/tasks/workstation/linux/software/tlp.yml @@ -17,6 +17,12 @@ acf_package: "auto-cpufreq" acf_service: "auto-cpufreq" +- name: Workstation | Linux | Software | TLP | Facts (Artix) + set_fact: + ppd_package: "power-profiles-daemon power-profiles-daemon-runit" + when: ansible_package_mgr == "pacman" + and ansible_service_mgr == "runit" + ## Conflicts ## #- name: Workstation | Linux | Software | TLP | Conflicts | Disable